summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8056 from nextcloud/array-pushRoeland Jago Douma2018-01-267-10/+10
|\ | | | | Use $var[] = $a instead of array_push - 2x faster
| * Use $var[] = $a instead of array_push - 2x fasterMorris Jobke2018-01-257-10/+10
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2018-01-2612-4/+58
|/
* Merge pull request #7916 from nextcloud/2fa_logMorris Jobke2018-01-2511-18/+219
|\ | | | | Add 2FA to logfile
| * Add testsRoeland Jago Douma2018-01-254-2/+79
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Update autoloaderRoeland Jago Douma2018-01-252-0/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix testsRoeland Jago Douma2018-01-251-4/+11
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Make admin_audit listen to 2fa eventsRoeland Jago Douma2018-01-252-0/+91
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Dispatch event on twofactor failure and successRoeland Jago Douma2018-01-253-14/+38
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #8036 from nextcloud/phpunit6Roeland Jago Douma2018-01-2570-221/+212
|\ \ | |/ |/| Require PHPUnit 6.5 or higher
| * Update memcached imageMorris Jobke2018-01-251-1/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Class "ProgressBar" is declared "final" and cannot be mocked.Joas Schilling2018-01-252-4/+9
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Fix risky tests without assertionsJoas Schilling2018-01-2545-67/+107
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Bump docker containers usedRoeland Jago Douma2018-01-241-26/+26
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix "Undefined method setExpectedException()"Joas Schilling2018-01-2419-58/+50
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Require PHPUnit 6.5 or higherJoas Schilling2018-01-247-65/+19
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2018-01-2518-2/+42
| |
* | Merge pull request #8032 from ↵Morris Jobke2018-01-241-0/+2
|\ \ | | | | | | | | | | | | nextcloud/fix-missing-clipboard-icon-in-shared-links Fix missing clipboard icon in shared links
| * | Fix missing clipboard icon in shared linksDaniel Calviño Sánchez2018-01-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The clipboard icon in shared links appears either directly on the link input field or, if any social sharing app is enabled, in a menu. The clipboard icon uses the same CSS rules as other icons (like the information icon) to be posioned on the end of the input field, and those rules have to be "cancelled" when the icon is shown in the menu. Fixes #7990 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #8020 from nextcloud/fix-avatar-migrationMorris Jobke2018-01-241-0/+5
|\ \ \ | |/ / |/| | Make sure we always know for sure if an avatar is generated or not
| * | Make sure we always know for sure if an avatar is generated or notJulius Härtl2018-01-241-0/+5
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #7991 from nextcloud/show-trusted-domain-error-in-status.phpRoeland Jago Douma2018-01-241-1/+9
|\ \ \ | | | | | | | | Send a proper response for status.php on trusted domain error
| * | | Send a proper response for status.php on trusted domain errorMorris Jobke2018-01-221-1/+9
| |/ / | | | | | | | | | | | | | | | * fixes #7732 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #7921 from nextcloud/fix_redirect_on_pw_resetMorris Jobke2018-01-241-8/+1
|\ \ \ | | | | | | | | Removed additional and uneccessary request on password reset
| * | | Removed additional and uneccessary request on password reset, to fix ↵Luca Adrian Lindhorst2018-01-241-8/+1
| | |/ | |/| | | | | | | | | | | | | redirection afterwards. Signed-off-by: Luca Adrian Lindhorst <info@lucalindhorst.de>
* | | Merge pull request #8002 from nextcloud/dont_polutelog_dav_emailloginMorris Jobke2018-01-243-59/+84
|\ \ \ | | | | | | | | Dont polute the log on DAV emaillogin
| * | | Fix testsRoeland Jago Douma2018-01-232-48/+53
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Don't polute log when loggin into dav with emailRoeland Jago Douma2018-01-232-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * We first try the email as username but this fails * Then we get the uid from the email and try again We should not log the first attempt since it polutes the log with failed login attempts while the login actually is valid. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Properly catch InvalidTokenException for better error responseMorris Jobke2018-01-242-2/+50
| |/ / |/| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #7902 from nextcloud/fix_7700Morris Jobke2018-01-244-16/+89
|\ \ \ | | | | | | | | Add fileid preview endpoint
| * | | Make filelist and sidebar use the fileid preview endpointRoeland Jago Douma2018-01-242-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | This makes sure the preview is cached even after rename! yay! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Add preview endpoint for the fileidRoeland Jago Douma2018-01-242-15/+76
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #7980 from nextcloud/3rdparty_pimpleJulius Härtl2018-01-241-0/+0
|\ \ \ \ | |/ / / |/| | | [3rdparty] Bump pimpe to 3.2.3
| * | | [3rdparty] Bump pimpe to 3.2.3Roeland Jago Douma2018-01-231-0/+0
| | |/ | |/| | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #7917 from nextcloud/warn_old_ocs_route_consMorris Jobke2018-01-241-0/+4
|\ \ \ | | | | | | | | Warn about the old OCP\API::register construct for OCS
| * | | Warn about the old OCP\API::register construct for OCSRoeland Jago Douma2018-01-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add sleep * Add log message Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2018-01-24112-116/+122
| | | |
* | | | Merge pull request #7918 from nextcloud/properly-log-exceptionsRoeland Jago Douma2018-01-2337-149/+321
|\ \ \ \ | | | | | | | | | | Properly log the full exception instead of only the message
| * | | | Properly log the full exception instead of only the messageMorris Jobke2018-01-2337-149/+321
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #7971 from nextcloud/comradekingu-patch-1Morris Jobke2018-01-232-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Spelling: There was an error loading → could not load
| * | | | | There was an error loading → Could not loadAllan Nordhøy2018-01-201-1/+1
| | | | | |
| * | | | | There was an error loading → could not loadAllan Nordhøy2018-01-201-1/+1
| | | | | |
* | | | | | Merge pull request #7858 from nextcloud/fix-local-storageMorris Jobke2018-01-233-7/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use fallback path if data dir is not available for Storage/Local.php
| * | | | | | Use fallback path if data dir is not available for Storage/Local.phpMorris Jobke2018-01-183-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found while testing strict types for PHP7+. Signed-off-by: Morris Jobke <hey@morrisjobke.de> Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #7989 from nextcloud/cleanup-unused-share-methodsMorris Jobke2018-01-231-107/+0
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Remove not used methods of legacy share.php
| * | | | | | Remove not used methods of legacy share.phpMorris Jobke2018-01-221-107/+0
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-01-2310-2/+78
| | | | | |
* | | | | | Merge pull request #7354 from nextcloud/refacor-update-page-printblizzz2018-01-224-35/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Refactor method to check if update is needed
| * | | | | | Reuse systemconfigMorris Jobke2017-11-301-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Refactor method to check if update is neededMorris Jobke2017-11-304-30/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was only one call, that actually needed the parameter to be set to true. So this change moved the print of the page to that location and replaces all other occurences with a direct call to the underlying OCP API. Signed-off-by: Morris Jobke <hey@morrisjobke.de>