summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19611 from owncloud/fix-public-scrollThomas Müller2015-10-083-38/+42
|\
| * move footer to bottom of public pageHendrik Leppelsack2015-10-071-0/+2
| * fix footer in public galleryHendrik Leppelsack2015-10-071-2/+1
| * fix public empty messageHendrik Leppelsack2015-10-062-3/+2
| * fix scrollbars in public templateHendrik Leppelsack2015-10-063-33/+37
* | Merge pull request #19640 from owncloud/fix-zip-downloads-32-bit-osThomas Müller2015-10-081-1/+1
|\ \
| * | Only use zip64 when we have 64 bit phpJoas Schilling2015-10-081-1/+1
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-0850-2/+238
* | Merge pull request #19589 from owncloud/shares-external-mount-providerThomas Müller2015-10-076-55/+123
|\ \
| * | Fix getEtag for roots of shared storagesRobin Appelman2015-10-061-3/+0
| * | sanitize mountpointRobin Appelman2015-10-051-1/+1
| * | fix testRobin Appelman2015-10-051-1/+6
| * | extract the mount provider from the managerRobin Appelman2015-10-053-24/+91
| * | 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
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |