summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-0618-10/+32
* Merge pull request #16771 from owncloud/fix-storage-full-messageLukas Reschke2015-06-055-3/+37
|\
| * Add owner to the storage stats to enable better notificationsMorris Jobke2015-06-055-3/+37
* | Merge pull request #16768 from owncloud/add-missing-mime-typesMorris Jobke2015-06-051-0/+3
|\ \
| * | Adding mark down mime type mkd - fixes https://github.com/owncloud/files_text...Thomas Müller2015-06-051-0/+1
| * | Adding mimetype x-h for header files - fixes https://github.com/owncloud/file...Thomas Müller2015-06-051-0/+2
| |/
* | Merge pull request #16767 from owncloud/webdav-preventdeleterootLukas Reschke2015-06-052-25/+16
|\ \
| * | Fix sabre directory test casesVincent Petry2015-06-051-24/+15
| * | Prevent deleting Webdav rootVincent Petry2015-06-051-1/+1
* | | Merge pull request #16770 from owncloud/update-ocp-phpdocMorris Jobke2015-06-057-5/+36
|\ \ \ | |_|/ |/| |
| * | [OCP] update PHPdoc to contain correct @since tagsMorris Jobke2015-06-057-5/+36
|/ /
* | Merge pull request #16753 from owncloud/issue-16752-check-for-existing-user-i...Thomas Müller2015-06-054-0/+80
|\ \
| * | Add unit tests for non existing usersJoas Schilling2015-06-052-0/+68
| * | Check whether the user exists before trying to set up his file systemJoas Schilling2015-06-052-0/+12
* | | Merge pull request #16765 from owncloud/fix-chunked-upload-jenkinsThomas Müller2015-06-053-0/+266
|\ \ \ | |_|/ |/| |
| * | fix unit testThomas Müller2015-06-051-29/+22
| * | Bring back unit tests for \OC\Cache\FileThomas Müller2015-06-051-0/+85
| * | Bring back OC\Cache\File - fixes #16760Thomas Müller2015-06-052-0/+188
* | | Merge pull request #16755 from owncloud/files-mkcolbackslashVincent Petry2015-06-052-4/+45
|\ \ \ | |/ / |/| |
| * | Fix "@throws" tags on doc blocksJoas Schilling2015-06-051-3/+15
| * | Add unit tests for InvalidPath Exception being thrownJoas Schilling2015-06-051-1/+27
| * | Validate path in getChildVincent Petry2015-06-051-0/+3
* | | Merge pull request #16718 from owncloud/files-catchajaxexceptionsThomas Müller2015-06-054-21/+59
|\ \ \ | |/ / |/| |
| * | Catch exceptions in files ajax callsVincent Petry2015-06-034-21/+59
* | | Merge pull request #16748 from owncloud/fix-ldap-port-detection-regressionMorris Jobke2015-06-051-13/+21
|\ \ \
| * | | port detection needs to take care of now thrown exceptions when LDAP server i...Arthur Schiwon2015-06-041-13/+21
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-0532-10/+150
* | | | Merge pull request #16746 from owncloud/fix-phpdocRobin McCorkell2015-06-041-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typo in PHPDocMorris Jobke2015-06-041-1/+1
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-04130-94/+172
* | | Merge pull request #15895 from owncloud/dav-getremoteetagJoas Schilling2015-06-032-3/+35
|\ \ \
| * | | Disable update check test when testing wrappersVincent Petry2015-06-021-0/+3
| * | | Added storage backend test for checkUpdateVincent Petry2015-06-021-0/+15
| * | | Get etag from remote OC serverVincent Petry2015-06-021-3/+17
* | | | Merge pull request #16730 from owncloud/LukasReschke-patch-1Thomas Müller2015-06-031-2/+2
|\ \ \ \
| * | | | Fix unit testsLukas Reschke2015-06-031-2/+2
|/ / / /
* | | | Merge pull request #16703 from owncloud/fix-ie8-ie9Morris Jobke2015-06-031-0/+6
|\ \ \ \
| * | | | Add min-height to login page for IE8 and IE9Morris Jobke2015-06-031-0/+1
| * | | | Revert "fix theme in IE8 and IE9"Morris Jobke2015-06-031-0/+5
* | | | | Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversionsMorris Jobke2015-06-032-9/+125
|\ \ \ \ \
| * | | | | Keep versions when deleting as recipientVincent Petry2015-06-022-9/+125
* | | | | | Merge pull request #16721 from owncloud/fix-grammar-enc-moduleClark Tomlinson2015-06-031-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Catch NotFoundException and return no quota information which simply reflects...Thomas Müller2015-06-031-1/+1
| * | | | | Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/translate...Thomas Müller2015-06-031-1/+1
* | | | | | Merge pull request #16719 from owncloud/fix-encryption-testsThomas Müller2015-06-031-1/+1
|\ \ \ \ \ \
| * | | | | | use not deprecated method in testsMorris Jobke2015-06-031-1/+1
|/ / / / / /
* | | | | | Merge pull request #16434 from owncloud/persist-maintenance-stateThomas Müller2015-06-033-9/+27
|\ \ \ \ \ \
| * | | | | | Persist the state of the maintenance after an upgradeMorris Jobke2015-05-193-9/+27
* | | | | | | Merge pull request #16687 from owncloud/issue-16113-redis-minimum-versionThomas Müller2015-06-033-8/+20
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Check for redis to be 2.2.5+Joas Schilling2015-06-023-8/+20
| | |/ / / / | |/| | | |