summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4326 from nextcloud/downstream-27562Morris Jobke2017-04-132-5/+6
|\ | | | | Reorder the entries of the log for easier reading
| * Use constantsJoas Schilling2017-04-132-2/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * 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 email
| * | Update email template for lost password emailMorris Jobke2017-04-127-36/+89
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #2424 from ↵Morris Jobke2017-04-134-56/+73
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/fix-login-controller-test-consolidate-login Fix login controller test and consolidate login
| * | | Improve PHPDocMorris Jobke2017-04-131-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | use known LockdownManagerArthur Schiwon2017-04-061-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | Save correct login nameArthur Schiwon2017-04-061-1/+8
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | Add method to $methodsWithSensitiveParametersMorris Jobke2017-04-061-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | don't regenerate Session ID twice, also fixes testsArthur Schiwon2017-04-061-4/+7
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | regenerate session id on successful login, fixes integration testArthur Schiwon2017-04-061-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | do login routine only once when done via LoginControllerArthur Schiwon2017-04-063-52/+49
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | fix login controller testsArthur Schiwon2017-04-062-6/+11
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #4337 from nextcloud/fix-adblock-share-iconMorris Jobke2017-04-139-44/+42
|\ \ \ \ | | | | | | | | | | Fix AdBlock blocking share icon, ref #866
| * | | | Fix AdBlock blocking share icon, ref #866Jan-Christoph Borchardt2017-04-129-44/+42
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #4341 from nextcloud/local-link-explanationMorris Jobke2017-04-131-1/+1
|\ \ \ \ | | | | | | | | | | Explain local link
| * | | | Explain local linkJos Poortvliet2017-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The local link is a clever thing and the clients should support this imho but it might not be clear to all users. For one, the term 'local link' is a bit odd. Local with respect to what? It links directly to the file or folder, so direct link seems to make more sense to me. And we should explain the difference with a public link. So this PR: * renames local link to direct link * adds a short explanation, noting it only works for users who have access to this file/folder. As other links are called public link you could also consider calling this 'private link', I suppose. But the links we sent by mail to ppl could also be called 'private link' (they are for one user, who git it by email) so I think it might be confusing. What do @nextcloud/designers think? Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #4336 from nextcloud/add-ratelimitingLukas Reschke2017-04-1326-149/+1436
|\ \ \ \ \ | | | | | | | | | | | | Add support for ratelimiting via annotations
| * | | | | Remove expired attemptsLukas Reschke2017-04-133-17/+45
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Add tests for multiple parametersLukas Reschke2017-04-131-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Enable testing app in CI stepLukas Reschke2017-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Update static autoloadermapLukas Reschke2017-04-132-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Move to dedicated MiddleWareLukas Reschke2017-04-135-78/+447
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Fix .drone.ymlLukas Reschke2017-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Add isset() as it can be an empty resultLukas Reschke2017-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Register in ServerContainerLukas Reschke2017-04-132-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Add support for ratelimiting via annotationsLukas Reschke2017-04-1321-160/+1026
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows adding rate limiting via annotations to controllers, as one example: ``` @UserRateThrottle(limit=5, period=100) @AnonRateThrottle(limit=1, period=100) ``` Would mean that logged-in users can access the page 5 times within 100 seconds, and anonymous users 1 time within 100 seconds. If only an AnonRateThrottle is specified that one will also be applied to logged-in users. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4342 from nextcloud/update-certificate-bundleMorris Jobke2017-04-131-162/+139
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update CA bundle
| * | | | | | Update CA bundleLukas Reschke2017-04-131-162/+139
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4344 from nextcloud/dont-load-handlebarsRoeland Jago Douma2017-04-131-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't load handlebars in template
| * | | | | | Don't load handlebars in templateLukas Reschke2017-04-131-1/+0
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | It's already loaded in core.json Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4313 from nextcloud/ldap-name-changeLukas Reschke2017-04-135-20/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Change LDAP method names
| * | | | | Change LDAP method namesMorris Jobke2017-04-125-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4340 from nextcloud/remove-invalid-routeRoeland Jago Douma2017-04-131-2/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Remove invalid route
| * | | | | Remove invalid routeLukas Reschke2017-04-131-2/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Said file doesn't exist anymore and accessing it would just return a 500 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #3966 from nextcloud/downstream-26570Lukas Reschke2017-04-132-2/+33
|\ \ \ \ \ | | | | | | | | | | | | Override config.php values through environment variables
| * | | | | Check for boolean false and add testsMorris Jobke2017-04-042-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | OC_ -> NC_Morris Jobke2017-04-042-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Override config.php values through ENV variables (#26570)Philipp Schaffrath2017-04-042-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added functionality to override config.php values with 'OC_' prefixed environment variables * use getenv to read environment variables since apache does not set $_ENV variables, fixed test Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | 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 login
| * | | | | | Dont create a log entry on email loginJoas Schilling2017-04-073-58/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | [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.js
| * | | | | | Move to handlebars.min.jsRoeland Jago Douma2017-04-125-9192/+34
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | core.js is now below 1mb! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #4307 from nextcloud/sharing-emailsRoeland Jago Douma2017-04-1216-279/+388
|\ \ \ \ \ \ | | | | | | | | | | | | | | New emails for sharebymail
| * | | | | | Fix unit testsMorris Jobke2017-04-125-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Dont add click-button text for plaintext mailsJoas Schilling2017-04-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | No newlines when heading is emptyJoas Schilling2017-04-122-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | make the plain text footer standard compliant and add a space after '--'. It ↵Bjoern Schiessle2017-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also adds a line break in front so that there is some spacing between the mail body and the footer Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 09:15:19 +0000