summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2996 from nextcloud/stable9-versionv9.0.56RC1Roeland Jago Douma2017-01-101-2/+2
|\ | | | | Increase version
| * Incrase versionLukas Reschke2017-01-091-2/+2
|/ | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #2883 from nextcloud/stable9-version-bumpChristoph Wurst2016-12-302-2/+2
|\ | | | | Update version to 9.0.56
| * Update version to 9.0.56Lukas Reschke2016-12-292-2/+2
|/ | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #2795 from nextcloud/stable9-update-drone-imagesMorris Jobke2016-12-211-1/+1
|\ | | | | [stable9] update drone images to latest version
| * [stable9] update drone images to latest versionMorris Jobke2016-12-201-1/+1
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* 9.0.55v9.0.55Lukas Reschke2016-12-091-2/+2
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* v9.0.55RC2Lukas Reschke2016-12-071-2/+2
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #2467 from ↵Lukas Reschke2016-12-052-0/+35
|\ | | | | | | | | nextcloud/backport-1972-invalid-files-from-scanner-9 [stable9] Make sure we don't scan files that can not be accessed
| * Make sure we don't scan files that can not be accessedJoas Schilling2016-12-022-0/+35
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2518 from nextcloud/stable9-rc-1Lukas Reschke2016-12-051-2/+2
|\ \ | | | | | | 9.0.55 RC1
| * | 9.0.55 RC1Lukas Reschke2016-12-051-2/+2
|/ / | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #2488 from nextcloud/update-cache-success-9Roeland Jago Douma2016-12-021-3/+3
|\ \ | |/ |/| [9] only update the cache if the storage operation succeeds
| * only update the cache if the storage operation succeedsRobin Appelman2016-12-021-3/+3
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #2455 from nextcloud/stable9-1872Morris Jobke2016-12-021-2/+2
|\ | | | | [stable9] Fix misleading SSL/TLS SMTP email configuration
| * Fix misleading SSL/TLS SMTP email configurationJoas Schilling2016-12-021-2/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2453 from nextcloud/stable9-1826Morris Jobke2016-12-021-2/+2
|\ \ | | | | | | [stable9] Fix post_unshareFromSelf hook parameter format
| * | Fix post_unshareFromSelf hook parameter formatVincent Petry2016-12-021-2/+2
| |/ | | | | | | | | | | | | | | | | | | When unsharing from self in a group share situation, the share items passed to the post_unshareFromSelf hook were using the wrong format in which the attribute names (ex: "share_type") have non camel-case format. This fix makes sure that in group sharing case we use the correct format. It looks like the code was already producing it but in array_merge it was not using it and adding the unprocessed one.
* | Merge pull request #2461 from nextcloud/stable9-2010Morris Jobke2016-12-021-1/+6
|\ \ | | | | | | [stable9] Fixed disappearing of share info in file view
| * | Fixed disappearing of share info in file viewMichael Jobst2016-12-021-1/+6
| |/
* | Merge pull request #2458 from nextcloud/stable9-2457Roeland Jago Douma2016-12-021-0/+2
|\ \ | | | | | | [stable9] Tear down FS between cron jobs (#26223)
| * | [master] Tear down FS between cron jobs (#26223)Vincent Petry2016-12-021-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | Because some cron jobs do not always properly clean up their FS usage and others might not clean up before setting up the FS, this could cause potential side effects. To make sure we exclude side effects, we tear down the FS between cron jobs. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #2450 from nextcloud/stable9-1745Roeland Jago Douma2016-12-021-1/+1
|\ \ | |/ |/| [stable9] fix typo
| * fix typoThomas Citharel2016-12-021-1/+1
|/ | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* Merge pull request #2446 from nextcloud/stable9-detect-also-a-400-statusMorris Jobke2016-12-012-1/+6
|\ | | | | [stable9] Catch status code 400
| * [stable9] Catch status code 400Lukas Reschke2016-12-012-1/+6
| | | | | | | | | | | | In case the server returns a statuscode 400 we should also gracefully return to the home directory. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #2439 from ↵Roeland Jago Douma2016-12-011-3/+10
|\ \ | |/ |/| | | | | nextcloud/stable9-dont-allow-subfolders-for-write-only-shares [stable9] On write-only shares do not allow to specify subfolders
| * [stable9] On write-only shares do not allow to specify subfoldersLukas Reschke2016-12-011-3/+10
|/ | | | | | In case of a write-only share we should not allow to specify a subfolder as this is unexpected behaviour. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #2120 from nextcloud/stable9_2100Morris Jobke2016-11-172-1/+61
|\ | | | | [stable9] Fixes not allowed increasing of link share permissions
| * Add testsRoeland Jago Douma2016-11-151-1/+60
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * [stable9] Fixes not allowed increasing of link share permissionsRoeland Jago Douma2016-11-141-0/+1
|/ | | | | | Backport of #2100 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #2060 from ↵Morris Jobke2016-11-093-7/+21
|\ | | | | | | | | nextcloud/backport-2058-better-error-message-for-installation-error-9 [stable9] Use a better error message and point the users to the support channels
| * Correctly catch the "soft errors" nowJoas Schilling2016-11-091-5/+8
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Use a better error message and point the users to the support channelsJoas Schilling2016-11-092-0/+12
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Fix help linkJoas Schilling2016-11-091-3/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2057 from nextcloud/stable9-fix-public-buttonRoeland Jago Douma2016-11-091-3/+4
|\ \ | | | | | | [stable9] fix button on public upload page
| * | fix button on public upload pageJan-Christoph Borchardt2016-11-081-3/+4
|/ / | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #2049 from nextcloud/stable9-update-containersChristoph Wurst2016-11-081-14/+14
|\ \ | |/ |/| [stable9] Update containers to latest version
| * Update containers to latest versionMorris Jobke2016-11-081-14/+14
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #1900 from nextcloud/stable9-php-7.1.0-checkRoeland Jago Douma2016-10-251-0/+8
|\ | | | | [stable9] console.php also needs a PHP 7.1 check
| * console.php also needs a PHP 7.1 checkMorris Jobke2016-10-251-0/+8
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #1770 from ↵Roeland Jago Douma2016-10-242-3/+20
|\ | | | | | | | | nextcloud/backport-1766-force-uid-casing-on-transfer-ownership-9 [stable9] Make sure the UID is correctly cased
| * Fix issues where some user settings cannot be loaded when the user id ↵Joas Schilling2016-10-211-0/+10
| | | | | | | | | | | | differs in case sensitivity Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Make sure the UID is correctly casedJoas Schilling2016-10-171-3/+10
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #1819 from nextcloud/stable9-fullscreen-iconMorris Jobke2016-10-203-0/+15
|\ \ | | | | | | [stable9] add fullscreen icon
| * | add fullscreen iconJan-Christoph Borchardt2016-10-203-0/+15
|/ / | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #1799 from nextcloud/backport-1740-numeric-quota-9Joas Schilling2016-10-192-2/+9
|\ \ | |/ |/| [stable9] Make sure we only use numbers as length
| * Make sure we only use numbers as lengthJoas Schilling2016-10-192-2/+9
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #1719 from nextcloud/stable9-backport-1580Joas Schilling2016-10-121-0/+1
|\ | | | | [stable9] Unset user PHOTO before setting new one in OCA\DAV\CardDAV\Converter:…
| * Unset user PHOTO before setting new one in ↵Olivier Mehani2016-10-121-0/+1
|/ | | | | | | OCA\DAV\CardDAV\Converter::updateCard (#26243) Signed-off-by: Olivier Mehani <shtrom@ssji.net> #26242