| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [WIP] Use mail for encrypting the password reset token as well | Lukas Reschke | 2016-11-03 | 3 | -11/+74 |
| | | |||||
| * | Merge pull request #1997 from nextcloud/changelog | Roeland Jago Douma | 2016-11-03 | 1 | -0/+8 |
| |\ | | | | | Introducing changelog.md | ||||
| | * | Added changelog.md | Roeland Jago Douma | 2016-11-03 | 1 | -0/+8 |
| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Merge pull request #1996 from nextcloud/allow-phpunit-options | Roeland Jago Douma | 2016-11-03 | 1 | -1/+1 |
| |\ \ | |/ |/| | Allow to run autotest with phpunit options | ||||
| | * | Allow to run autotest with phpunit options | Joas Schilling | 2016-11-03 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Merge pull request #1915 from nextcloud/downstream-26398 | Lukas Reschke | 2016-11-03 | 15 | -113/+498 |
| |\ \ | |/ |/| | Add using casing check/fix for initMountPoints | ||||
| | * | Adjust tests and DI for Share.php | Lukas Reschke | 2016-11-02 | 5 | -9/+58 |
| | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | DI for root.php | Lukas Reschke | 2016-11-02 | 8 | -153/+348 |
| | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | Do not expose user data in exceptions & fix typo | Morris Jobke | 2016-11-02 | 2 | -3/+3 |
| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | Fix mock warning in some FS tests (#26464) | Vincent Petry | 2016-11-02 | 2 | -2/+2 |
| | | | |||||
| | * | Add using casing check/fix for initMountPoints | Vincent Petry | 2016-11-02 | 8 | -13/+154 |
| | | | |||||
| * | | Merge pull request #1954 from nextcloud/issue_#1953 | Christoph Wurst | 2016-11-03 | 1 | -3/+3 |
| |\ \ | | | | | | | #1953 add can to subshare options | ||||
| | * | | Fixes https://github.com/nextcloud/server/issues/1953 | Andreas Hechenberger | 2016-11-03 | 1 | -3/+3 |
| | | | | | | | | | | | | | Signed-off-by: Andreas Hechenberger <world@greenstation.de> | ||||
| * | | | Merge pull request #1993 from nextcloud/wait-600-seconds-for-mysqlmb4 | Morris Jobke | 2016-11-03 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | adjust autotest.sh to also wait 600 seconds for mysqlmb4 | ||||
| | * | | | adjust autotest.sh to also wait 600 seconds for mysqlmb4 | Morris Jobke | 2016-11-03 | 1 | -2/+2 |
| |/ / / | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | Merge pull request #1991 from nextcloud/code-check-more-shipped-apps | Morris Jobke | 2016-11-03 | 2 | -1/+5 |
| |\ \ \ | | | | | | | | | Run code checker on more shipped apps | ||||
| | * | | | Run code checker on more shipped apps | Lukas Reschke | 2016-11-03 | 2 | -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-5 | Morris Jobke | 2016-11-03 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | Use PHP 7.1 RC5 for CI | ||||
| | * | | | | Use PHP 7.1 RC5 for CI | Lukas Reschke | 2016-11-02 | 1 | -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 transifex | Nextcloud bot | 2016-11-03 | 244 | -1590/+1564 |
| |/ / / | |||||
| * | | | Merge pull request #1978 from nextcloud/remove-send-mail-option | Morris Jobke | 2016-11-02 | 22 | -500/+69 |
| |\ \ \ | | | | | | | | | Remove send mail option | ||||
| | * | | | Remove from core.json | Roeland Jago Douma | 2016-11-02 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | | | remove the 'shareapi_allow_mail_notification' setting | Bjoern Schiessle | 2016-11-02 | 5 | -5/+47 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | | | remove 'send mail notification' option from sharing, replaced by ↵ | Bjoern Schiessle | 2016-11-02 | 17 | -494/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | send-by-mail feature Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | | | Merge pull request #1988 from nextcloud/silly-but-effective-test | Morris Jobke | 2016-11-02 | 1 | -0/+68 |
| |\ \ \ \ | |_|_|/ |/| | | | Add test for "languageCodes.php" | ||||
| | * | | | Add test for "languageCodesTest.php" | Lukas Reschke | 2016-11-02 | 1 | -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-buckets | Lukas Reschke | 2016-11-02 | 4 | -13/+20 |
| |\ \ \ \ | | | | | | | | | | | Allow setting a maximun number of buckets for multibucket | ||||
| | * | | | | Allow setting a maximun number of buckets for multibucket | Robin Appelman | 2016-11-02 | 4 | -13/+20 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | | Merge pull request #1943 from nextcloud/log-query-builder-queries | Lukas Reschke | 2016-11-02 | 7 | -12/+222 |
| |\ \ \ \ \ | | | | | | | | | | | | | Log QueryBuilder queries | ||||
| | * | | | | | Add tests | Lukas Reschke | 2016-11-02 | 2 | -0/+139 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | | | | Inject config and logger | Joas Schilling | 2016-11-02 | 4 | -13/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | | | Log the queries of the QueryBuilder as well | Joas Schilling | 2016-11-02 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | | | Fix missing update of session, when it was already used. | Joas Schilling | 2016-11-02 | 2 | -2/+12 |
| | | |/ / / | |/| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | | Merge pull request #1511 from nextcloud/master-kill-upload-limit | Roeland Jago Douma | 2016-11-02 | 6 | -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 Petry | 2016-11-02 | 6 | -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 Jobke | 2016-11-02 | 2 | -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 update | Joas Schilling | 2016-11-02 | 2 | -1/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | | | | Merge pull request #1986 from nextcloud/add-htaccess-checker | Morris Jobke | 2016-11-02 | 2 | -0/+43 |
| |\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Add .htaccess checker as CI step | ||||
| | * | | | | | | Add .htaccess checker as CI step | Lukas Reschke | 2016-11-02 | 2 | -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/1428issue | Lukas Reschke | 2016-11-02 | 1 | -8/+16 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Added Exception catch and ignore for DBuser exists | ||||
| | * | | | | | | | Added Exception catch in case of DB User exists | Hemanth Kumar Veeranki | 2016-10-31 | 1 | -8/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hemanth Kumar Veeranki <hemanthveeranki@gmail.com> | ||||
| * | | | | | | | | Merge pull request #1984 from nextcloud/improve-error-messages-federated-sharing | Lukas Reschke | 2016-11-02 | 2 | -8/+15 |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | improved error messages in case federated sharing fails | ||||
| | * | | | | | | | catch all exception and return a user friendly exception message | Bjoern Schiessle | 2016-11-02 | 2 | -8/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | | | | | | | Merge pull request #1960 from nextcloud/adjust-link-to-contributing.md | Roeland Jago Douma | 2016-11-02 | 4 | -4/+3 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Adjust link to contributing.md | ||||
| | * | | | | | | | | Adjust link to contributing.md | Joas Schilling | 2016-11-02 | 2 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | | | | | | | | Revert "Move CONTRIBUTUNG and issue template into .github subfolder" | Joas Schilling | 2016-11-02 | 2 | -0/+0 |
| | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9ebd8d80ff5ba655db8cf94dbb9112a9dacff6cf. | ||||
| * | | | | | | | | Merge pull request #1971 from nextcloud/fix-checkbox-glitch | Roeland Jago Douma | 2016-11-02 | 2 | -5/+5 |
| |\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | Fix checkbox left margin glitch | ||||
| | * | | | | | | | Fix #1782 | John Molakvoæ | 2016-11-02 | 2 | -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-me | Morris Jobke | 2016-11-02 | 20 | -222/+643 |
| |\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | fix remember me login | ||||
| | * | | | | | | | document what the method does | Christoph Wurst | 2016-11-02 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |