summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | | Merge pull request #4315 from nextcloud/cleanup-files_external-updateLukas Reschke2017-04-123-88/+0
|\ \ \ \ | | | | | | | | | | [files_external] Remove unneeded update steps
| * | | | [files_external] Remove unneeded update stepsMorris Jobke2017-04-123-88/+0
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4314 from nextcloud/remove-not-needed-update.phpLukas Reschke2017-04-121-98/+0
|\ \ \ \ | | | | | | | | | | Remove update.php of files app
| * | | | Remove update.php of files appMorris Jobke2017-04-121-98/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | * contains only update steps for 8.1/8.2 to 9.0 update Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / / [tx-robot] updated from transifexNextcloud bot2017-04-1226-12/+88
|/ / /
* | | Merge pull request #4304 from nextcloud/add-email-template-to-ocpMorris Jobke2017-04-111-1/+1
|\ \ \ | | | | | | | | Add IEMailTemplate to public OCP API
| * | | Adjust class referencesLukas Reschke2017-04-111-1/+1
| |/ / | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4302 from nextcloud/test-integration-testRoeland Jago Douma2017-04-111-0/+22
|\ \ \ | | | | | | | | [Integration Tests] Clear opcode cache after config change
| * | | Clear opcode cache after config changeLukas Reschke2017-04-111-0/+22
| |/ / | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | share api expanded by tags (#26583)Michael Jobst2017-04-116-31/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * share api expanded by tags * Modified files_sharing JS Unit tests * modified tests. renamed request parameter. refactoring * Update Share20OCS.php Added missing function description * Update Helper.php Added missing function description * Update Helper.php implicit boolean conversion to !empty() * Update Share20OCSTest.php Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4293 from nextcloud/fix_4248Morris Jobke2017-04-111-0/+6
|\ \ \ | |/ / |/| | Do reload shared views
| * | Do reload shared viewsRoeland Jago Douma2017-04-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4248 The magic introduced in #3686 caused the shared views not to be updated properly. Thus we just overwrite the _onUrlChange method in the sharedfilelist. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4256 from nextcloud/themingLukas Reschke2017-04-1111-35/+41
|\ \ \ | | | | | | | | Move OC_Defaults to OCP\Defaults
| * | | ThemingDefaults append cacheBusterCounter to logo URL by defaultMorris Jobke2017-04-092-15/+18
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Move OC_Defaults to OCP\DefaultsMorris Jobke2017-04-099-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * currently there are two ways to access default values: OCP\Defaults or OC_Defaults (which is extended by OCA\Theming\ThemingDefaults) * our code used a mixture of both of them, which made it hard to work on theme values * this extended the public interface with the missing methods and uses them everywhere to only rely on the public interface Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4289 from nextcloud/maintenance-mode-also-on-davMorris Jobke2017-04-111-0/+3
|\ \ \ \ | | | | | | | | | | Add missing maintenance plugin to new DAV endpoint
| * | | | Add missing maintenance plugin to new DAV endpointLukas Reschke2017-04-111-0/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | The `/remote.php/dav/` endpoint was not implementing the MaintenancePlugin. Thus when the instance was put into maintenance mode the endpoints were still accessible and delivered empty content. Sync clients really do love this. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #4283 from nextcloud/shares-by-folder-quoteMorris Jobke2017-04-102-2/+2
|\ \ \ \ | | | | | | | | | | properly quota table names in getSharesInFolder
| * | | | properly quota table names in getSharesInFolderRobin Appelman2017-04-102-2/+2
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 14:25:25 +0000