summaryrefslogtreecommitdiffstats
path: root/core/Controller
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4123 from nextcloud/allow-password-reset-with-emailRoeland Jago Douma2017-04-051-13/+26
|\
| * Allow to reset the password with the email as an inputJoas Schilling2017-03-281-13/+26
* | Fix gzip files for SafariMorris Jobke2017-03-292-2/+2
* | Allow to gzip CSS/JS filesRoeland Jago Douma2017-03-282-4/+60
|/
* [PoC] JS CombinerRoeland Jago Douma2017-03-241-0/+80
* Merge pull request #2606 from temparus/masterblizzz2017-02-151-0/+7
|\
| * Update license headerSandro Lutz2017-02-071-0/+2
| * Merge remote-tracking branch 'nextcloud/master'Sandro Lutz2017-02-076-36/+117
| |\
| * | Add missing use statement for PublicEmitterSandro Lutz2017-02-071-0/+1
| * | Fix typo for UserManager variableSandro Lutz2017-02-011-1/+1
| * | Add check if UserManager is of type PublicEmitter before calling preLogin hookSandro Lutz2017-02-011-1/+3
| * | Change where preLogin hook gets calledSandro Lutz2017-02-011-0/+2
| * | Remove preLoginValidation hookSandro Lutz2017-02-011-3/+0
| * | Fix indentationSandro Lutz2017-02-011-1/+1
| * | Add preLoginValidation hookSandro Lutz2017-02-011-0/+3
* | | Merge pull request #3362 from nextcloud/fix/nc-token-cookie-nameJoas Schilling2017-02-091-1/+1
|\ \ \
| * | | oc_token should be nc_tokenChristoph Wurst2017-02-021-1/+1
| | |/ | |/|
* / | Fix public page css fallback loadingJohn Molakvoæ (skjnldsv)2017-02-012-3/+0
|/ /
* | Merge pull request #2044 from nextcloud/login-credential-storeMorris Jobke2017-01-301-1/+0
|\ \
| * | always allow remembered loginChristoph Wurst2017-01-111-1/+0
* | | unify endpoints form core and the the provisioning apiBjoern Schiessle2017-01-251-14/+0
* | | Merge pull request #3004 from nextcloud/fix-installation-cssLukas Reschke2017-01-222-0/+3
|\ \ \
| * | | Create unified css file and merge all needed data into this fileJohn Molakvoæ (skjnldsv)2017-01-102-1/+3
| * | | Removed jquery scssJohn Molakvoæ (skjnldsv)2017-01-101-0/+1
* | | | add brute force protection to password reset to make it harder to guess user ...Bjoern Schiessle2017-01-191-0/+1
* | | | add action to existing brute force protectionBjoern Schiessle2017-01-182-7/+7
* | | | Merge pull request #2918 from nextcloud/encryption-recovery-improvementsMorris Jobke2017-01-131-5/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | create new encryption keys on password reset and backup the old oneBjoern Schiessle2017-01-101-5/+2
| |/ /
* | | fix coding style and increase code coverageChristoph Wurst2017-01-111-9/+7
* | | Add a TwoFactorExceptionCornelius Kölbel2017-01-111-4/+19
|/ /
* | Adds CssControllerTestsRoeland Jago Douma2017-01-061-17/+12
* | No need for the CssManagerRoeland Jago Douma2017-01-061-9/+9
* | Do not add ICssManager to OCPRoeland Jago Douma2017-01-061-4/+5
* | Code cleanupRoeland Jago Douma2017-01-061-1/+1
* | Css cache folder name fix, route fix and various fixesJohn Molakvoæ (skjnldsv)2017-01-061-2/+3
* | Injection fix and log appname fixJohn Molakvoæ (skjnldsv)2017-01-061-3/+2
* | Appdata integration 2John Molakvoæ (skjnldsv)2017-01-061-0/+83
* | Use login name to fix password confirm with ldap usersJoas Schilling2017-01-051-7/+3
* | Set redirect_url on 2FA challenge pageChristoph Wurst2016-12-231-0/+1
* | Merge pull request #2563 from nextcloud/fix-password-resetMorris Jobke2016-12-221-1/+7
|\ \ | |/ |/|
| * fix password reset if encryption is enabledBjoern Schiessle2016-12-081-1/+7
* | Save the timezone on login againJoas Schilling2016-12-081-1/+8
|/
* Merge pull request #2428 from justin-sleep/upstreamMorris Jobke2016-12-031-1/+1
|\
| * Move integer casting to the top of the chainjustin-sleep2016-12-021-1/+1
* | Cache all avatar responsesRoeland Jago Douma2016-11-301-16/+10
|/
* Add a signer class for signingLukas Reschke2016-11-211-2/+2
* Add identity proofLukas Reschke2016-11-211-5/+27
* Introduce the UI for password confirmationJoas Schilling2016-11-182-3/+44
* Move OC\OCS\Person to OCSControllerRoeland Jago Douma2016-11-161-1/+38
* Merge pull request #1109 from nextcloud/add-more-secrets-to-password-reset-linkMorris Jobke2016-11-031-5/+31
|\