summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* respect password policy for auto generated passwordsBjoern Schiessle2017-04-201-1/+3
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* allow admin to enforce password on mail sharesBjoern Schiessle2017-04-201-1/+2
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Merge pull request #4398 from nextcloud/fix_accesslistcodeJoas Schilling2017-04-201-2/+7
|\ | | | | Get proper accesslist for userFolder
| * Get proper accesslist for userFolderRoeland Jago Douma2017-04-201-2/+7
| | | | | | | | | | | | | | If the accesslist is requested for a users root folder we should properly construct the path Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #4381 from nextcloud/2954_take_2Joas Schilling2017-04-201-7/+1
|\ \ | | | | | | Fix group settings routes and fix route regression
| * | Revert "Match slashes in ../{id} resource routes"Roeland Jago Douma2017-04-181-7/+1
| | | | | | | | | | | | | | | | | | This reverts commit 31f9be7a75712e9f8b7831ed29397527f9fa8baf. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Rename renderHTML to renderHtmlMorris Jobke2017-04-191-2/+2
| |/ |/| | | | | | | | | | | * fixes #4383 * improves consistency Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4382 from nextcloud/use-proper-reply-toLukas Reschke2017-04-191-1/+3
|\ \ | | | | | | Add "Reply-To" on ShareByMailProvider mails
| * | Add "Reply-To" on ShareByMailProvider mailsLukas Reschke2017-04-181-1/+3
| |/ | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/4209 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #4371 from nextcloud/dont-allow-dot-usernamesMorris Jobke2017-04-181-1/+5
|\ \ | | | | | | Better validation of allowed user names
| * | Better validation of allowed user namesJoas Schilling2017-04-181-1/+5
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4369 from nextcloud/fix-translationsMorris Jobke2017-04-185-7/+7
|\ \ | | | | | | Fix translations
| * | Fix translationsJoas Schilling2017-04-185-7/+7
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4380 from nextcloud/show-instance-name-in-fromMorris Jobke2017-04-181-1/+1
|\ \ | | | | | | Add instance name to default sender
| * | Add instance name to default senderLukas Reschke2017-04-181-1/+1
| |/ | | | | | | | | | | Otherwise your mail program shows "foo@mail.com" instead of "Nextcloud" or whatever your instance name is. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* / Don't put the SMTP password into the HTML codeJoas Schilling2017-04-181-0/+4
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #2834 from nextcloud/accesListToShareManagerMorris Jobke2017-04-155-23/+465
|\ | | | | Access list to share manager
| * Fix server container registrationRoeland Jago Douma2017-04-131-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Not needed in the DIContainer anymoreRoeland Jago Douma2017-04-131-6/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Do not set full path if not currentAccessRoeland Jago Douma2017-04-131-6/+11
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add samples to the docsJoas Schilling2017-04-131-0/+38
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Catch exceptions and use as many results as possibleJoas Schilling2017-04-131-24/+59
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Adjust docs and make !$currentAccess simplerJoas Schilling2017-04-133-12/+33
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Fix default share providerJoas Schilling2017-04-131-6/+7
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Fix tests for ShareHelperJoas Schilling2017-04-131-0/+15
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Fix returned paths for remote sharesJoas Schilling2017-04-131-20/+9
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Return the token as wellJoas Schilling2017-04-131-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Also return the tokenJoas Schilling2017-04-131-5/+11
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Return the paths for the users without setting them all upJoas Schilling2017-04-134-40/+152
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Fix commentsRoeland Jago Douma2017-04-133-1/+14
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add mail element to access listRoeland Jago Douma2017-04-132-4/+12
| | | | | | | | | | | | | | | | * Each provider just returns what they have so adding an element won't require changing everything * Added tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Offload acceslist creation to providersRoeland Jago Douma2017-04-132-41/+92
| | | | | | | | | | | | | | | | * This allows for effective queries. * Introduce currentAccess parameter to speciy if the users needs to have currently acces (deleted incomming group share). (For notifications) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Added ShareHelperRoeland Jago Douma2017-04-131-0/+64
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Port Encryption/file to new getAccessListRoeland Jago Douma2017-04-132-7/+32
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Added to public interfaceRoeland Jago Douma2017-04-131-4/+11
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add owner to access listRoeland Jago Douma2017-04-131-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add getAccessList to ShareManagerRoeland Jago Douma2017-04-131-5/+62
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #4330 from nextcloud/activities-for-password-mail-changeRoeland Jago Douma2017-04-143-5/+15
|\ \ | | | | | | Add activities when email or password is changed
| * | Allow to read the old email on the hook as wellJoas Schilling2017-04-132-5/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Add activities when email or password is changedJoas Schilling2017-04-131-0/+9
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Make BruteForceProtection annotation more cleverLukas Reschke2017-04-133-17/+98
| | | | | | | | | | | | | | | | This makes the new `@BruteForceProtection` annotation more clever and moves the relevant code into it's own middleware. Basically you can now set `@BruteForceProtection(action=$key)` as annotation and that will make the controller bruteforce protected. However, the difference to before is that you need to call `$responmse->throttle()` to increase the counter. Before the counter was increased every time which leads to all kind of unexpected problems. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | 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-131-2/+13
|\ \ \ | | | | | | | | Update email template for lost password email
| * | | Update email template for lost password emailMorris Jobke2017-04-121-2/+13
| | | | | | | | | | | | | | | | 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>