summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | register the external share mount providerRobin Appelman2015-10-051-0/+1
| * | | | | | | | Make the external share manager a mount providerRobin Appelman2015-10-053-46/+44
* | | | | | | | | Merge pull request #19489 from owncloud/fix-18297Thomas Müller2015-10-073-1/+106
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix possible infinite loop when reading groups in the wizardArthur Schiwon2015-10-053-1/+106
* | | | | | | | | | Merge pull request #19537 from owncloud/fix-white-page-of-deathThomas Müller2015-10-071-19/+64
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Do not trigger the update exception when we already show an errorJoas Schilling2015-10-071-3/+3
| * | | | | | | | | | validate HTTP protocol in case of an exceptionMorris Jobke2015-10-061-2/+24
| * | | | | | | | | | Fixes last causes for WSODMorris Jobke2015-10-061-16/+39
* | | | | | | | | | | Merge pull request #19619 from owncloud/fix-19614-masterThomas Müller2015-10-071-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix single file download - fixes #19614Thomas Müller2015-10-071-0/+3
|/ / / / / / / / / /
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-0750-48/+754
* | | | | | | | | | Merge pull request #19610 from owncloud/ext-deletestoragefromdatabaseThomas Müller2015-10-063-4/+94
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove oc_storages entries after removing ext storagesVincent Petry2015-10-063-4/+94
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | 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