summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adding request specific exception handling - now with WebDAV responses - ↵Thomas Müller2015-06-301-7/+33
| | | | refs #17192
* Adding exception handling for ServerNotAvailableException - refs #17192Thomas Müller2015-06-301-18/+33
|
* Merge pull request #17251 from ↵Vincent Petry2015-06-301-2/+6
|\ | | | | | | | | owncloud/issue-17247-filesize-stat-failed-for-in-log Perform the filesize on the file that exists
| * Perform the filesize only when the file existsJoas Schilling2015-06-301-2/+6
| | | | | | | | | | Regression from 95602d4069a1eb9a45e1d08edeecc0d5b90e01ca and 9b336765b69bf7b7e2cd67a824862411b249aa4d
* | Merge pull request #17189 from owncloud/files-straypartfilesonexceptionMorris Jobke2015-06-304-61/+416
|\ \ | |/ |/| Cleanup part file after upload exception
| * Unlock first path on rename if second path is lockedVincent Petry2015-06-292-1/+39
| |
| * Cleanup part file after upload exceptionVincent Petry2015-06-292-60/+377
| | | | | | | | | | | | | | | | | | | | | | | | Added unit tests for checking for stray part files. Convert exception to sabre exception in upload put method. Also added unit test for exception mapping, which also indirectly tests that the part file is being deleted on exception. This applies to both chunking and non-chunking mode. Added some unit tests for chunk upload.
* | Merge pull request #17249 from owncloud/file-cache-is-a-icacheJoas Schilling2015-06-302-1/+5
|\ \ | | | | | | Fixing "ImportController::__construct() must implement interface OCP\…
| * | Fixing "ImportController::__construct() must implement interface ↵Thomas Müller2015-06-292-1/+5
| |/ | | | | | | OCP\\ICache, instance of OC\\Cache\\File given"
* | Merge pull request #17239 from owncloud/files-nameconflictfixThomas Müller2015-06-291-3/+2
|\ \ | | | | | | Fix class name conflict
| * | Fix class name conflictVincent Petry2015-06-291-3/+2
| |/ | | | | | | | | | | Looks like PHP 5.6.x doesn't like name conflicts. \Sabre\DAV\Server would overlap with \OC\Connector\Sabre\Server.
* | Merge pull request #17240 from owncloud/do-not-rely-on-php-being-fastThomas Müller2015-06-291-5/+5
|\ \ | |/ |/| Do not rely on actual time in unit tests
| * Do not rely on actual time in unit testsLukas Reschke2015-06-291-5/+5
|/ | | | Ref https://github.com/owncloud/core/pull/17238#issuecomment-116724055
* Merge pull request #17231 from owncloud/add-missing-version-fieldMorris Jobke2015-06-292-6/+6
|\ | | | | Add missing version field
| * Typehint $targetVersionLukas Reschke2015-06-291-4/+4
| |
| * Add missing version fieldLukas Reschke2015-06-291-2/+2
| |
* | Merge pull request #17229 from owncloud/maintenance-plugin-testJoas Schilling2015-06-294-5/+92
|\ \ | |/ |/| Unit tests added for MaintenancePlugin
| * Fixing ctor calls and ctor itself to not break usage in calendar and ↵Thomas Müller2015-06-293-3/+3
| | | | | | | | contacts .....
| * Unit tests added for MaintenancePluginThomas Müller2015-06-292-3/+90
| |
* | Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-storeLukas Reschke2015-06-295-35/+58
|\ \ | |/ |/| Send OC version to appstore so it can reply with the right links
| * Send OC version to appstore so it can reply with the right linksJoas Schilling2015-06-295-35/+58
| |
* | Merge pull request #17030 from owncloud/lock-posthooksJoas Schilling2015-06-296-25/+706
|\ \ | | | | | | Keep shared lock for post-hooks
| * | Remove test-specific method to make Bjoern and Joas happyVincent Petry2015-06-262-10/+1
| | |
| * | Release locks after class in testsVincent Petry2015-06-251-0/+8
| | |
| * | Keep shared locks in post hooksVincent Petry2015-06-257-25/+707
| | | | | | | | | | | | | | | | | | | | | | | | Instead of unlocking after the file operation, change exclusive locks back to shared locks during post hooks, and unlock after that. Also added unit tests to test locking in pre-hooks, during operation and post-hooks.
* | | Merge pull request #17226 from owncloud/webdav-add-message-on-maintenanceMorris Jobke2015-06-291-11/+13
|\ \ \ | | | | | | | | In case of maintenance we should add a message to the exception
| * | | In case of maintenance we should add a message to the exceptionThomas Müller2015-06-291-11/+13
| | | |
* | | | Merge pull request #17050 from owncloud/request-status-from-ocsLukas Reschke2015-06-293-0/+21
|\ \ \ \ | |/ / / |/| | | Request approved state for disabled apps with ocsid
| * | | Also load enabled appsLukas Reschke2015-06-291-0/+9
| | | |
| * | | Request approved state for disabled apps with ocsidLukas Reschke2015-06-193-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case an application gets disabled the level is set to "experimental" if it does not contain a `shipped` tag. This can for example be reproduced by installing the documents app from the appstore and then disabling it. Or cloning an app from git. With this change the controller will now load the level of the application from the appstore if a valid OCSID has been provided. Fixes https://github.com/owncloud/core/issues/17003
* | | | Merge pull request #17217 from owncloud/use-new-updater-urlThomas Müller2015-06-292-86/+335
|\ \ \ \ | |_|_|/ |/| | | Use new updater URL + add unit tests
| * | | Build base URLLukas Reschke2015-06-281-5/+13
| | | |
| * | | Use new updater URL + add unit testsLukas Reschke2015-06-282-86/+327
| | | | | | | | | | | | | | | | Uses the new updater url "https://updates.owncloud.com/server/"
* | | | Merge pull request #17083 from owncloud/share-etag-update-targetVincent Petry2015-06-292-10/+38
|\ \ \ \ | | | | | | | | | | take share target into account when updating recipient etags
| * | | | Unit test for etag update on custom share folderVincent Petry2015-06-261-8/+36
| | | | |
| * | | | take share target into account when updating recipient etagsRobin Appelman2015-06-221-2/+2
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2964-14/+164
| | | | |
* | | | | Merge pull request #17219 from owncloud/LukasReschke-patch-1Thomas Müller2015-06-281-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Increase timeout again
| * | | | Update commentLukas Reschke2015-06-281-1/+1
| | | | |
| * | | | Increase timeout againLukas Reschke2015-06-281-1/+1
|/ / / / | | | | | | | | Our test execution is terribly slow and now also exceeds more than one hour on our CI system. This means that Scrutinizer fails hard on a lot of PRs such as https://github.com/owncloud/core/pull/17217#issuecomment-116252420
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2848-10/+142
| | | |
* | | | Merge pull request #17214 from owncloud/fix-php-doc-user-interfaceLukas Reschke2015-06-276-50/+67
|\ \ \ \ | | | | | | | | | | Fix PHPDoc + Indentation
| * | | | Fix indentationLukas Reschke2015-06-271-15/+15
| | | | |
| * | | | Add missing annotations for parametersLukas Reschke2015-06-276-35/+52
| | | | |
* | | | | Merge pull request #17212 from owncloud/ocs-specLukas Reschke2015-06-275-0/+298
|\ \ \ \ \ | |/ / / / |/| | | | Add endpoint with list of OCS providers
| * | | | Add endpoint with list of OCS providersLukas Reschke2015-06-275-0/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a OCS provider list at `ocs-provider/` to enable a somewhat autodiscovery of services. In the moment it is not possible for applications to add own entries and it is basically hard-coded in the controller. I'm aware that this is not an optimal solution and I'm happy for any pragmatic input that won't pollute our public API too much. (and is not a big super hack, this is already hacky enough ;-)) That said, I'd consider it as a first step also feasible to go with this somewhat hard-coded list and see if this gets adopted...
* | | | | Merge pull request #17163 from owncloud/update-licensesLukas Reschke2015-06-27304-228/+631
|\ \ \ \ \ | |/ / / / |/| | | | Update license headers
| * | | | add additional email address for GeorgMorris Jobke2015-06-251-0/+1
| | | | |
| * | | | update license headers and authorsMorris Jobke2015-06-25302-227/+629
| | | | |
| * | | | [license script] sort names case insensitiveMorris Jobke2015-06-251-1/+1
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-14 08:27:35 +0000