Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #19611 from owncloud/fix-public-scroll | Thomas Müller | 2015-10-08 | 3 | -38/+42 |
|\ | |||||
| * | move footer to bottom of public page | Hendrik Leppelsack | 2015-10-07 | 1 | -0/+2 |
| * | fix footer in public gallery | Hendrik Leppelsack | 2015-10-07 | 1 | -2/+1 |
| * | fix public empty message | Hendrik Leppelsack | 2015-10-06 | 2 | -3/+2 |
| * | fix scrollbars in public template | Hendrik Leppelsack | 2015-10-06 | 3 | -33/+37 |
* | | Merge pull request #19640 from owncloud/fix-zip-downloads-32-bit-os | Thomas Müller | 2015-10-08 | 1 | -1/+1 |
|\ \ | |||||
| * | | Only use zip64 when we have 64 bit php | Joas Schilling | 2015-10-08 | 1 | -1/+1 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-08 | 50 | -2/+238 |
* | | Merge pull request #19589 from owncloud/shares-external-mount-provider | Thomas Müller | 2015-10-07 | 6 | -55/+123 |
|\ \ | |||||
| * | | Fix getEtag for roots of shared storages | Robin Appelman | 2015-10-06 | 1 | -3/+0 |
| * | | sanitize mountpoint | Robin Appelman | 2015-10-05 | 1 | -1/+1 |
| * | | fix test | Robin Appelman | 2015-10-05 | 1 | -1/+6 |
| * | | extract the mount provider from the manager | Robin Appelman | 2015-10-05 | 3 | -24/+91 |
| * | | register the external share mount provider | Robin Appelman | 2015-10-05 | 1 | -0/+1 |
| * | | Make the external share manager a mount provider | Robin Appelman | 2015-10-05 | 3 | -46/+44 |
* | | | Merge pull request #19489 from owncloud/fix-18297 | Thomas Müller | 2015-10-07 | 3 | -1/+106 |
|\ \ \ | |||||
| * | | | fix possible infinite loop when reading groups in the wizard | Arthur Schiwon | 2015-10-05 | 3 | -1/+106 |
* | | | | Merge pull request #19537 from owncloud/fix-white-page-of-death | Thomas Müller | 2015-10-07 | 1 | -19/+64 |
|\ \ \ \ | |||||
| * | | | | Do not trigger the update exception when we already show an error | Joas Schilling | 2015-10-07 | 1 | -3/+3 |
| * | | | | validate HTTP protocol in case of an exception | Morris Jobke | 2015-10-06 | 1 | -2/+24 |
| * | | | | Fixes last causes for WSOD | Morris Jobke | 2015-10-06 | 1 | -16/+39 |
* | | | | | Merge pull request #19619 from owncloud/fix-19614-master | Thomas Müller | 2015-10-07 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Fix single file download - fixes #19614 | Thomas Müller | 2015-10-07 | 1 | -0/+3 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-07 | 50 | -48/+754 |
* | | | | | Merge pull request #19610 from owncloud/ext-deletestoragefromdatabase | Thomas Müller | 2015-10-06 | 3 | -4/+94 |
|\ \ \ \ \ | |||||
| * | | | | | Remove oc_storages entries after removing ext storages | Vincent Petry | 2015-10-06 | 3 | -4/+94 |
| | |_|_|/ | |/| | | | |||||
* | | | | | 8.2 RC1v8.2RC1 | C Montero-Luque | 2015-10-06 | 1 | -2/+2 |
* | | | | | Merge pull request #19511 from owncloud/etag-share-permissions-update | Robin Appelman | 2015-10-06 | 5 | -5/+37 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | fix phpdoc | Robin Appelman | 2015-10-06 | 1 | -1/+1 |
| * | | | | use microtime | Robin Appelman | 2015-10-06 | 1 | -1/+1 |
| * | | | | clear hooks for tests | Robin Appelman | 2015-10-06 | 1 | -0/+1 |
| * | | | | Mark shares as dirty when changing permissions | Robin Appelman | 2015-10-06 | 4 | -4/+35 |
* | | | | | Merge pull request #18128 from owncloud/share-groupchangeetagpropagation | Thomas Müller | 2015-10-06 | 4 | -0/+336 |
|\ \ \ \ \ | |||||
| * | | | | | Propagate shares etag when group membership changed | Vincent Petry | 2015-10-06 | 4 | -0/+336 |
* | | | | | | Merge pull request #19207 from RealRancor/fix_mount.json_dir | Thomas Müller | 2015-10-06 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Path to mount.json needs to be absolute in config.sample.php | RealRancor | 2015-09-29 | 1 | -1/+2 |
* | | | | | | | Merge pull request #19602 from owncloud/allow-certificate-import | Thomas Müller | 2015-10-06 | 2 | -3/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Only show import button if user storages are allowed | Lukas Reschke | 2015-10-06 | 1 | -1/+3 |
| * | | | | | | | Fix importing of certificates | Lukas Reschke | 2015-10-06 | 1 | -2/+3 |
* | | | | | | | | Merge pull request #19605 from owncloud/add-get-http-protocol | Thomas Müller | 2015-10-06 | 3 | -0/+80 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Add \OCP\IRequest::getHttpProtocol | Lukas Reschke | 2015-10-06 | 3 | -0/+80 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #19603 from owncloud/fix-invalid-class-usage | Thomas Müller | 2015-10-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | OC_Log not longer exists | Thomas Müller | 2015-10-06 | 1 | -1/+1 |
* | | | | | | | Merge pull request #19595 from owncloud/fix-versions-log-entry | Thomas Müller | 2015-10-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Reset to auto if not set | Victor Dubiniuk | 2015-10-05 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #19526 from owncloud/issue-16251-reload-app-settings-when-... | Thomas Müller | 2015-10-06 | 2 | -2/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix wording | Morris Jobke | 2015-10-06 | 1 | -1/+1 |
| * | | | | | | Use OC.Dialogs for modal reload message | Morris Jobke | 2015-10-05 | 1 | -1/+15 |
| * | | | | | | Reload the page when an app needs an update after being enabled | Joas Schilling | 2015-10-05 | 2 | -2/+11 |
* | | | | | | | Merge pull request #19407 from owncloud/lock-zip-content | Thomas Müller | 2015-10-06 | 2 | -84/+135 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | |