| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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> | ||||
| | * | | | Add preview endpoint for the fileid | Roeland Jago Douma | 2018-01-24 | 2 | -15/+76 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | Merge pull request #7980 from nextcloud/3rdparty_pimple | Julius Härtl | 2018-01-24 | 1 | -0/+0 |
| |\ \ \ \ | |/ / / |/| | | | [3rdparty] Bump pimpe to 3.2.3 | ||||
| | * | | | [3rdparty] Bump pimpe to 3.2.3 | Roeland Jago Douma | 2018-01-23 | 1 | -0/+0 |
| | | |/ | |/| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Merge pull request #7917 from nextcloud/warn_old_ocs_route_cons | Morris Jobke | 2018-01-24 | 1 | -0/+4 |
| |\ \ \ | | | | | | | | | Warn about the old OCP\API::register construct for OCS | ||||
| | * | | | Warn about the old OCP\API::register construct for OCS | Roeland Jago Douma | 2018-01-17 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add sleep * Add log message Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-01-24 | 112 | -116/+122 |
| | | | | | |||||
| * | | | | Merge pull request #7918 from nextcloud/properly-log-exceptions | Roeland Jago Douma | 2018-01-23 | 37 | -149/+321 |
| |\ \ \ \ | | | | | | | | | | | Properly log the full exception instead of only the message | ||||
| | * | | | | Properly log the full exception instead of only the message | Morris Jobke | 2018-01-23 | 37 | -149/+321 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | | Merge pull request #7971 from nextcloud/comradekingu-patch-1 | Morris Jobke | 2018-01-23 | 2 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Spelling: There was an error loading → could not load | ||||
| | * | | | | | There was an error loading → Could not load | Allan Nordhøy | 2018-01-20 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | There was an error loading → could not load | Allan Nordhøy | 2018-01-20 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #7858 from nextcloud/fix-local-storage | Morris Jobke | 2018-01-23 | 3 | -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.php | Morris Jobke | 2018-01-18 | 3 | -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-methods | Morris Jobke | 2018-01-23 | 1 | -107/+0 |
| |\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Remove not used methods of legacy share.php | ||||
| | * | | | | | | Remove not used methods of legacy share.php | Morris Jobke | 2018-01-22 | 1 | -107/+0 |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-01-23 | 10 | -2/+78 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #7354 from nextcloud/refacor-update-page-print | blizzz | 2018-01-22 | 4 | -35/+24 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Refactor method to check if update is needed | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |