summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Make sure the owner always has the right pathJoas Schilling2015-07-071-3/+6
|
* Fix the path for users which have an exception for a group shareJoas Schilling2015-07-021-7/+22
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-024-0/+12
|
* Merge pull request #17252 from owncloud/fix-php-errors-in-app-descriptionMorris Jobke2015-07-011-15/+19
|\ | | | | Only do the description kung-fu on strings
| * Only do the description kung-fu on strings - fixes #17028Thomas Müller2015-07-011-15/+19
| |
* | Merge pull request #17268 from owncloud/files-cleanuppartfileonlyonceVincent Petry2015-07-011-4/+8
|\ \ | | | | | | Clean up part file only once, not twice on error
| * | Only delete part file on error if it is really a part fileVincent Petry2015-07-011-2/+6
| | |
| * | Clean up part file only once, not twice on errorVincent Petry2015-07-011-2/+2
| |/
* / Changed broken links to php manualMichael Roth2015-07-011-2/+2
|/
* Merge pull request #17088 from owncloud/add-verbosity-to-upgradeMorris Jobke2015-07-012-0/+7
|\ | | | | [upgrade] add verbosity check and show repair info & steps
| * [Repair] add repair info for changed collationMorris Jobke2015-06-241-0/+1
| |
| * [upgrade] add verbosity check and show repair info & stepsMorris Jobke2015-06-241-0/+6
| |
* | Merge pull request #17093 from owncloud/upgrade-timestampMorris Jobke2015-07-011-0/+107
|\ \ | | | | | | [upgrade] show timestamp for output during upgrade
| * | Use a OutputFormatter instead of hacking into writeln()Joas Schilling2015-06-241-0/+107
| |/
* | Merge pull request #17078 from owncloud/fix-initial-server-hostMorris Jobke2015-07-011-6/+5
|\ \ | | | | | | Fix undefined offset
| * | Fix undefined offsetLukas Reschke2015-06-221-6/+5
| | | | | | | | | | | | There are cases where no trusted host is specified such as when installing the instance, this lead to an undefined offset warning in the log right after installing. (when another domain than localhost or 127.0.0.1 was used)
* | | Merge pull request #16406 from owncloud/enc-strlenperffixMorris Jobke2015-07-011-1/+1
|\ \ \ | | | | | | | | Small perf tweak in strlen loop
| * | | Small perf tweak in strlen loopVincent Petry2015-05-181-1/+1
| | | |
* | | | Merge pull request #15569 from owncloud/remove-getetag-propertiesMorris Jobke2015-07-012-0/+61
|\ \ \ \ | | | | | | | | | | Remove unneeded getetag entries in properties table
| * | | | Remove unneeded getetag entries in properties tableMorris Jobke2015-06-252-0/+61
| | | | | | | | | | | | | | | | | | | | * fixes #13281
* | | | | Merge pull request #17224 from ↵Vincent Petry2015-07-011-15/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/webdav-handle-ServerNotAvailableException Adding exception handling for ServerNotAvailableException
| * | | | | Avoid namespace clashThomas Müller2015-06-301-5/+4
| | | | | |
| * | | | | Adding exception handling for ServerNotAvailableException - refs #17192Thomas Müller2015-06-301-18/+33
| | | | | |
* | | | | | Merge pull request #17259 from owncloud/chunk-cleanupgracefulonlockVincent Petry2015-07-012-5/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not try clearing locked files in cache folder
| * | | | | | Catch cache garbage collection exception on postLoginVincent Petry2015-06-301-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Just log the exception instead of preventing access to OC.
| * | | | | | Do not try clearing locked files in cache folderVincent Petry2015-06-301-3/+10
| |/ / / / /
* | | | | | 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