Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make sure the owner always has the right path | Joas Schilling | 2015-07-07 | 1 | -3/+6 |
| | |||||
* | Fix the path for users which have an exception for a group share | Joas Schilling | 2015-07-02 | 1 | -7/+22 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-02 | 4 | -0/+12 |
| | |||||
* | Merge pull request #17252 from owncloud/fix-php-errors-in-app-description | Morris Jobke | 2015-07-01 | 1 | -15/+19 |
|\ | | | | | Only do the description kung-fu on strings | ||||
| * | Only do the description kung-fu on strings - fixes #17028 | Thomas Müller | 2015-07-01 | 1 | -15/+19 |
| | | |||||
* | | Merge pull request #17268 from owncloud/files-cleanuppartfileonlyonce | Vincent Petry | 2015-07-01 | 1 | -4/+8 |
|\ \ | | | | | | | Clean up part file only once, not twice on error | ||||
| * | | Only delete part file on error if it is really a part file | Vincent Petry | 2015-07-01 | 1 | -2/+6 |
| | | | |||||
| * | | Clean up part file only once, not twice on error | Vincent Petry | 2015-07-01 | 1 | -2/+2 |
| |/ | |||||
* / | Changed broken links to php manual | Michael Roth | 2015-07-01 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #17088 from owncloud/add-verbosity-to-upgrade | Morris Jobke | 2015-07-01 | 2 | -0/+7 |
|\ | | | | | [upgrade] add verbosity check and show repair info & steps | ||||
| * | [Repair] add repair info for changed collation | Morris Jobke | 2015-06-24 | 1 | -0/+1 |
| | | |||||
| * | [upgrade] add verbosity check and show repair info & steps | Morris Jobke | 2015-06-24 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #17093 from owncloud/upgrade-timestamp | Morris Jobke | 2015-07-01 | 1 | -0/+107 |
|\ \ | | | | | | | [upgrade] show timestamp for output during upgrade | ||||
| * | | Use a OutputFormatter instead of hacking into writeln() | Joas Schilling | 2015-06-24 | 1 | -0/+107 |
| |/ | |||||
* | | Merge pull request #17078 from owncloud/fix-initial-server-host | Morris Jobke | 2015-07-01 | 1 | -6/+5 |
|\ \ | | | | | | | Fix undefined offset | ||||
| * | | Fix undefined offset | Lukas Reschke | 2015-06-22 | 1 | -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-strlenperffix | Morris Jobke | 2015-07-01 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Small perf tweak in strlen loop | ||||
| * | | | Small perf tweak in strlen loop | Vincent Petry | 2015-05-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #15569 from owncloud/remove-getetag-properties | Morris Jobke | 2015-07-01 | 2 | -0/+61 |
|\ \ \ \ | | | | | | | | | | | Remove unneeded getetag entries in properties table | ||||
| * | | | | Remove unneeded getetag entries in properties table | Morris Jobke | 2015-06-25 | 2 | -0/+61 |
| | | | | | | | | | | | | | | | | | | | | * fixes #13281 | ||||
* | | | | | Merge pull request #17224 from ↵ | Vincent Petry | 2015-07-01 | 1 | -15/+29 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/webdav-handle-ServerNotAvailableException Adding exception handling for ServerNotAvailableException | ||||
| * | | | | | Avoid namespace clash | Thomas Müller | 2015-06-30 | 1 | -5/+4 |
| | | | | | | |||||
| * | | | | | Adding exception handling for ServerNotAvailableException - refs #17192 | Thomas Müller | 2015-06-30 | 1 | -18/+33 |
| | | | | | | |||||
* | | | | | | Merge pull request #17259 from owncloud/chunk-cleanupgracefulonlock | Vincent Petry | 2015-07-01 | 2 | -5/+18 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Do not try clearing locked files in cache folder | ||||
| * | | | | | | Catch cache garbage collection exception on postLogin | Vincent Petry | 2015-06-30 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just log the exception instead of preventing access to OC. | ||||
| * | | | | | | Do not try clearing locked files in cache folder | Vincent Petry | 2015-06-30 | 1 | -3/+10 |
| |/ / / / / | |||||
* | | | | | | Use UTF-8 mode for preg_split and preg_replace | Lukas Reschke | 2015-07-01 | 1 | -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 Petry | 2015-06-30 | 1 | -1/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/locking-disablecallbackwrapperwhendisabled Do not set callback wrapper when locking is disabled | ||||
| * | | | | | | Do not set callback wrapper when locking is disabled | Vincent Petry | 2015-06-30 | 1 | -1/+4 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #17225 from owncloud/fix_12106 | Björn Schießle | 2015-06-30 | 1 | -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 manager | Bjoern Schiessle | 2015-06-30 | 1 | -3/+19 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #17251 from ↵ | Vincent Petry | 2015-06-30 | 1 | -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 exists | Joas Schilling | 2015-06-30 | 1 | -2/+6 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from 95602d4069a1eb9a45e1d08edeecc0d5b90e01ca and 9b336765b69bf7b7e2cd67a824862411b249aa4d | ||||
* | | | | | | | Merge pull request #17189 from owncloud/files-straypartfilesonexception | Morris Jobke | 2015-06-30 | 2 | -32/+69 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Cleanup part file after upload exception | ||||
| * | | | | | | Unlock first path on rename if second path is locked | Vincent Petry | 2015-06-29 | 1 | -1/+6 |
| | | | | | | | |||||
| * | | | | | | Cleanup part file after upload exception | Vincent Petry | 2015-06-29 | 1 | -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-icache | Joas Schilling | 2015-06-30 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixing "ImportController::__construct() must implement interface OCP\… | ||||
| * | | | | | | | Fixing "ImportController::__construct() must implement interface ↵ | Thomas Müller | 2015-06-29 | 1 | -1/+4 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | OCP\\ICache, instance of OC\\Cache\\File given" | ||||
* / / / / / / | Fix class name conflict | Vincent Petry | 2015-06-29 | 1 | -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-field | Morris Jobke | 2015-06-29 | 1 | -4/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add missing version field | ||||
| * | | | | | | Typehint $targetVersion | Lukas Reschke | 2015-06-29 | 1 | -4/+4 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #17229 from owncloud/maintenance-plugin-test | Joas Schilling | 2015-06-29 | 1 | -3/+17 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Unit tests added for MaintenancePlugin | ||||
| * | | | | | | Fixing ctor calls and ctor itself to not break usage in calendar and ↵ | Thomas Müller | 2015-06-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | contacts ..... | ||||
| * | | | | | | Unit tests added for MaintenancePlugin | Thomas Müller | 2015-06-29 | 1 | -3/+17 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-store | Lukas Reschke | 2015-06-29 | 3 | -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 links | Joas Schilling | 2015-06-29 | 3 | -14/+27 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #17030 from owncloud/lock-posthooks | Joas Schilling | 2015-06-29 | 2 | -21/+21 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Keep shared lock for post-hooks | ||||
| * | | | | | | Remove test-specific method to make Bjoern and Joas happy | Vincent Petry | 2015-06-26 | 1 | -9/+0 |
| | | | | | | | |||||
| * | | | | | | Keep shared locks in post hooks | Vincent Petry | 2015-06-25 | 3 | -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-maintenance | Morris Jobke | 2015-06-29 | 1 | -11/+13 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | In case of maintenance we should add a message to the exception |