summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| | | | |
* | | | | Merge pull request #17206 from oparoz/bpg-media-typeRoeland Douma2015-06-271-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Adding BPG media type
| * | | | | Adding BPG media typeOlivier Paroz2015-06-261-0/+1
| | | | | |
* | | | | | Merge pull request #17199 from ↵Lukas Reschke2015-06-272-0/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/feature/show-error-when-shareservice-dies add check if server returns a 500 and display error
| * | | | | | add check if server returns a 500 and display errorClark Tomlinson2015-06-262-0/+19
| |/ / / / / | | | | | | | | | | | | | | | | | | resolves https://github.com/owncloud/core/issues/17170
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2756-74/+72
| | | | | |
* | | | | | Merge pull request #17202 from oparoz/repair-scan-signatureJoas Schilling2015-06-271-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Signature of overriding method should match the parent
| * | | | | | Signature of overriding method should match the parentOlivier Paroz2015-06-261-1/+1
| |/ / / / /
* | | | | | Merge pull request #17203 from owncloud/fix-share-autocompleteBjörn Schießle2015-06-261-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix z-index of share-autocomplete
| * | | | | | fix z-index of share-autocompleteJan-Christoph Borchardt2015-06-261-0/+1
| |/ / / / /
* | | | | | Merge pull request #17071 from owncloud/share-get-users-non-existingVincent Petry2015-06-261-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | fix getUsersSharingFile with locking
| * | | | | fix getUsersSharingFile with lockingRobin Appelman2015-06-261-2/+2
| | | | | |
* | | | | | Merge pull request #17191 from owncloud/issue-17188-group-share-part-fileThomas Müller2015-06-262-10/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Correctly check if the real file exists, otherwise try the part file
| * | | | | | Correctly check if the real file exists, otherwise try the part fileJoas Schilling2015-06-262-10/+24
| | | | | | |
* | | | | | | Merge pull request #17008 from owncloud/fix-17006Björn Schießle2015-06-267-49/+152
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Improve splitting of username and remote adress when username contains an `@`
| * | | | | | Use \OC\HintException and translate the hintJoas Schilling2015-06-228-35/+46
| | | | | | |
| * | | | | | Merge spliteUserRemote with fixRemoteUrlInShareWithJoas Schilling2015-06-223-74/+75
| | | | | | |
| * | | | | | make sure that we split username and server address at the first '@' from ↵Bjoern Schiessle2015-06-224-1/+92
| | |_|/ / / | |/| | | | | | | | | | | | | | | | the right to allow usernames containing '@'
* | | | | | Merge pull request #17009 from owncloud/lock-downloadfileThomas Müller2015-06-261-6/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Lock file during download
| * | | | | | Enable x-sendfile only if we do not lock the file systemThomas Müller2015-06-221-4/+8
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 21:01:04 +0000