summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 8.1 RC2v8.1RC2C Montero-Luque2015-06-301-2/+2
* Merge pull request #17255 from owncloud/fix-17119Thomas Müller2015-07-019-1/+389
|\
| * tests solidityArthur Schiwon2015-06-303-0/+24
| * adjust unit testArthur Schiwon2015-06-301-0/+4
| * integration testArthur Schiwon2015-06-305-0/+331
| * ensure groups match filter when using memberOf to read users group, refs #17119Arthur Schiwon2015-06-262-1/+30
* | Merge pull request #17256 from owncloud/locking-disablecallbackwrapperwhendis...Vincent Petry2015-06-301-1/+4
|\ \
| * | 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 managerBjoern Schiessle2015-06-301-3/+19
* | | | Merge pull request #17251 from owncloud/issue-17247-filesize-stat-failed-for-...Vincent Petry2015-06-301-2/+6
|\ \ \ \
| * | | | Perform the filesize only when the file existsJoas Schilling2015-06-301-2/+6
| | |/ / | |/| |
* | | | Merge pull request #17189 from owncloud/files-straypartfilesonexceptionMorris Jobke2015-06-304-61/+416
|\ \ \ \ | |/ / / |/| | |
| * | | Unlock first path on rename if second path is lockedVincent Petry2015-06-292-1/+39
| * | | Cleanup part file after upload exceptionVincent Petry2015-06-292-60/+377
* | | | Merge pull request #17249 from owncloud/file-cache-is-a-icacheJoas Schilling2015-06-302-1/+5
|\ \ \ \
| * | | | Fixing "ImportController::__construct() must implement interface OCP\\ICache,...Thomas Müller2015-06-292-1/+5
| |/ / /
* | | | Merge pull request #17239 from owncloud/files-nameconflictfixThomas Müller2015-06-291-3/+2
|\ \ \ \
| * | | | Fix class name conflictVincent Petry2015-06-291-3/+2
| |/ / /
* | | | Merge pull request #17240 from owncloud/do-not-rely-on-php-being-fastThomas Müller2015-06-291-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Do not rely on actual time in unit testsLukas Reschke2015-06-291-5/+5
|/ / /
* | | Merge pull request #17231 from owncloud/add-missing-version-fieldMorris Jobke2015-06-292-6/+6
|\ \ \
| * | | Typehint $targetVersionLukas Reschke2015-06-291-4/+4
| * | | Add missing version fieldLukas Reschke2015-06-291-2/+2
* | | | Merge pull request #17229 from owncloud/maintenance-plugin-testJoas Schilling2015-06-294-5/+92
|\ \ \ \ | |/ / / |/| | |
| * | | Fixing ctor calls and ctor itself to not break usage in calendar and contacts...Thomas Müller2015-06-293-3/+3
| * | | Unit tests added for MaintenancePluginThomas Müller2015-06-292-3/+90
* | | | Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-storeLukas Reschke2015-06-295-35/+58
|\ \ \ \ | |/ / / |/| | |
| * | | Send OC version to appstore so it can reply with the right linksJoas Schilling2015-06-295-35/+58
| |/ /
* | | Merge pull request #17030 from owncloud/lock-posthooksJoas Schilling2015-06-296-25/+706
|\ \ \
| * | | 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
| | |/ | |/|
* | | 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 exceptionThomas Müller2015-06-291-11/+13
* | | | Merge pull request #17050 from owncloud/request-status-from-ocsLukas Reschke2015-06-293-0/+21
|\ \ \ \ | |/ / / |/| | |
| * | | Also load enabled appsLukas Reschke2015-06-291-0/+9
| * | | Request approved state for disabled apps with ocsidLukas Reschke2015-06-193-0/+12
* | | | Merge pull request #17217 from owncloud/use-new-updater-urlThomas Müller2015-06-292-86/+335
|\ \ \ \ | |_|_|/ |/| | |
| * | | Build base URLLukas Reschke2015-06-281-5/+13
| * | | Use new updater URL + add unit testsLukas Reschke2015-06-282-86/+327
* | | | Merge pull request #17083 from owncloud/share-etag-update-targetVincent Petry2015-06-292-10/+38
|\ \ \ \
| * | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update commentLukas Reschke2015-06-281-1/+1
| * | | | Increase timeout againLukas Reschke2015-06-281-1/+1
|/ / / /
* | | | [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
|\ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 14:01:09 +0000