summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [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
| * | | Dont add click-button text for plaintext mailsJoas Schilling2017-04-121-3/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Don't duplicate the sentence with the headerJoas Schilling2017-04-121-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Use new email design for sharebymail emailsMorris Jobke2017-04-125-250/+39
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4329 from nextcloud/move-out-shared-folderMorris Jobke2017-04-122-6/+6
|\ \ \ | |/ / |/| | Fix moving files out of a shared folder
| * | rename Jail::getSourcePath to getUnjailedPath to fix conflict with ↵Robin Appelman2017-04-122-6/+6
| | | | | | | | | | | | | | | | | | Local::getSourcePath Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #3614 from nextcloud/discover-federatedsharing-endpointsBjörn Schießle2017-04-1225-493/+211
|\ \ \ | | | | | | | | Discover federatedsharing endpoints
| * | | Do proper DIRoeland Jago Douma2017-04-1112-13/+13
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | give old end-points a seperate nameBjoern Schiessle2017-04-112-2/+33
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | fix constructorBjoern Schiessle2017-04-112-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | remove discovery manager in favour of the OCSDiscoveryServiceBjoern Schiessle2017-04-1114-452/+65
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | adjust existing testsBjoern Schiessle2017-04-114-12/+42
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | get addressbook url and carddav user from remote serverBjoern Schiessle2017-04-113-21/+35
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | use discovered end-point for trusted serversBjoern Schiessle2017-04-112-6/+36
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Allow file upload when storage is unlimitedJoas Schilling2017-04-122-6/+12
| |_|/ |/| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #4317 from nextcloud/cleanup-files_trashbin-updateBjörn Schießle2017-04-121-42/+0
|\ \ \ | | | | | | | | [files_trashbin] Remove unneeded update steps
| * | | [files_trashbin] Remove unneeded update stepsMorris Jobke2017-04-121-42/+0
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4316 from nextcloud/cleanup-files_sharing-updateBjörn Schießle2017-04-122-263/+0
|\ \ \ \ | | | | | | | | | | [files_sharing] Remove unneeded update steps
| * | | | [files_sharing] Remove unneeded update stepsMorris Jobke2017-04-122-263/+0
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4312 from nextcloud/cleanup-nameBjörn Schießle2017-04-1254-113/+113
|\ \ \ \ | | | | | | | | | | Update comments to Nextcloud
| * | | | Update comments to NextcloudMorris Jobke2017-04-1154-113/+113
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * based on PR by @Ardinis * see #4311 Signed-off-by: Morris Jobke <hey@morrisjobke.de>