summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* New preview generatorRoeland Jago Douma2016-11-035-11/+423
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #1997 from nextcloud/changelogRoeland Jago Douma2016-11-031-0/+8
|\ | | | | Introducing changelog.md
| * Added changelog.mdRoeland Jago Douma2016-11-031-0/+8
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #1996 from nextcloud/allow-phpunit-optionsRoeland Jago Douma2016-11-031-1/+1
|\ \ | |/ |/| Allow to run autotest with phpunit options
| * Allow to run autotest with phpunit optionsJoas Schilling2016-11-031-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #1915 from nextcloud/downstream-26398Lukas Reschke2016-11-0315-113/+498
|\ \ | |/ |/| Add using casing check/fix for initMountPoints
| * Adjust tests and DI for Share.phpLukas Reschke2016-11-025-9/+58
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * DI for root.phpLukas Reschke2016-11-028-153/+348
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Do not expose user data in exceptions & fix typoMorris Jobke2016-11-022-3/+3
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Fix mock warning in some FS tests (#26464)Vincent Petry2016-11-022-2/+2
| |
| * Add using casing check/fix for initMountPointsVincent Petry2016-11-028-13/+154
| |
* | Merge pull request #1954 from nextcloud/issue_#1953Christoph Wurst2016-11-031-3/+3
|\ \ | | | | | | #1953 add can to subshare options
| * | Fixes https://github.com/nextcloud/server/issues/1953Andreas Hechenberger2016-11-031-3/+3
| | | | | | | | | | | | Signed-off-by: Andreas Hechenberger <world@greenstation.de>
* | | Merge pull request #1993 from nextcloud/wait-600-seconds-for-mysqlmb4Morris Jobke2016-11-031-2/+2
|\ \ \ | | | | | | | | adjust autotest.sh to also wait 600 seconds for mysqlmb4
| * | | adjust autotest.sh to also wait 600 seconds for mysqlmb4Morris Jobke2016-11-031-2/+2
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #1991 from nextcloud/code-check-more-shipped-appsMorris Jobke2016-11-032-1/+5
|\ \ \ | | | | | | | | Run code checker on more shipped apps
| * | | Run code checker on more shipped appsLukas Reschke2016-11-032-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds: - sharebymail - systemtags - theming - workflowengine Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #1990 from nextcloud/use-php-7.1-rc-5Morris Jobke2016-11-031-2/+2
|\ \ \ \ | | | | | | | | | | Use PHP 7.1 RC5 for CI
| * | | | Use PHP 7.1 RC5 for CILukas Reschke2016-11-021-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | This image has PHP 7.1 RC5 inside and the currently used one only RC4. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* / / / [tx-robot] updated from transifexNextcloud bot2016-11-03244-1590/+1564
|/ / /
* | | Merge pull request #1978 from nextcloud/remove-send-mail-optionMorris Jobke2016-11-0222-500/+69
|\ \ \ | | | | | | | | Remove send mail option
| * | | Remove from core.jsonRoeland Jago Douma2016-11-021-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | remove the 'shareapi_allow_mail_notification' settingBjoern Schiessle2016-11-025-5/+47
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | remove 'send mail notification' option from sharing, replaced by ↵Bjoern Schiessle2016-11-0217-494/+22
| | | | | | | | | | | | | | | | | | | | | | | | send-by-mail feature Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #1988 from nextcloud/silly-but-effective-testMorris Jobke2016-11-021-0/+68
|\ \ \ \ | |_|_|/ |/| | | Add test for "languageCodes.php"
| * | | Add test for "languageCodesTest.php"Lukas Reschke2016-11-021-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | Arguably not the most awesome test but increases coverage and is an easy gain. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #1981 from nextcloud/multibucket-num-bucketsLukas Reschke2016-11-024-13/+20
|\ \ \ \ | | | | | | | | | | Allow setting a maximun number of buckets for multibucket
| * | | | Allow setting a maximun number of buckets for multibucketRobin Appelman2016-11-024-13/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #1943 from nextcloud/log-query-builder-queriesLukas Reschke2016-11-027-12/+222
|\ \ \ \ \ | | | | | | | | | | | | Log QueryBuilder queries
| * | | | | Add testsLukas Reschke2016-11-022-0/+139
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Inject config and loggerJoas Schilling2016-11-024-13/+51
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Log the queries of the QueryBuilder as wellJoas Schilling2016-11-021-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Fix missing update of session, when it was already used.Joas Schilling2016-11-022-2/+12
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #1511 from nextcloud/master-kill-upload-limitRoeland Jago Douma2016-11-026-37/+2
|\ \ \ \ \ | | | | | | | | | | | | Remove upload_limit in files app as it is not needed with PUT upload
| * | | | | Remove upload_limit in files app as it is not needed with PUT upload (#26069)Vincent Petry2016-11-026-37/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The web UI now uses for PUT uploads which aren't restricted by PHP's upload_max_filesize and post_max_size Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #1973 from ↵Morris Jobke2016-11-022-1/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dont-disable-shipped-apps-but-throw-instead Throw an exception when a shipped app was not replaced before the update
| * | | | | | Throw an exception when a shipped app was not replaced before the updateJoas Schilling2016-11-022-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #1986 from nextcloud/add-htaccess-checkerMorris Jobke2016-11-022-0/+43
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Add .htaccess checker as CI step
| * | | | | | Add .htaccess checker as CI stepLukas Reschke2016-11-022-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't want anyone to commit invalid changes in that file again :see_no_evil: Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | Merge pull request #1958 from harry-7/1428issueLukas Reschke2016-11-021-8/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added Exception catch and ignore for DBuser exists
| * | | | | | | Added Exception catch in case of DB User existsHemanth Kumar Veeranki2016-10-311-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hemanth Kumar Veeranki <hemanthveeranki@gmail.com>
* | | | | | | | Merge pull request #1984 from nextcloud/improve-error-messages-federated-sharingLukas Reschke2016-11-022-8/+15
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | improved error messages in case federated sharing fails
| * | | | | | | catch all exception and return a user friendly exception messageBjoern Schiessle2016-11-022-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | | Merge pull request #1960 from nextcloud/adjust-link-to-contributing.mdRoeland Jago Douma2016-11-024-4/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Adjust link to contributing.md
| * | | | | | | | Adjust link to contributing.mdJoas Schilling2016-11-022-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | Revert "Move CONTRIBUTUNG and issue template into .github subfolder"Joas Schilling2016-11-022-0/+0
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | This reverts commit 9ebd8d80ff5ba655db8cf94dbb9112a9dacff6cf.
* | | | | | | | Merge pull request #1971 from nextcloud/fix-checkbox-glitchRoeland Jago Douma2016-11-022-5/+5
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Fix checkbox left margin glitch
| * | | | | | | Fix #1782John Molakvoæ2016-11-022-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix checkbox left margin glitch Fix tests fix unit tests Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | Merge pull request #1347 from nextcloud/bring-back-remember-meMorris Jobke2016-11-0220-222/+643
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | fix remember me login
| * | | | | | | document what the method doesChristoph Wurst2016-11-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>