| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | delete all file keys doesn't need the encryption module as parameter; ↵ | Bjoern Schiessle | 2015-05-13 | 4 | -18/+28 |
| | | | | | implement rmdir; getFileKeyDir should also work for part files and complete directories | ||||
| * | Merge pull request #16284 from owncloud/shared-storage-view | Lukas Reschke | 2015-05-13 | 1 | -20/+21 |
| |\ | | | | | dont go trough the view when renaming/copying on shared storages | ||||
| | * | dont go trough the view when renaming/copying on shared storages | Robin Appelman | 2015-05-12 | 1 | -20/+21 |
| | | | |||||
| * | | Merge pull request #16290 from owncloud/upgrade-info-for-3rdparty-apps | Lukas Reschke | 2015-05-13 | 1 | -0/+3 |
| |\ \ | | | | | | | Add info message for upgrade of an 3rdparty app | ||||
| | * | | Add info message for upgrade of an 3rdparty app | Morris Jobke | 2015-05-12 | 1 | -0/+3 |
| | |/ | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-13 | 98 | -78/+386 |
| | | | |||||
| * | | Merge pull request #16289 from owncloud/fix-stupid-mistake | Lukas Reschke | 2015-05-12 | 1 | -0/+6 |
| |\ \ | | | | | | | Add NoAdminRequired annotation | ||||
| | * | | Subadmin permissions are also not required | Lukas Reschke | 2015-05-12 | 1 | -0/+2 |
| | | | | |||||
| | * | | Add NoAdminRequired annotation | Lukas Reschke | 2015-05-12 | 1 | -0/+4 |
| | |/ | | | | | | | Stupid mistake in master, fixes https://github.com/owncloud/core/issues/16288 | ||||
| * | | Merge pull request #16269 from owncloud/master-fix-16179 | Morris Jobke | 2015-05-12 | 1 | -2/+6 |
| |\ \ | |/ |/| | Check if cURL supports the desired features | ||||
| | * | Check if cURL supports the desired features | Lukas Reschke | 2015-05-12 | 1 | -2/+6 |
| | | | | | | | | | | | | | Older versions of cURL that are unfortunately still bundled by distributors don't support these features which will result in errors and other possibly unpredictable behaviour. Fixes https://github.com/owncloud/core/issues/16179 for master – stable8 requires another patch. | ||||
| * | | Merge pull request #16283 from owncloud/fix-search-users | Morris Jobke | 2015-05-12 | 1 | -1/+8 |
| |\ \ | | | | | | | fix user mgmt search box position, fix #15928 | ||||
| | * | | fix user mgmt search box position, fix #15928 | Jan-Christoph Borchardt | 2015-05-12 | 1 | -1/+8 |
| | | | | |||||
| * | | | Merge pull request #16282 from owncloud/fix-multiselect-ellipsize | Morris Jobke | 2015-05-12 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | ellipsize first item in multiselect, fix #16174 | ||||
| | * | | | ellipsize first item in multiselect, fix #16174 | Jan-Christoph Borchardt | 2015-05-12 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge pull request #16104 from owncloud/resize-filepicker | Jan-Christoph Borchardt | 2015-05-12 | 2 | -2/+7 |
| |\ \ \ \ | | | | | | | | | | | Resize filepicker on window size change | ||||
| | * | | | | add max-width of 600px to filepicker | Morris Jobke | 2015-05-06 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | Resize filepicker on window size change | Morris Jobke | 2015-05-06 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * add 20 px space to each direction -> 10px padding to left, right, top and bottom * fixes #16100 | ||||
| * | | | | | Merge pull request #16277 from owncloud/fix-15971 | Morris Jobke | 2015-05-12 | 2 | -4/+1 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | remove superflous button. fixes #15971 | ||||
| | * | | | | remove superflous button. fixes #15971 | Arthur Schiwon | 2015-05-12 | 2 | -4/+1 |
| | | |/ / | |/| | | |||||
| * | | | | Merge pull request #16127 from owncloud/fix-file-icons-in-shared-file-view | Jan-Christoph Borchardt | 2015-05-12 | 3 | -1/+4 |
| |\ \ \ \ | |/ / / |/| | | | Enable file icons & previews in "Shared ..." categories | ||||
| | * | | | Enable file icons & previews in "Shared ..." categories | Morris Jobke | 2015-05-06 | 3 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * sharing API returns now the mimetype icon path * file previews are now lazyloaded by default (as the doc says) * fixes #16086 | ||||
| * | | | | Merge pull request #16271 from owncloud/use-active | Jan-Christoph Borchardt | 2015-05-12 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | Use active instead of non existing pressed | ||||
| | * | | | | Use active instead of non existing pressed | Lukas Reschke | 2015-05-12 | 1 | -2/+2 |
| | | |_|/ | |/| | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16083 | ||||
| * | | | | Merge pull request #16228 from owncloud/enc_fix_restore | Björn Schießle | 2015-05-12 | 6 | -22/+156 |
| |\ \ \ \ | |/ / / |/| | | | use hooks to update encryption keys | ||||
| | * | | | use hooks to update encryption keys instead of the storage wrapper if a file ↵ | Bjoern Schiessle | 2015-05-11 | 6 | -22/+156 |
| | | | | | | | | | | | | | | | | | | | | | | | | | gets renamed/restored, as long as we are in the storage wrapper the file cache isn't up-to-date | ||||
| * | | | | Merge pull request #16233 from owncloud/enc_fix_check_if_file_is_excluded | Morris Jobke | 2015-05-12 | 2 | -1/+2 |
| |\ \ \ \ | | | | | | | | | | | fix check if a file is excluded from encryption | ||||
| | * | | | | fix check if file is excluded from encryption | Bjoern Schiessle | 2015-05-11 | 2 | -1/+2 |
| | |/ / / | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-12 | 30 | -26/+20 |
| | | | | | |||||
| * | | | | Merge pull request #15881 from owncloud/share-moveversionsproperly | Vincent Petry | 2015-05-11 | 2 | -31/+174 |
| |\ \ \ \ | | | | | | | | | | | Fix version rename with files and folders | ||||
| | * | | | | Fix version rename with files and folders | Vincent Petry | 2015-04-27 | 2 | -31/+174 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | - fix moving folder into another folder - fix moving file or folder into shared folder as recipient | ||||
| * | | | | | Merge pull request #16234 from ↵ | Morris Jobke | 2015-05-11 | 2 | -80/+172 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-16206-fix-app-config-parallel-insert Issue 16206 fix app config parallel insert | ||||
| | * | | | | | Use insertIfNotExists to avoid problems with parallel calls | Joas Schilling | 2015-05-11 | 2 | -15/+22 |
| | | | | | | | |||||
| | * | | | | | Add a test for parallel insert | Joas Schilling | 2015-05-11 | 1 | -12/+29 |
| | | | | | | | |||||
| | * | | | | | Always test the object and the legacy class | Joas Schilling | 2015-05-11 | 1 | -59/+127 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #15815 from owncloud/unshare-etag-propagate | Morris Jobke | 2015-05-11 | 3 | -80/+51 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Update etag of direct parent on unshare | ||||
| | * | | | | | | Update etag of direct parent on unshare | Vincent Petry | 2015-04-28 | 3 | -80/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only call dirname() once instead of twice when propagating etags to the recipient's parent folders. | ||||
| * | | | | | | | Merge pull request #16208 from owncloud/fix-language-selection-sr-latin | Thomas Müller | 2015-05-11 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Some locales need to be converted to be compliant with CLDR | ||||
| | * | | | | | | | Some locales need to be converted to be compliant with CLDR | Thomas Müller | 2015-05-08 | 1 | -0/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #16213 from cmeh/patch-5 | Morris Jobke | 2015-05-11 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Grammar, removal of line break | ||||
| | * | | | | | | | Grammar, removal of line break | Christian Hoffmann | 2015-05-09 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Corrected "… if the user forgets their password." to "… if the user forgets his or her password" in line 17. * Removed line break from line 17 to line 18. | ||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-11 | 20 | -6/+66 |
| | | | | | | | | | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-10 | 56 | -20/+148 |
| |/ / / / / / / | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-09 | 134 | -488/+134 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #16203 from owncloud/add-warning-for-people-that-cant-read | Thomas Müller | 2015-05-08 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Add warning to OCC as well in case another PHP version is used there | ||||
| | * | | | | | | Add warning to OCC as well in case another PHP version is used there | Lukas Reschke | 2015-05-08 | 1 | -0/+8 |
| | | |_|/ / / | |/| | | | | | | | | | | | | | | | | In regard to a recent rant on social media where users complained about us to have broken the command line tool. Guess reading the documentation is hard… | ||||
| * | | | | | | Merge pull request #16124 from ↵ | Lukas Reschke | 2015-05-08 | 1 | -0/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-16109-fix-share-email-with-shared-folder Fix the share mail notification when the item is in a folder | ||||
| | * | | | | | | Fix the share mail notification when the item is in a folder | Joas Schilling | 2015-05-06 | 1 | -0/+5 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #16155 from owncloud/enc_admin_settings | Björn Schießle | 2015-05-08 | 3 | -63/+90 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | improved admin settings | ||||
| | * | | | | | | | improved admin settings | Bjoern Schiessle | 2015-05-08 | 3 | -63/+90 |
| | | |/ / / / / | |/| | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |