summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4308 from nextcloud/lost-password-emailLukas Reschke2017-04-131-2/+13
|\
| * Update email template for lost password emailMorris Jobke2017-04-121-2/+13
* | Merge pull request #2424 from nextcloud/fix-login-controller-test-consolidate...Morris Jobke2017-04-132-43/+55
|\ \
| * | 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-061-43/+40
* | | Remove expired attemptsLukas Reschke2017-04-132-12/+32
* | | Move to dedicated MiddleWareLukas Reschke2017-04-133-38/+160
* | | 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-139-108/+483
* | | Merge pull request #3966 from nextcloud/downstream-26570Lukas Reschke2017-04-131-2/+12
|\ \ \
| * | | Check for boolean false and add testsMorris Jobke2017-04-041-1/+1
| * | | OC_ -> NC_Morris Jobke2017-04-041-2/+2
| * | | Override config.php values through ENV variables (#26570)Philipp Schaffrath2017-04-041-2/+12
* | | | 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 loginJoas Schilling2017-04-071-2/+19
| | |/ | |/|
* | | Merge pull request #4307 from nextcloud/sharing-emailsRoeland Jago Douma2017-04-121-12/+88
|\ \ \
| * | | No newlines when heading is emptyJoas Schilling2017-04-121-2/+5
| * | | make the plain text footer standard compliant and add a space after '--'. It ...Bjoern Schiessle2017-04-121-1/+1
| * | | Use instance name as alt-textJoas Schilling2017-04-121-2/+2
| * | | Don't duplicate the sentence with the headerJoas Schilling2017-04-121-2/+5
| * | | Properly escape heading, body and button textMorris Jobke2017-04-121-5/+11
| * | | Add addBodyButton to add a single button to email templatesMorris Jobke2017-04-121-0/+64
* | | | Merge pull request #4282 from nextcloud/oci-connect-stringMorris Jobke2017-04-122-24/+36
|\ \ \ \
| * | | | use the same oci connectstring in all code pathsRobin Appelman2017-04-102-24/+36
* | | | | Merge pull request #4331 from nextcloud/query-builder-sumMorris Jobke2017-04-121-0/+4
|\ \ \ \ \
| * | | | | Add sub() to the query function builderRobin Appelman2017-04-121-0/+4
| |/ / / /
* | | | | Merge pull request #4329 from nextcloud/move-out-shared-folderMorris Jobke2017-04-123-43/+50
|\ \ \ \ \
| * | | | | use unjailed path when moving files out of a shared storageRobin Appelman2017-04-121-2/+9
| * | | | | rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::get...Robin Appelman2017-04-122-41/+41
| |/ / / /
* | | | | 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 in encr...Piotr M2017-04-121-2/+4
* | | | | Merge pull request #3614 from nextcloud/discover-federatedsharing-endpointsBjörn Schießle2017-04-124-10/+134
|\ \ \ \ \
| * | | | | Do proper DIRoeland Jago Douma2017-04-114-20/+3
| * | | | | remove discovery manager in favour of the OCSDiscoveryServiceBjoern Schiessle2017-04-112-10/+4
| * | | | | add tests for discovery serviceBjoern Schiessle2017-04-111-3/+3
| * | | | | provide public discovery service to discover OCS end-points on another serverBjoern Schiessle2017-04-113-0/+147
* | | | | | Fix casing of same origin frame optionJoas Schilling2017-04-121-1/+1
| |/ / / / |/| | | |
* | | | | Merge pull request #4309 from nextcloud/remove-unused-codeLukas Reschke2017-04-121-68/+0
|\ \ \ \ \
| * | | | | Removes unused code for link share emailsMorris Jobke2017-04-111-68/+0
* | | | | | Allow to set text versions for the plain text emailMorris Jobke2017-04-111-7/+24
|/ / / / /
* / / / / Add IEMailTemplate to public OCP APILukas Reschke2017-04-114-115/+26
|/ / / /
* | | | Merge pull request #4256 from nextcloud/themingLukas Reschke2017-04-1112-26/+61
|\ \ \ \
| * | | | Move OC_Defaults to OCP\DefaultsMorris Jobke2017-04-0912-26/+61
* | | | | Merge pull request #4283 from nextcloud/shares-by-folder-quoteMorris Jobke2017-04-101-1/+1
|\ \ \ \ \