| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #11007 from owncloud/replaces-10850 | Thomas Müller | 2014-09-11 | 3 | -1/+3 |
| |\ | | | | | Add X-UA-Compatible to all templates | ||||
| | * | Add X-UA-Compatible to all templates | Lukas Reschke | 2014-09-11 | 3 | -1/+3 |
| | | | | | | | | | Replaces https://github.com/owncloud/core/pull/10850 | ||||
| * | | Merge pull request #3937 from owncloud/refresh_if_maintenance_is_over | Lukas Reschke | 2014-09-11 | 2 | -1/+21 |
| |\ \ | |/ |/| | Refresh if maintenance mode is over | ||||
| | * | Refresh if maintenance mode is over | kondou | 2014-09-09 | 2 | -1/+21 |
| | | | | | | | | | | | | | | | Using status.php for this. I modified status.php to also show, whether we're in maintenance. Checks every 20 seconds if maintenance is over, if yes: reload. | ||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-11 | 3 | -45/+166 |
| | | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-10 | 12 | -0/+15 |
| | | | |||||
| * | | Merge pull request #9512 from libasys/patch-2 | Lukas Reschke | 2014-09-09 | 1 | -1/+2 |
| |\ \ | |/ |/| | Fix use Sharing Api with calendar | ||||
| | * | Fix use Sharing Api with calendar | libasys | 2014-07-08 | 1 | -2/+3 |
| | | | | | | | | | | | Without this fix it logs this error: Undefined index: itemSourceName at /opt/local/apache2/htdocs/oc7/core/ajax/share.php#44 I think the itemSourceName is only used with sharing files! | ||||
| * | | Merge pull request #10948 from owncloud/fix-zindex | Lukas Reschke | 2014-09-09 | 1 | -3/+3 |
| |\ \ | | | | | | | fix z-index of header and dropdowns, fix user menu not showing on mobile | ||||
| | * | | fix z-index of header and dropdowns, fix user menu not showing on mobile | Jan-Christoph Borchardt | 2014-09-08 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge pull request #9753 from owncloud/filepath-css | Thomas Müller | 2014-09-09 | 2 | -1/+21 |
| |\ \ \ | | | | | | | | | Remove special case for css in OC.filePath | ||||
| | * | | | Add beforeeach and aftereach | Lukas Reschke | 2014-09-09 | 1 | -4/+6 |
| | | | | | |||||
| | * | | | Add unittest for filePath | Lukas Reschke | 2014-09-09 | 1 | -0/+18 |
| | | | | | |||||
| | * | | | Remove special case for css in OC.filePath | Robin Appelman | 2014-07-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #10928 from owncloud/allow_dot_in_dbname_on_web_install | Lukas Reschke | 2014-09-09 | 1 | -0/+3 |
| |\ \ \ \ | | | | | | | | | | | allow . in dbname on web install | ||||
| | * | | | | allow . in dbname on web install | Jörn Friedrich Dreyer | 2014-09-08 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-09 | 36 | -36/+0 |
| | | | | | | |||||
| * | | | | | Merge pull request #10858 from owncloud/issue/10847 | VicDeo | 2014-09-09 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Use correct language package so the subject is correctly translated | ||||
| | * | | | | | Fix broken new lines in plain text mail template | Joas Schilling | 2014-09-04 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #10944 from owncloud/fix-nojavascript-style | Jan-Christoph Borchardt | 2014-09-08 | 4 | -15/+17 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | fix no-JS message, and add it to log in and shared as well cause they don’t work without JS | ||||
| | * | | | | | | also add no-JavaScript notice to log in and sharing pages because they do ↵ | Jan-Christoph Borchardt | 2014-09-08 | 3 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not work without JS either | ||||
| | * | | | | | | fix styling and wording of no-JavaScript message | Jan-Christoph Borchardt | 2014-09-08 | 2 | -14/+14 |
| | | |_|_|/ / | |/| | | | | |||||
| * | | | | | | Merge pull request #10739 from owncloud/eventsource-public | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Add EventSource to the public API | ||||
| | * | | | | | | Better phpdoc and method naming | Robin Appelman | 2014-09-04 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Use the public api to get event sources | Robin Appelman | 2014-09-03 | 1 | -1/+1 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #10755 from owncloud/shorter_sharing_links | Lukas Reschke | 2014-09-08 | 5 | -5/+37 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Shorter sharing links | ||||
| | * | | | | | | Use a route instead of s.php and convert tokens asap | kondou | 2014-09-04 | 6 | -8/+33 |
| | | | | | | | | |||||
| | * | | | | | | Initial work on shorter links | kondou | 2014-09-04 | 2 | -2/+9 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #10451 from k4k/login_logo_alignment_fix | Volkan Gezer | 2014-09-08 | 2 | -3/+1 |
| |\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | improve logo flexibility to fix wide custom logo alignment, fix #9339 | ||||
| | * | | | | | | improve logo flexibility to fix wide custom logo alignment, fix #9339 | twood8 | 2014-08-15 | 2 | -3/+1 |
| | | | | | | | | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-07 | 1 | -0/+3 |
| | | | | | | | | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-06 | 1 | -4/+4 |
| | | | | | | | | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-05 | 1 | -0/+4 |
| | |/ / / / / |/| | | | | | |||||
| * | | | | | | Merge pull request #10818 from owncloud/enableappforgroupfix | Lukas Reschke | 2014-09-04 | 1 | -0/+4 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Fix upgrade process when apps enabled for specific groups | ||||
| | * | | | | | Fix upgrade process when apps enabled for specific groups | Vincent Petry | 2014-09-02 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue where the currently logged user was causing side-effects when upgrading. Now setting incognito mode (no user) on update to make sure the whole apps list is taken into account with getEnabledApps() or isEnabled(). | ||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-04 | 58 | -114/+0 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #10667 from pmjdebruijn/itunes-appid | Thomas Müller | 2014-09-03 | 2 | -2/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | defaults: add customizable defaultiTunesAppId | ||||
| | * | | | | | | templates: use p() for getiTunesAppId | Pascal de Bruijn | 2014-08-28 | 2 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | defaults: add customizable defaultiTunesAppId | Pascal de Bruijn | 2014-08-27 | 2 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #10642 from owncloud/securityutils | Lukas Reschke | 2014-09-03 | 2 | -8/+0 |
| |\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Add some security utilities | ||||
| | * | | | | | | Merge branch 'master' into securityutils | Lukas Reschke | 2014-08-31 | 128 | -908/+9294 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/util.php | ||||
| | * | | | | | | | Add some security utilities | Lukas Reschke | 2014-08-27 | 2 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds some security utilities to core including: - A library for basic crypto operations (e.g. to encrypt passwords) - A better library for cryptographic actions which allows you to specify the charset - A library for secure string comparisions Remove .htaccess Remove .htaccess Fix typo Add public API Use timing constant comparision Remove CBC constant Adjust code Remove confusing $this | ||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-03 | 1 | -0/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | also style submit buttons | Bernhard Posselt | 2014-09-02 | 1 | -1/+2 |
| | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-02 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-01 | 2 | -0/+10 |
| | | | | | | | | |||||
| * | | | | | | | Add app utilities - CSS menus for sidebar | Bernhard Posselt | 2014-08-31 | 3 | -7/+199 |
| | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * has-menu, has-count * use active for has-menu to show it * use open for action popup to show up * inactive buttons have less opacity * borders for edit input * use z-index for app content on mobile to prevent navigation items from sticking out | ||||
| * | | | | | | Use public api for getting l10n | Robin Appelman | 2014-08-31 | 5 | -7/+7 |
| | | | | | | | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-31 | 2 | -2/+10 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #10428 from owncloud/files_external_better_config | Robin McCorkell | 2014-08-30 | 1 | -0/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Improve external storage configuration UI | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |