Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16322 from owncloud/trash-view | Morris Jobke | 2015-05-20 | 2 | -3/+20 |
|\ | |||||
| * | use copy when doing a crossStorageCopy on the same storage | Robin Appelman | 2015-05-19 | 2 | -3/+20 |
* | | Merge pull request #16075 from owncloud/skeleton-copy-delay | Vincent Petry | 2015-05-20 | 3 | -7/+13 |
|\ \ | |||||
| * | | exception class will be logged as well - helps especially in cases where the ... | Thomas Müller | 2015-05-19 | 1 | -3/+9 |
| * | | wait with copying the skeleton untill login and setupfs are done | Robin Appelman | 2015-05-18 | 2 | -4/+4 |
* | | | Merge pull request #16463 from owncloud/add-support-to-disallow-domains | Jan-Christoph Borchardt | 2015-05-20 | 1 | -2/+110 |
|\ \ \ | |||||
| * | | | Add support for disallowing domains to the ContentSecurityPolicy | Lukas Reschke | 2015-05-20 | 1 | -2/+110 |
* | | | | Merge pull request #16453 from cmeh/patch-6 | Morris Jobke | 2015-05-20 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Clean-up of orthography, grammar | Christian Hoffmann | 2015-05-19 | 1 | -2/+2 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-20 | 16 | -4/+22 |
* | | | | 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 #16398 from owncloud/fix-php-docv8.1.0beta2 | Joas Schilling | 2015-05-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Fix PHPDoc of public interface ILockingProvider | Morris Jobke | 2015-05-18 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #16243 from owncloud/error_if_download_failed | Vincent Petry | 2015-05-18 | 5 | -41/+105 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | a new approach to display the error message | Bjoern Schiessle | 2015-05-18 | 5 | -41/+105 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | 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 | 3 | -17/+27 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | delete all file keys doesn't need the encryption module as parameter; impleme... | Bjoern Schiessle | 2015-05-13 | 3 | -17/+27 |
* | | | | | | | | Merge pull request #16342 from owncloud/fix_16338 | Lukas Reschke | 2015-05-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix preview hooks, enable_previews default is true | Georg Ehrke | 2015-05-13 | 1 | -1/+1 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-15 | 4 | -0/+8 |
|/ / / / / / / / | |||||
* | | | | | | | | 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 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-13 | 4 | -2/+40 |
| |/ / / / / / |/| | | | | | |