summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8069 from nextcloud/no-catch-serverdownMorris Jobke2018-01-262-2/+8
|\ | | | | do not catch and ignore ServerNotAvailable in the wrong spot
| * do not catch ServerNotAvailableArthur Schiwon2018-01-262-2/+8
| | | | | | | | | | | | might cause the user to be unavailable (race condition). Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #8068 from nextcloud/simplify-ternaryMorris Jobke2018-01-2613-23/+19
|\ \ | |/ |/| Simplify ternary operator statements
| * Simplify ternary operator statementsMorris Jobke2018-01-2613-23/+19
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #8061 from nextcloud/use-typecastingMorris Jobke2018-01-2630-62/+62
|\ | | | | Use type casting instead of *val() method
| * Use type casting instead of *val() methodMorris Jobke2018-01-2630-62/+62
|/ | | | | | It should be up to 6x faster Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #8064 from nextcloud/background-jobsMorris Jobke2018-01-264-46/+27
|\ | | | | Deprecated OCP interface to fetch background job type
| * Deprecated OCP interface to fetch background job typeMorris Jobke2018-01-264-46/+27
| | | | | | | | | | | | | | * was not used by apps and also is not needed * migrated the documentation to IJobList Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8053 from nextcloud/simplify-substrJoas Schilling2018-01-264-4/+4
|\ \ | | | | | | Use short for of substr to not need strlen()
| * | Use short for of substr to not need strlen()Morris Jobke2018-01-254-4/+4
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8063 from nextcloud/inline-valueJoas Schilling2018-01-2619-47/+21
|\ \ | | | | | | Return value immediately instead of assigning to a one-time variable
| * | Return value immediately instead of assigning to a one-time variableMorris Jobke2018-01-2619-47/+21
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8057 from nextcloud/unneeded-implementsRoeland Jago Douma2018-01-263-3/+3
|\ \ | | | | | | Implements are not needed because they are already done by base class
| * | Implements are not needed because they are already done by base classMorris Jobke2018-01-253-3/+3
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8055 from nextcloud/improve-loopRoeland Jago Douma2018-01-261-1/+2
|\ \ | | | | | | Improve conditional of loop
| * | Improve conditional of loopMorris Jobke2018-01-251-1/+2
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8052 from nextcloud/fix-array-methodsRoeland Jago Douma2018-01-263-3/+3
|\ \ | | | | | | Fix array method usages with a proper call
| * | Fix array method usages with a proper callMorris Jobke2018-01-253-3/+3
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8058 from nextcloud/useless-returnRoeland Jago Douma2018-01-265-17/+0
|\ \ | | | | | | Remove useless return statements
| * | Remove useless return statementsMorris Jobke2018-01-255-17/+0
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8059 from nextcloud/use-striposRoeland Jago Douma2018-01-262-2/+2
|\ \ | | | | | | Use stripos instead of strpos(strtolower(), 'something')
| * | Use stripos instead of strpos(strtolower(), 'something')Morris Jobke2018-01-252-2/+2
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8060 from nextcloud/proper-codeflowRoeland Jago Douma2018-01-263-14/+12
|\ \ | | | | | | Use proper code flow instead of not needed else branch
| * | Use proper code flow instead of not needed else branchMorris Jobke2018-01-253-14/+12
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-01 07:36:01 +0000