Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16440 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-05-19 | 7 | -26/+0 |
|\ | |||||
| * | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-05-19 | 7 | -26/+0 |
* | | Merge pull request #16447 from owncloud/fix-minor-code-problems | Thomas Müller | 2015-05-19 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix unexisting class and broken doc | Joas Schilling | 2015-05-19 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #16419 from owncloud/user-group-backend-performance | Thomas Müller | 2015-05-19 | 2 | -11/+47 |
|\ \ | |/ |/| | |||||
| * | Reduce the complexity of the search queries in the backends to a minimum | Joas Schilling | 2015-05-18 | 2 | -11/+47 |
* | | Merge pull request #15965 from owncloud/conditional-logging | Thomas Müller | 2015-05-19 | 4 | -47/+108 |
|\ \ | |||||
| * | | Conditional logging | Morris Jobke | 2015-05-08 | 1 | -4/+65 |
| * | | Move log level check to logger parent class | Morris Jobke | 2015-05-08 | 4 | -45/+45 |
* | | | Merge pull request #16085 from owncloud/encryption-module-rename | Thomas Müller | 2015-05-19 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | rename to 'Default encryption module' | Jan-Christoph Borchardt | 2015-05-06 | 2 | -2/+2 |
* | | | | Merge pull request #16293 from owncloud/xcache | Morris Jobke | 2015-05-19 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Mute XCache error when trying to clear the opcode cache | Lukas Reschke | 2015-05-12 | 1 | -1/+1 |
* | | | | | Merge pull request #16412 from owncloud/jknockaert-patch-1 | Björn Schießle | 2015-05-18 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fix #16356 | jknockaert | 2015-05-18 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #16399 from owncloud/enc_rmdir_fix | Clark Tomlinson | 2015-05-18 | 1 | -2/+6 |
|\ \ \ \ \ | |||||
| * | | | | | only try to delete file keys if it is a valid path | Bjoern Schiessle | 2015-05-18 | 1 | -2/+6 |
* | | | | | | Merge pull request #16403 from owncloud/fix-command-loading | Thomas Müller | 2015-05-18 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Only load commands of enabled apps | Morris Jobke | 2015-05-18 | 1 | -1/+1 |
* | | | | | | Merge pull request #15980 from owncloud/jknockaert-patch-1 | Björn Schießle | 2015-05-18 | 1 | -9/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix #15973 | jknockaert | 2015-04-30 | 1 | -9/+7 |
* | | | | | | | Merge pull request #16243 from owncloud/error_if_download_failed | Vincent Petry | 2015-05-18 | 3 | -40/+83 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | a new approach to display the error message | Bjoern Schiessle | 2015-05-18 | 3 | -40/+83 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #16364 from owncloud/add-warning-webdav | Morris Jobke | 2015-05-18 | 1 | -3/+15 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Add notice that WebDAV interface is not intended for browsers | Lukas Reschke | 2015-05-15 | 1 | -3/+15 |
* | | | | | | Merge pull request #16176 from owncloud/fix-provisioning-api-set-quota | Vincent Petry | 2015-05-15 | 1 | -0/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Pure numbers are returned as bytes right away | Thomas Müller | 2015-05-08 | 1 | -0/+3 |
| * | | | | | | Validate the quota value to be a correct value | Thomas Müller | 2015-05-07 | 1 | -0/+2 |
* | | | | | | | Merge pull request #16292 from owncloud/webdav-storage-fireprehooks | Joas Schilling | 2015-05-15 | 1 | -6/+28 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fire prehooks when uploading directly to storage | Vincent Petry | 2015-05-13 | 1 | -6/+28 |
* | | | | | | | | Merge pull request #16323 from owncloud/enc_webdav_fixes | Thomas Müller | 2015-05-15 | 2 | -15/+26 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | delete all file keys doesn't need the encryption module as parameter; impleme... | Bjoern Schiessle | 2015-05-13 | 2 | -15/+26 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #16276 from owncloud/dav-quota-root | Robin Appelman | 2015-05-13 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | fix webdav quota check for the root of the dav endpoint | Robin Appelman | 2015-05-12 | 1 | -0/+3 |
* | | | | | | | Merge pull request #16269 from owncloud/master-fix-16179 | Morris Jobke | 2015-05-12 | 1 | -2/+6 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Check if cURL supports the desired features | Lukas Reschke | 2015-05-12 | 1 | -2/+6 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #16228 from owncloud/enc_fix_restore | Björn Schießle | 2015-05-12 | 3 | -8/+42 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | use hooks to update encryption keys instead of the storage wrapper if a file ... | Bjoern Schiessle | 2015-05-11 | 3 | -8/+42 |
* | | | | | | Merge pull request #16233 from owncloud/enc_fix_check_if_file_is_excluded | Morris Jobke | 2015-05-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix check if file is excluded from encryption | Bjoern Schiessle | 2015-05-11 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #16234 from owncloud/issue-16206-fix-app-config-parallel-i... | Morris Jobke | 2015-05-11 | 1 | -11/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use insertIfNotExists to avoid problems with parallel calls | Joas Schilling | 2015-05-11 | 1 | -11/+16 |
| | |_|_|_|/ | |/| | | | | |||||
* / | | | | | Some locales need to be converted to be compliant with CLDR | Thomas Müller | 2015-05-08 | 1 | -0/+11 |
|/ / / / / | |||||
* | | | | | Merge pull request #16124 from owncloud/issue-16109-fix-share-email-with-shar... | Lukas Reschke | 2015-05-08 | 1 | -0/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Fix the share mail notification when the item is in a folder | Joas Schilling | 2015-05-06 | 1 | -0/+5 |
* | | | | | | Merge pull request #16146 from owncloud/issue-16103-hide-module-already-exist... | Lukas Reschke | 2015-05-08 | 1 | -1/+7 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Avoid the log entry with the ModuleAlreadyExists exception when enabling the app | Joas Schilling | 2015-05-07 | 1 | -1/+7 |
| | |/ / / | |/| | | | |||||
* / | | | | use cross storage move when renaming the part file during webdav put | Robin Appelman | 2015-05-07 | 1 | -10/+12 |
|/ / / / | |||||
* | | | | Merge pull request #16119 from owncloud/fix-16056 | Thomas Müller | 2015-05-07 | 1 | -11/+14 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Check return value of OC_App::getAppPath() and verify info.xml exists. | Andreas Fischer | 2015-05-06 | 1 | -11/+14 |