summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Use stripos instead of strpos(strtolower(), 'something')Morris Jobke2018-01-252-2/+2
| |/ /
* | | Merge pull request #8060 from nextcloud/proper-codeflowRoeland Jago Douma2018-01-263-14/+12
|\ \ \
| * | | Use proper code flow instead of not needed else branchMorris Jobke2018-01-253-14/+12
| |/ /
* | | Merge pull request #8056 from nextcloud/array-pushRoeland Jago Douma2018-01-267-10/+10
|\ \ \
| * | | Use $var[] = $a instead of array_push - 2x fasterMorris Jobke2018-01-257-10/+10
| |/ /
* / / [tx-robot] updated from transifexNextcloud bot2018-01-2612-4/+58
|/ /
* | Merge pull request #7916 from nextcloud/2fa_logMorris Jobke2018-01-2511-18/+219
|\ \
| * | Add testsRoeland Jago Douma2018-01-254-2/+79
| * | Update autoloaderRoeland Jago Douma2018-01-252-0/+2
| * | Fix testsRoeland Jago Douma2018-01-251-4/+11
| * | Make admin_audit listen to 2fa eventsRoeland Jago Douma2018-01-252-0/+91
| * | Dispatch event on twofactor failure and successRoeland Jago Douma2018-01-253-14/+38
* | | Merge pull request #8036 from nextcloud/phpunit6Roeland Jago Douma2018-01-2570-221/+212
|\ \ \ | |/ / |/| |
| * | Update memcached imageMorris Jobke2018-01-251-1/+1
| * | Class "ProgressBar" is declared "final" and cannot be mocked.Joas Schilling2018-01-252-4/+9
| * | Fix risky tests without assertionsJoas Schilling2018-01-2545-67/+107
| * | Bump docker containers usedRoeland Jago Douma2018-01-241-26/+26
| * | Fix "Undefined method setExpectedException()"Joas Schilling2018-01-2419-58/+50
| * | Require PHPUnit 6.5 or higherJoas Schilling2018-01-247-65/+19
* | | [tx-robot] updated from transifexNextcloud bot2018-01-2518-2/+42
* | | Merge pull request #8032 from nextcloud/fix-missing-clipboard-icon-in-shared-...Morris Jobke2018-01-241-0/+2
|\ \ \
| * | | Fix missing clipboard icon in shared linksDaniel Calviño Sánchez2018-01-241-0/+2
* | | | 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 notJulius Härtl2018-01-241-0/+5
* | | | 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 errorMorris Jobke2018-01-221-1/+9
| |/ / /
* | | | Merge pull request #7921 from nextcloud/fix_redirect_on_pw_resetMorris Jobke2018-01-241-8/+1
|\ \ \ \
| * | | | Removed additional and uneccessary request on password reset, to fix redirect...Luca Adrian Lindhorst2018-01-241-8/+1
| | |/ / | |/| |
* | | | Merge pull request #8002 from nextcloud/dont_polutelog_dav_emailloginMorris Jobke2018-01-243-59/+84
|\ \ \ \
| * | | | Fix testsRoeland Jago Douma2018-01-232-48/+53
| * | | | Don't polute log when loggin into dav with emailRoeland Jago Douma2018-01-232-11/+31
* | | | | Properly catch InvalidTokenException for better error responseMorris Jobke2018-01-242-2/+50
| |/ / / |/| | |
* | | | Merge pull request #7902 from nextcloud/fix_7700Morris Jobke2018-01-244-16/+89
|\ \ \ \
| * | | | Make filelist and sidebar use the fileid preview endpointRoeland Jago Douma2018-01-242-1/+13
| * | | | Add preview endpoint for the fileidRoeland Jago Douma2018-01-242-15/+76
* | | | | Merge pull request #7980 from nextcloud/3rdparty_pimpleJulius Härtl2018-01-241-0/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [3rdparty] Bump pimpe to 3.2.3Roeland Jago Douma2018-01-231-0/+0
| | |/ / | |/| |
* | | | 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 OCSRoeland Jago Douma2018-01-171-0/+4
* | | | | [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 messageMorris Jobke2018-01-2337-149/+321
* | | | | | Merge pull request #7971 from nextcloud/comradekingu-patch-1Morris Jobke2018-01-232-2/+2
|\ \ \ \ \ \
| * | | | | | 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.phpMorris Jobke2018-01-183-7/+15
* | | | | | | | Merge pull request #7989 from nextcloud/cleanup-unused-share-methodsMorris Jobke2018-01-231-107/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Remove not used methods of legacy share.phpMorris Jobke2018-01-221-107/+0
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-01-2310-2/+78