Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use type casting instead of *val() method | Morris Jobke | 2018-01-26 | 30 | -62/+62 |
| | | | | | | It should be up to 6x faster Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | Merge pull request #8064 from nextcloud/background-jobs | Morris Jobke | 2018-01-26 | 4 | -46/+27 |
|\ | | | | | Deprecated OCP interface to fetch background job type | ||||
| * | Deprecated OCP interface to fetch background job type | Morris Jobke | 2018-01-26 | 4 | -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-substr | Joas Schilling | 2018-01-26 | 4 | -4/+4 |
|\ \ | | | | | | | Use short for of substr to not need strlen() | ||||
| * | | Use short for of substr to not need strlen() | Morris Jobke | 2018-01-25 | 4 | -4/+4 |
| |/ | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #8063 from nextcloud/inline-value | Joas Schilling | 2018-01-26 | 19 | -47/+21 |
|\ \ | | | | | | | Return value immediately instead of assigning to a one-time variable | ||||
| * | | Return value immediately instead of assigning to a one-time variable | Morris Jobke | 2018-01-26 | 19 | -47/+21 |
| |/ | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #8057 from nextcloud/unneeded-implements | Roeland Jago Douma | 2018-01-26 | 3 | -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 class | Morris Jobke | 2018-01-25 | 3 | -3/+3 |
| |/ | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #8055 from nextcloud/improve-loop | Roeland Jago Douma | 2018-01-26 | 1 | -1/+2 |
|\ \ | | | | | | | Improve conditional of loop | ||||
| * | | Improve conditional of loop | Morris Jobke | 2018-01-25 | 1 | -1/+2 |
| |/ | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #8052 from nextcloud/fix-array-methods | Roeland Jago Douma | 2018-01-26 | 3 | -3/+3 |
|\ \ | | | | | | | Fix array method usages with a proper call | ||||
| * | | Fix array method usages with a proper call | Morris Jobke | 2018-01-25 | 3 | -3/+3 |
| |/ | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #8058 from nextcloud/useless-return | Roeland Jago Douma | 2018-01-26 | 5 | -17/+0 |
|\ \ | | | | | | | Remove useless return statements | ||||
| * | | Remove useless return statements | Morris Jobke | 2018-01-25 | 5 | -17/+0 |
| |/ | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #8059 from nextcloud/use-stripos | Roeland Jago Douma | 2018-01-26 | 2 | -2/+2 |
|\ \ | | | | | | | Use stripos instead of strpos(strtolower(), 'something') | ||||
| * | | Use stripos instead of strpos(strtolower(), 'something') | Morris Jobke | 2018-01-25 | 2 | -2/+2 |
| |/ | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #8060 from nextcloud/proper-codeflow | Roeland Jago Douma | 2018-01-26 | 3 | -14/+12 |
|\ \ | | | | | | | Use proper code flow instead of not needed else branch | ||||
| * | | Use proper code flow instead of not needed else branch | Morris Jobke | 2018-01-25 | 3 | -14/+12 |
| |/ | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #8056 from nextcloud/array-push | Roeland Jago Douma | 2018-01-26 | 7 | -10/+10 |
|\ \ | | | | | | | Use $var[] = $a instead of array_push - 2x faster | ||||
| * | | Use $var[] = $a instead of array_push - 2x faster | Morris Jobke | 2018-01-25 | 7 | -10/+10 |
| |/ | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* / | [tx-robot] updated from transifex | Nextcloud bot | 2018-01-26 | 12 | -4/+58 |
|/ | |||||
* | Merge pull request #7916 from nextcloud/2fa_log | Morris Jobke | 2018-01-25 | 11 | -18/+219 |
|\ | | | | | Add 2FA to logfile | ||||
| * | Add tests | Roeland Jago Douma | 2018-01-25 | 4 | -2/+79 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Update autoloader | Roeland Jago Douma | 2018-01-25 | 2 | -0/+2 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Fix tests | Roeland Jago Douma | 2018-01-25 | 1 | -4/+11 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Make admin_audit listen to 2fa events | Roeland Jago Douma | 2018-01-25 | 2 | -0/+91 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Dispatch event on twofactor failure and success | Roeland Jago Douma | 2018-01-25 | 3 | -14/+38 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #8036 from nextcloud/phpunit6 | Roeland Jago Douma | 2018-01-25 | 70 | -221/+212 |
|\ \ | |/ |/| | Require PHPUnit 6.5 or higher | ||||
| * | Update memcached image | Morris Jobke | 2018-01-25 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | Class "ProgressBar" is declared "final" and cannot be mocked. | Joas Schilling | 2018-01-25 | 2 | -4/+9 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Fix risky tests without assertions | Joas Schilling | 2018-01-25 | 45 | -67/+107 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Bump docker containers used | Roeland Jago Douma | 2018-01-24 | 1 | -26/+26 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Fix "Undefined method setExpectedException()" | Joas Schilling | 2018-01-24 | 19 | -58/+50 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Require PHPUnit 6.5 or higher | Joas Schilling | 2018-01-24 | 7 | -65/+19 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-01-25 | 18 | -2/+42 |
| | | |||||
* | | Merge pull request #8032 from ↵ | Morris Jobke | 2018-01-24 | 1 | -0/+2 |
|\ \ | | | | | | | | | | | | | nextcloud/fix-missing-clipboard-icon-in-shared-links Fix missing clipboard icon in shared links | ||||
| * | | Fix missing clipboard icon in shared links | Daniel Calviño Sánchez | 2018-01-24 | 1 | -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-migration | Morris Jobke | 2018-01-24 | 1 | -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 not | Julius Härtl | 2018-01-24 | 1 | -0/+5 |
| | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
* | | | Merge pull request #7991 from nextcloud/show-trusted-domain-error-in-status.php | Roeland Jago Douma | 2018-01-24 | 1 | -1/+9 |
|\ \ \ | | | | | | | | | Send a proper response for status.php on trusted domain error | ||||
| * | | | Send a proper response for status.php on trusted domain error | Morris Jobke | 2018-01-22 | 1 | -1/+9 |
| |/ / | | | | | | | | | | | | | | | | * fixes #7732 Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #7921 from nextcloud/fix_redirect_on_pw_reset | Morris Jobke | 2018-01-24 | 1 | -8/+1 |
|\ \ \ | | | | | | | | | Removed additional and uneccessary request on password reset | ||||
| * | | | Removed additional and uneccessary request on password reset, to fix ↵ | Luca Adrian Lindhorst | 2018-01-24 | 1 | -8/+1 |
| | |/ | |/| | | | | | | | | | | | | | redirection afterwards. Signed-off-by: Luca Adrian Lindhorst <info@lucalindhorst.de> | ||||
* | | | Merge pull request #8002 from nextcloud/dont_polutelog_dav_emaillogin | Morris Jobke | 2018-01-24 | 3 | -59/+84 |
|\ \ \ | | | | | | | | | Dont polute the log on DAV emaillogin | ||||
| * | | | Fix tests | Roeland Jago Douma | 2018-01-23 | 2 | -48/+53 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Don't polute log when loggin into dav with email | Roeland Jago Douma | 2018-01-23 | 2 | -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 response | Morris Jobke | 2018-01-24 | 2 | -2/+50 |
| |/ / |/| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #7902 from nextcloud/fix_7700 | Morris Jobke | 2018-01-24 | 4 | -16/+89 |
|\ \ \ | | | | | | | | | Add fileid preview endpoint | ||||
| * | | | Make filelist and sidebar use the fileid preview endpoint | Roeland Jago Douma | 2018-01-24 | 2 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | This makes sure the preview is cached even after rename! yay! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> |