summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 8.2 RC1v8.2RC1C Montero-Luque2015-10-061-2/+2
* Merge pull request #19511 from owncloud/etag-share-permissions-updateRobin Appelman2015-10-065-5/+37
|\
| * fix phpdocRobin Appelman2015-10-061-1/+1
| * use microtimeRobin Appelman2015-10-061-1/+1
| * clear hooks for testsRobin Appelman2015-10-061-0/+1
| * Mark shares as dirty when changing permissionsRobin Appelman2015-10-064-4/+35
* | Merge pull request #18128 from owncloud/share-groupchangeetagpropagationThomas Müller2015-10-064-0/+336
|\ \
| * | Propagate shares etag when group membership changedVincent Petry2015-10-064-0/+336
* | | Merge pull request #19207 from RealRancor/fix_mount.json_dirThomas Müller2015-10-061-1/+2
|\ \ \
| * | | Path to mount.json needs to be absolute in config.sample.phpRealRancor2015-09-291-1/+2
* | | | Merge pull request #19602 from owncloud/allow-certificate-importThomas Müller2015-10-062-3/+6
|\ \ \ \
| * | | | Only show import button if user storages are allowedLukas Reschke2015-10-061-1/+3
| * | | | Fix importing of certificatesLukas Reschke2015-10-061-2/+3
* | | | | Merge pull request #19605 from owncloud/add-get-http-protocolThomas Müller2015-10-063-0/+80
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add \OCP\IRequest::getHttpProtocolLukas Reschke2015-10-063-0/+80
| |/ / /
* | | | Merge pull request #19603 from owncloud/fix-invalid-class-usageThomas Müller2015-10-061-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | OC_Log not longer existsThomas Müller2015-10-061-1/+1
* | | | Merge pull request #19595 from owncloud/fix-versions-log-entryThomas Müller2015-10-061-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Reset to auto if not setVictor Dubiniuk2015-10-051-1/+1
* | | | Merge pull request #19526 from owncloud/issue-16251-reload-app-settings-when-...Thomas Müller2015-10-062-2/+25
|\ \ \ \
| * | | | fix wordingMorris Jobke2015-10-061-1/+1
| * | | | Use OC.Dialogs for modal reload messageMorris Jobke2015-10-051-1/+15
| * | | | Reload the page when an app needs an update after being enabledJoas Schilling2015-10-052-2/+11
* | | | | Merge pull request #19407 from owncloud/lock-zip-contentThomas Müller2015-10-062-84/+135
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Refactor single file download into it's own methodThomas Müller2015-10-051-76/+71
| * | | | Recursively lock folder contentsThomas Müller2015-10-051-6/+27
| * | | | release locks in case of exceptionThomas Müller2015-10-051-0/+2
| * | | | log the exception during zip creationThomas Müller2015-10-051-13/+26
| * | | | Lock files which are zippedThomas Müller2015-10-051-6/+26
| * | | | Clean PHPDocThomas Müller2015-10-051-6/+6
* | | | | Merge pull request #19452 from owncloud/ocs_provisioning_api_more_testsThomas Müller2015-10-063-13/+130
|\ \ \ \ \
| * | | | | [Intergration] Throw error if exception not thrownRoeland Jago Douma2015-10-061-17/+2
| * | | | | added a couple of testsSergio Bertolin2015-10-061-0/+15
| * | | | | restored assertions in existance of users and groupsSergio Bertolin2015-10-061-12/+14
| * | | | | Being explicit between http and ocs return codesSergio Bertolin2015-10-063-20/+37
| * | | | | added edit user testSergio Bertolin2015-10-061-0/+12
| * | | | | Return the actual ocs return codes and check itSergio Bertolin2015-10-062-18/+37
| * | | | | added some deletion logicSergio Bertolin2015-10-061-1/+0
| * | | | | added some deletion logicSergio Bertolin2015-10-061-2/+9
| * | | | | added some group logicSergio Bertolin2015-10-062-0/+61
* | | | | | Merge pull request #19597 from owncloud/update-license-headersThomas Müller2015-10-06370-237/+481
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | deduplicate @xenopathicMorris Jobke2015-10-06118-118/+101
| * | | | | update licence headers via scriptMorris Jobke2015-10-05328-190/+450
| * | | | | Update license header script to only use code changesMorris Jobke2015-10-051-2/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #19577 from owncloud/share-donotreturnentrieswhenusernotin...Thomas Müller2015-10-062-0/+43
|\ \ \ \ \
| * | | | | Remove invalid share items from result when missing group membershipVincent Petry2015-10-052-0/+43
| | |/ / / | |/| | |
* | | | | Merge pull request #19535 from owncloud/check-memcache-moduleThomas Müller2015-10-064-6/+65
|\ \ \ \ \
| * | | | | [admin] check for correct PHP memcached moduleMorris Jobke2015-10-064-6/+65
* | | | | | Merge pull request #19530 from owncloud/issue-13213-sharing-conflict-when-sha...Thomas Müller2015-10-062-1/+36
|\ \ \ \ \ \
| * | | | | | Add a unit test for "share a file inside a folder that is already shared"Joas Schilling2015-10-051-0/+33
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 13:58:03 +0000