summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4326 from nextcloud/downstream-27562Morris Jobke2017-04-132-5/+6
|\
| * Use constantsJoas Schilling2017-04-132-2/+2
| * Reorder the entries of the log for easier readingJuan Pablo Villafáñez2017-04-122-6/+7
* | Merge pull request #4308 from nextcloud/lost-password-emailLukas Reschke2017-04-137-36/+89
|\ \
| * | Update email template for lost password emailMorris Jobke2017-04-127-36/+89
* | | Merge pull request #2424 from nextcloud/fix-login-controller-test-consolidate...Morris Jobke2017-04-134-56/+73
|\ \ \
| * | | Improve PHPDocMorris Jobke2017-04-131-1/+1
| * | | use known LockdownManagerArthur Schiwon2017-04-061-1/+1
| * | | Save correct login nameArthur Schiwon2017-04-061-1/+8
| * | | Add method to $methodsWithSensitiveParametersMorris Jobke2017-04-061-0/+1
| * | | don't regenerate Session ID twice, also fixes testsArthur Schiwon2017-04-061-4/+7
| * | | regenerate session id on successful login, fixes integration testArthur Schiwon2017-04-061-0/+4
| * | | do login routine only once when done via LoginControllerArthur Schiwon2017-04-063-52/+49
| * | | fix login controller testsArthur Schiwon2017-04-062-6/+11
* | | | Merge pull request #4337 from nextcloud/fix-adblock-share-iconMorris Jobke2017-04-139-44/+42
|\ \ \ \
| * | | | Fix AdBlock blocking share icon, ref #866Jan-Christoph Borchardt2017-04-129-44/+42
| | |_|/ | |/| |
* | | | Merge pull request #4341 from nextcloud/local-link-explanationMorris Jobke2017-04-131-1/+1
|\ \ \ \
| * | | | Explain local linkJos Poortvliet2017-04-131-1/+1
* | | | | Merge pull request #4336 from nextcloud/add-ratelimitingLukas Reschke2017-04-1326-149/+1436
|\ \ \ \ \
| * | | | | Remove expired attemptsLukas Reschke2017-04-133-17/+45
| * | | | | Add tests for multiple parametersLukas Reschke2017-04-131-5/+19
| * | | | | Enable testing app in CI stepLukas Reschke2017-04-131-0/+1
| * | | | | Update static autoloadermapLukas Reschke2017-04-132-0/+12
| * | | | | Move to dedicated MiddleWareLukas Reschke2017-04-135-78/+447
| * | | | | Fix .drone.ymlLukas Reschke2017-04-131-1/+1
| * | | | | Add isset() as it can be an empty resultLukas Reschke2017-04-131-1/+1
| * | | | | Register in ServerContainerLukas Reschke2017-04-132-18/+15
| * | | | | Add support for ratelimiting via annotationsLukas Reschke2017-04-1321-160/+1026
* | | | | | Merge pull request #4342 from nextcloud/update-certificate-bundleMorris Jobke2017-04-131-162/+139
|\ \ \ \ \ \
| * | | | | | Update CA bundleLukas Reschke2017-04-131-162/+139
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4344 from nextcloud/dont-load-handlebarsRoeland Jago Douma2017-04-131-1/+0
|\ \ \ \ \ \
| * | | | | | Don't load handlebars in templateLukas Reschke2017-04-131-1/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4313 from nextcloud/ldap-name-changeLukas Reschke2017-04-135-20/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Change LDAP method namesMorris Jobke2017-04-125-20/+20
* | | | | | Merge pull request #4340 from nextcloud/remove-invalid-routeRoeland Jago Douma2017-04-131-2/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove invalid routeLukas Reschke2017-04-131-2/+0
|/ / / / /
* | | | | Merge pull request #3966 from nextcloud/downstream-26570Lukas Reschke2017-04-132-2/+33
|\ \ \ \ \
| * | | | | Check for boolean false and add testsMorris Jobke2017-04-042-1/+16
| * | | | | OC_ -> NC_Morris Jobke2017-04-042-3/+3
| * | | | | Override config.php values through ENV variables (#26570)Philipp Schaffrath2017-04-042-2/+18
* | | | | | Merge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-loginMorris Jobke2017-04-133-58/+83
|\ \ \ \ \ \
| * | | | | | Dont create a log entry on email loginJoas Schilling2017-04-073-58/+83
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-04-13174-836/+902
* | | | | | | Merge pull request #4338 from nextcloud/handlebars-minLukas Reschke2017-04-125-9192/+34
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Move to handlebars.min.jsRoeland Jago Douma2017-04-125-9192/+34
|/ / / / / /
* | | | | | Merge pull request #4307 from nextcloud/sharing-emailsRoeland Jago Douma2017-04-1216-279/+388
|\ \ \ \ \ \
| * | | | | | Fix unit testsMorris Jobke2017-04-125-13/+19
| * | | | | | Dont add click-button text for plaintext mailsJoas Schilling2017-04-121-3/+4
| * | | | | | No newlines when heading is emptyJoas Schilling2017-04-122-3/+7
| * | | | | | make the plain text footer standard compliant and add a space after '--'. It ...Bjoern Schiessle2017-04-121-1/+1