summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Delete OCS ID from DB if none is specifiedLukas Reschke2015-07-021-0/+2
| | | | | | If no OCS ID is specified in appinfo.xml and an app update is triggered and a OCS ID is stored in the DB we should clean the value. Ref https://github.com/owncloud/activity/issues/320#issuecomment-117937748
* Merge pull request #17266 from owncloud/stable8.1-backport-17224Thomas Müller2015-07-011-15/+29
|\ | | | | Stable8.1 backport 17224
| * Avoid namespace clashThomas Müller2015-07-011-5/+4
| |
| * Adding exception handling for ServerNotAvailableException - refs #17192Thomas Müller2015-07-011-18/+33
| |
* | Use UTF-8 mode for preg_split and preg_replaceLukas Reschke2015-07-011-2/+3
|/ | | | | | Otherwise a single application with a description containing a non compliant character can break the whole ownCloud appstore. This is for example https://apps.owncloud.com/content/show.php?content=149553 Fixes https://github.com/owncloud/core/issues/17101#issuecomment-117365224
* Merge pull request #17256 from ↵Vincent Petry2015-06-301-1/+4
|\ | | | | | | | | owncloud/locking-disablecallbackwrapperwhendisabled Do not set callback wrapper when locking is disabled
| * Do not set callback wrapper when locking is disabledVincent Petry2015-06-301-1/+4
| |
* | Merge pull request #17225 from owncloud/fix_12106Björn Schießle2015-06-301-3/+19
|\ \ | | | | | | if it is a mount point we need to get the path from the mount manager
| * | if it is a mount point we need to get the path from the mount managerBjoern Schiessle2015-06-301-3/+19
| | |
* | | 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-302-32/+69
|\ \ \ | |/ / |/| | Cleanup part file after upload exception
| * | Unlock first path on rename if second path is lockedVincent Petry2015-06-291-1/+6
| | |
| * | Cleanup part file after upload exceptionVincent Petry2015-06-291-31/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-301-1/+4
|\ \ \ | | | | | | | | Fixing "ImportController::__construct() must implement interface OCP\…
| * | | Fixing "ImportController::__construct() must implement interface ↵Thomas Müller2015-06-291-1/+4
| |/ / | | | | | | | | | OCP\\ICache, instance of OC\\Cache\\File given"
* / / 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 #17231 from owncloud/add-missing-version-fieldMorris Jobke2015-06-291-4/+4
|\ \ | | | | | | Add missing version field
| * | Typehint $targetVersionLukas Reschke2015-06-291-4/+4
| | |
* | | Merge pull request #17229 from owncloud/maintenance-plugin-testJoas Schilling2015-06-291-3/+17
|\ \ \ | |/ / |/| | Unit tests added for MaintenancePlugin
| * | Fixing ctor calls and ctor itself to not break usage in calendar and ↵Thomas Müller2015-06-291-1/+1
| | | | | | | | | | | | contacts .....
| * | Unit tests added for MaintenancePluginThomas Müller2015-06-291-3/+17
| | |
* | | Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-storeLukas Reschke2015-06-293-14/+27
|\ \ \ | |/ / |/| | 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-293-14/+27
| |/
* | Merge pull request #17030 from owncloud/lock-posthooksJoas Schilling2015-06-292-21/+21
|\ \ | | | | | | Keep shared lock for post-hooks
| * | Remove test-specific method to make Bjoern and Joas happyVincent Petry2015-06-261-9/+0
| | |
| * | Keep shared locks in post hooksVincent Petry2015-06-253-21/+30
| | | | | | | | | | | | | | | | | | | | | | | | 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-291-0/+1
|\ \ \ \ | |/ / / |/| | | Request approved state for disabled apps with ocsid
| * | | Request approved state for disabled apps with ocsidLukas Reschke2015-06-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-291-13/+22
|\ \ \ \ | |_|_|/ |/| | | Use new updater URL + add unit tests
| * | | Use new updater URL + add unit testsLukas Reschke2015-06-281-13/+22
| | | | | | | | | | | | | | | | Uses the new updater url "https://updates.owncloud.com/server/"
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2912-4/+22
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2812-0/+26
| | |
* | | Fix indentationLukas Reschke2015-06-271-15/+15
| | |
* | | Add missing annotations for parametersLukas Reschke2015-06-274-26/+36
| | |
* | | Merge pull request #17163 from owncloud/update-licensesLukas Reschke2015-06-27145-97/+242
|\ \ \ | | | | | | | | Update license headers
| * | | update license headers and authorsMorris Jobke2015-06-25145-97/+242
| | | |
* | | | 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
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-272-0/+12
| | | | |
* | | | | 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-261-2/+6
|\ \ \ \ \ | | | | | | | | | | | | 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-261-2/+6
| | | | | |
* | | | | | Merge pull request #17008 from owncloud/fix-17006Björn Schießle2015-06-263-23/+70
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Improve splitting of username and remote adress when username contains an `@`
| * | | | | Use \OC\HintException and translate the hintJoas Schilling2015-06-224-34/+10
| | | | | |
| * | | | | Merge spliteUserRemote with fixRemoteUrlInShareWithJoas Schilling2015-06-222-25/+44
| | | | | |
| * | | | | make sure that we split username and server address at the first '@' from ↵Bjoern Schiessle2015-06-223-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | the right to allow usernames containing '@'