Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | ensure groups match filter when using memberOf to read users group, refs #17119 | Arthur Schiwon | 2015-06-26 | 2 | -1/+30 | |
* | | | | | | | | | Merge pull request #17256 from owncloud/locking-disablecallbackwrapperwhendis... | Vincent Petry | 2015-06-30 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 | Bjoern Schiessle | 2015-06-30 | 1 | -3/+19 | |
* | | | | | | | | | | Merge pull request #17251 from owncloud/issue-17247-filesize-stat-failed-for-... | Vincent Petry | 2015-06-30 | 1 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Perform the filesize only when the file exists | Joas Schilling | 2015-06-30 | 1 | -2/+6 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #17189 from owncloud/files-straypartfilesonexception | Morris Jobke | 2015-06-30 | 4 | -61/+416 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Unlock first path on rename if second path is locked | Vincent Petry | 2015-06-29 | 2 | -1/+39 | |
| * | | | | | | | | | Cleanup part file after upload exception | Vincent Petry | 2015-06-29 | 2 | -60/+377 | |
* | | | | | | | | | | Merge pull request #17249 from owncloud/file-cache-is-a-icache | Joas Schilling | 2015-06-30 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fixing "ImportController::__construct() must implement interface OCP\\ICache,... | Thomas Müller | 2015-06-29 | 2 | -1/+5 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #17239 from owncloud/files-nameconflictfix | Thomas Müller | 2015-06-29 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix class name conflict | Vincent Petry | 2015-06-29 | 1 | -3/+2 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #17240 from owncloud/do-not-rely-on-php-being-fast | Thomas Müller | 2015-06-29 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Do not rely on actual time in unit tests | Lukas Reschke | 2015-06-29 | 1 | -5/+5 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #17231 from owncloud/add-missing-version-field | Morris Jobke | 2015-06-29 | 2 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Typehint $targetVersion | Lukas Reschke | 2015-06-29 | 1 | -4/+4 | |
| * | | | | | | | | | Add missing version field | Lukas Reschke | 2015-06-29 | 1 | -2/+2 | |
* | | | | | | | | | | Merge pull request #17229 from owncloud/maintenance-plugin-test | Joas Schilling | 2015-06-29 | 4 | -5/+92 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fixing ctor calls and ctor itself to not break usage in calendar and contacts... | Thomas Müller | 2015-06-29 | 3 | -3/+3 | |
| * | | | | | | | | | Unit tests added for MaintenancePlugin | Thomas Müller | 2015-06-29 | 2 | -3/+90 | |
* | | | | | | | | | | Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-store | Lukas Reschke | 2015-06-29 | 5 | -35/+58 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Send OC version to appstore so it can reply with the right links | Joas Schilling | 2015-06-29 | 5 | -35/+58 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #17030 from owncloud/lock-posthooks | Joas Schilling | 2015-06-29 | 6 | -25/+706 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove test-specific method to make Bjoern and Joas happy | Vincent Petry | 2015-06-26 | 2 | -10/+1 | |
| * | | | | | | | | | Release locks after class in tests | Vincent Petry | 2015-06-25 | 1 | -0/+8 | |
| * | | | | | | | | | Keep shared locks in post hooks | Vincent Petry | 2015-06-25 | 7 | -25/+707 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | 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 | Thomas Müller | 2015-06-29 | 1 | -11/+13 | |
* | | | | | | | | | | Merge pull request #17050 from owncloud/request-status-from-ocs | Lukas Reschke | 2015-06-29 | 3 | -0/+21 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Also load enabled apps | Lukas Reschke | 2015-06-29 | 1 | -0/+9 | |
| * | | | | | | | | | Request approved state for disabled apps with ocsid | Lukas Reschke | 2015-06-19 | 3 | -0/+12 | |
* | | | | | | | | | | Merge pull request #17217 from owncloud/use-new-updater-url | Thomas Müller | 2015-06-29 | 2 | -86/+335 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Build base URL | Lukas Reschke | 2015-06-28 | 1 | -5/+13 | |
| * | | | | | | | | | Use new updater URL + add unit tests | Lukas Reschke | 2015-06-28 | 2 | -86/+327 | |
* | | | | | | | | | | Merge pull request #17083 from owncloud/share-etag-update-target | Vincent Petry | 2015-06-29 | 2 | -10/+38 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Unit test for etag update on custom share folder | Vincent Petry | 2015-06-26 | 1 | -8/+36 | |
| * | | | | | | | | | | take share target into account when updating recipient etags | Robin Appelman | 2015-06-22 | 1 | -2/+2 | |
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-29 | 64 | -14/+164 | |
* | | | | | | | | | | | Merge pull request #17219 from owncloud/LukasReschke-patch-1 | Thomas Müller | 2015-06-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Update comment | Lukas Reschke | 2015-06-28 | 1 | -1/+1 | |
| * | | | | | | | | | | Increase timeout again | Lukas Reschke | 2015-06-28 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-28 | 48 | -10/+142 | |
* | | | | | | | | | | Merge pull request #17214 from owncloud/fix-php-doc-user-interface | Lukas Reschke | 2015-06-27 | 6 | -50/+67 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix indentation | Lukas Reschke | 2015-06-27 | 1 | -15/+15 | |
| * | | | | | | | | | | Add missing annotations for parameters | Lukas Reschke | 2015-06-27 | 6 | -35/+52 | |
* | | | | | | | | | | | Merge pull request #17212 from owncloud/ocs-spec | Lukas Reschke | 2015-06-27 | 5 | -0/+298 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Add endpoint with list of OCS providers | Lukas Reschke | 2015-06-27 | 5 | -0/+298 | |
* | | | | | | | | | | | Merge pull request #17163 from owncloud/update-licenses | Lukas Reschke | 2015-06-27 | 304 | -228/+631 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | |