aboutsummaryrefslogtreecommitdiffstats
path: root/lib
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-132-3/+16
|\ \ | | | | | | Update email template for lost password email
| * | Update email template for lost password emailMorris Jobke2017-04-122-3/+16
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #2424 from ↵Morris Jobke2017-04-132-43/+55
|\ \ \ | | | | | | | | | | | | | | | | 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-061-43/+40
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Remove expired attemptsLukas Reschke2017-04-132-12/+32
| | | | | | | | | | | | | | | | 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-133-38/+160
| | | | | | | | | | | | | | | | 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-139-108/+483
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #3966 from nextcloud/downstream-26570Lukas Reschke2017-04-131-2/+12
|\ \ \ \ | | | | | | | | | | Override config.php values through environment variables
| * | | | Check for boolean false and add testsMorris Jobke2017-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | OC_ -> NC_Morris Jobke2017-04-041-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Override config.php values through ENV variables (#26570)Philipp Schaffrath2017-04-041-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-131-2/+19
|\ \ \ \ \ | | | | | | | | | | | | Dont create a log entry on email login
| * | | | | Dont create a log entry on email loginJoas Schilling2017-04-071-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-04-1350-100/+108
| |_|_|/ / |/| | | |
* | | | | Merge pull request #4307 from nextcloud/sharing-emailsRoeland Jago Douma2017-04-122-15/+103
|\ \ \ \ \ | | | | | | | | | | | | New emails for sharebymail
| * | | | | 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>
| * | | | | Use instance name as alt-textJoas Schilling2017-04-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Don't duplicate the sentence with the headerJoas Schilling2017-04-122-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Properly escape heading, body and button textMorris Jobke2017-04-122-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Add addBodyButton to add a single button to email templatesMorris Jobke2017-04-122-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4282 from nextcloud/oci-connect-stringMorris Jobke2017-04-122-24/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | use the same oci connectstring in all code paths
| * | | | | | use the same oci connectstring in all code pathsRobin Appelman2017-04-102-24/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #4331 from nextcloud/query-builder-sumMorris Jobke2017-04-122-0/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add sum() to the query function builder
| * | | | | | | Add sub() to the query function builderRobin Appelman2017-04-122-0/+14
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #4329 from nextcloud/move-out-shared-folderMorris Jobke2017-04-123-43/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix moving files out of a shared folder
| * | | | | | | use unjailed path when moving files out of a shared storageRobin Appelman2017-04-121-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | rename Jail::getSourcePath to getUnjailedPath to fix conflict with ↵Robin Appelman2017-04-122-41/+41
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Local::getSourcePath Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #4325 from nextcloud/downstream-27522Roeland Jago Douma2017-04-121-2/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Optimize put - Dont try to fetch filecache for not existing filecache…
| * | | | | | Optimize put - Dont try to fetch filecache for not existing filecache in ↵Piotr M2017-04-121-2/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | encription
* | | | | | Merge pull request #3614 from nextcloud/discover-federatedsharing-endpointsBjörn Schießle2017-04-127-10/+186
|\ \ \ \ \ \ | | | | | | | | | | | | | | Discover federatedsharing endpoints
| * | | | | | Update autoloaderRoeland Jago Douma2017-04-112-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Do proper DIRoeland Jago Douma2017-04-115-26/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | remove discovery manager in favour of the OCSDiscoveryServiceBjoern Schiessle2017-04-113-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | add tests for discovery serviceBjoern Schiessle2017-04-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | provide public discovery service to discover OCS end-points on another serverBjoern Schiessle2017-04-114-0/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | Fix casing of same origin frame optionJoas Schilling2017-04-121-1/+1
| |/ / / / / |/| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #4309 from nextcloud/remove-unused-codeLukas Reschke2017-04-121-68/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removes unused code for link share emails