summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* improve mail textBjoern Schiessle2017-04-201-3/+2
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* create activity if a password was send by mailBjoern Schiessle2017-04-202-24/+101
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* templates no longer neededBjoern Schiessle2017-04-202-91/+0
|
* allow admin to enforce password on mail sharesBjoern Schiessle2017-04-2012-30/+313
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Merge pull request #4212 from individual-it/masterJoas Schilling2017-04-202-38/+149
|\ | | | | validate file name before uploading in upload only folder
| * remove accidently left over *f*itArtur Neumann2017-04-181-1/+1
| | | | | | Signed-off-by: Artur Neumann <info@individual-it.net>
| * JS tests for upload only functionArtur Neumann2017-04-181-0/+99
| | | | | | Signed-off-by: Artur Neumann <info@individual-it.net>
| * refactor to make it easier to testArtur Neumann2017-04-181-45/+50
| | | | | | Signed-off-by: Artur Neumann <info@individual-it.net>
| * validate file name before uploading in upload only folderArtur Neumann2017-04-051-1/+8
| | | | | | | | | | fixes #4211 Signed-off-by: Artur Neumann <info@individual-it.net>
* | [tx-robot] updated from transifexNextcloud bot2017-04-2078-24/+176
| |
* | Rename renderHTML to renderHtmlMorris Jobke2017-04-192-4/+4
| | | | | | | | | | | | | | * fixes #4383 * improves consistency Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Improve menu CSSMorris Jobke2017-04-192-65/+22
| | | | | | | | | | | | | | | | * fix mess with menus and actions in the files app * reduces amount of !important usages * keeps the behaviour on mobile as well as on desktop Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4385 from nextcloud/remove-unused-cssRoeland Jago Douma2017-04-191-51/+5
|\ \ | | | | | | Remove unused CSS
| * | Remove unused CSSMorris Jobke2017-04-181-51/+5
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4382 from nextcloud/use-proper-reply-toLukas Reschke2017-04-192-9/+286
|\ \ \ | | | | | | | | Add "Reply-To" on ShareByMailProvider mails
| * | | Fix indentationLukas Reschke2017-04-191-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add "Reply-To" on ShareByMailProvider mailsLukas Reschke2017-04-182-9/+286
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/4209 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #4350 from ↵Roeland Jago Douma2017-04-194-5/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/adjust-old-bruteforce-protection-annotations Adjust existing bruteforce protection code
| * | | | Adjust existing bruteforce protection codeLukas Reschke2017-04-144-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Moves code to annotation - Adds the `throttle()` call on the responses on existing annotations Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-198-0/+16
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-18202-650/+618
| | | | |
* | | | | Merge pull request #4369 from nextcloud/fix-translationsMorris Jobke2017-04-1812-19/+19
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix translations
| * | | | Fix translationsJoas Schilling2017-04-1812-19/+19
| | |/ / | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / | | [tx-robot] updated from transifexNextcloud bot2017-04-1876-116/+52
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-04-1826-24/+144
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-04-1726-340/+336
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-04-1610-106/+106
| | |
* | | Merge pull request #2834 from nextcloud/accesListToShareManagerMorris Jobke2017-04-154-1/+186
|\ \ \ | | | | | | | | Access list to share manager
| * | | Mail shares trigger the public keyRoeland Jago Douma2017-04-132-17/+17
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Adjust docs and make !$currentAccess simplerJoas Schilling2017-04-134-1/+30
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add unit tests for sharebymail providerJoas Schilling2017-04-131-0/+55
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix federated file sharingJoas Schilling2017-04-131-4/+23
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix returned paths for remote sharesJoas Schilling2017-04-131-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Return the token as wellJoas Schilling2017-04-131-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Return the paths for the users without setting them all upJoas Schilling2017-04-131-4/+9
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add mail element to access listRoeland Jago Douma2017-04-133-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-1546-308/+408
| |/ / |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-04-14104-330/+592
| | |
* | | Merge pull request #4337 from nextcloud/fix-adblock-share-iconMorris Jobke2017-04-136-32/+31
|\ \ \ | | | | | | | | Fix AdBlock blocking share icon, ref #866
| * | | Fix AdBlock blocking share icon, ref #866Jan-Christoph Borchardt2017-04-126-32/+31
| | | | | | | | | | | | | | | | 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-134-2/+74
|\ \ \ \ \ | | | | | | | | | | | | Add support for ratelimiting via annotations
| * | | | | Add support for ratelimiting via annotationsLukas Reschke2017-04-134-2/+74
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #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>
* | | | | 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>
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-1348-168/+172
| | | |
* | | | Merge pull request #4307 from nextcloud/sharing-emailsRoeland Jago Douma2017-04-125-250/+40
|\ \ \ \ | | | | | | | | | | New emails for sharebymail