summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-0778-24/+504
|
* [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 notifications
| * Add owner to the storage stats to enable better notificationsMorris Jobke2015-06-055-3/+37
| | | | | | | | | | * getstoragestats.php returns now the owner and it's display name * show proper storage stats notifications for shared folders
* | Merge pull request #16768 from owncloud/add-missing-mime-typesMorris Jobke2015-06-051-0/+3
|\ \ | | | | | | Adding mimetype x-h for header files
| * | Adding mark down mime type mkd - fixes ↵Thomas Müller2015-06-051-0/+1
| | | | | | | | | | | | https://github.com/owncloud/files_texteditor/issues/45
| * | Adding mimetype x-h for header files - fixes ↵Thomas Müller2015-06-051-0/+2
| |/ | | | | | | https://github.com/owncloud/files_texteditor/issues/70
* | Merge pull request #16767 from owncloud/webdav-preventdeleterootLukas Reschke2015-06-052-25/+16
|\ \ | | | | | | Prevent deleting Webdav root
| * | Fix sabre directory test casesVincent Petry2015-06-051-24/+15
| | | | | | | | | | | | | | | | | | | | | - rely on a mock subfolder instead of the root - remove obsolete "Shared" limitation tests which did pass but not for the right reasons - added test for the prevention of root deletion
| * | 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 tags
| * | [OCP] update PHPdoc to contain correct @since tagsMorris Jobke2015-06-057-5/+36
|/ /
* | Merge pull request #16753 from ↵Thomas Müller2015-06-054-0/+80
|\ \ | | | | | | | | | | | | owncloud/issue-16752-check-for-existing-user-in-expire-tasks Check whether the user exists before trying to set up his file system
| * | 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 chunked upload jenkins
| * | 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
|\ \ \ | |/ / |/| | Validate path in getChild
| * | 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 calls
| * | 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 …
| * | | port detection needs to take care of now thrown exceptions when LDAP server ↵Arthur Schiwon2015-06-041-13/+21
| | | | | | | | | | | | | | | | is not available
* | | | [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 PHPDoc
| * | | 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
|\ \ \ | | | | | | | | Get etag from remote OC server
| * | | Disable update check test when testing wrappersVincent Petry2015-06-021-0/+3
| | | | | | | | | | | | | | | | | | | | The checkUpdate test is intended for testing real storages, not wrappers.
| * | | Added storage backend test for checkUpdateVincent Petry2015-06-021-0/+15
| | | | | | | | | | | | | | | | | | | | This helps testing whether checkUpdate properly returns false when no change exists
| * | | 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 tests
| * | | | Fix unit testsLukas Reschke2015-06-031-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression caused by https://github.com/owncloud/core/pull/16721 Failed the unit tests as per https://ci.owncloud.org/job/server-master-linux/database=sqlite,label=SLAVE/1994/testReport/junit/(root)/Test_Encryption_ManagerTest/testGetEncryptionModuleUnknown/: ``` Test\Encryption\ManagerTest::testGetEncryptionModuleUnknown Failed asserting that exception message 'Module with id: unknown does not exist.' contains 'Module with id: unknown does not exists.' ```
* | | | Merge pull request #16703 from owncloud/fix-ie8-ie9Morris Jobke2015-06-031-0/+6
|\ \ \ \ | | | | | | | | | | Fix IE8 & IE9 - setup page
| * | | | 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
| | | | | | | | | | | | | | | | | | | | This reverts commit a4c9688711977376f9d8ad7bf94a1e92d964cd7b.
* | | | | Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversionsMorris Jobke2015-06-032-9/+125
|\ \ \ \ \ | | | | | | | | | | | | Keep versions when deleting as recipient
| * | | | | Keep versions when deleting as recipientVincent Petry2015-06-022-9/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original owner could not be resolved because the original file was already deleted, so no versions were retained. This fix passes the owner and path to retainVersions() since it was already resolved before the file deletion. This reactivates the versions logic and creates a copy of the versions in each trashbin.
* | | | | | Merge pull request #16721 from owncloud/fix-grammar-enc-moduleClark Tomlinson2015-06-031-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/t…
| * | | | | Catch NotFoundException and return no quota information which simply ↵Thomas Müller2015-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | reflects the current state - no file storage has been initialized for the user.
| * | | | | Fixing grammar - refs ↵Thomas Müller2015-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | https://www.transifex.com/projects/p/owncloud/translate/#en_GB/lib/50330746
* | | | | | Merge pull request #16719 from owncloud/fix-encryption-testsThomas Müller2015-06-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | use not deprecated method in tests
| * | | | | | 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 upgrade
| * | | | | | Persist the state of the maintenance after an upgradeMorris Jobke2015-05-193-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * if maintenance mode was enabled before an upgrade it will be enabled afterwards too * fixes #16429
* | | | | | | 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+
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 00:38:35 +0000