summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix .drone.ymlLukas Reschke2017-04-131-1/+1
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Add isset() as it can be an empty resultLukas Reschke2017-04-131-1/+1
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Register in ServerContainerLukas Reschke2017-04-132-18/+15
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Add support for ratelimiting via annotationsLukas Reschke2017-04-1321-160/+1026
| | | | | | | | | | | | | 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 #4340 from nextcloud/remove-invalid-routeRoeland Jago Douma2017-04-131-2/+0
|\ | | | | Remove invalid route
| * 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>
* Merge pull request #3966 from nextcloud/downstream-26570Lukas Reschke2017-04-132-2/+33
|\ | | | | Override config.php values through environment variables
| * Check for boolean false and add testsMorris Jobke2017-04-042-1/+16
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * OC_ -> NC_Morris Jobke2017-04-042-3/+3
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Override config.php values through ENV variables (#26570)Philipp Schaffrath2017-04-042-2/+18
| | | | | | | | | | | | | | | | * added functionality to override config.php values with 'OC_' prefixed environment variables * use getenv to read environment variables since apache does not set $_ENV variables, fixed test Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-loginMorris Jobke2017-04-133-58/+83
|\ \ | | | | | | Dont create a log entry on email login
| * | Dont create a log entry on email loginJoas Schilling2017-04-073-58/+83
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-04-13174-836/+902
| | |
* | | Merge pull request #4338 from nextcloud/handlebars-minLukas Reschke2017-04-125-9192/+34
|\ \ \ | | | | | | | | Move to handlebars.min.js
| * | | Move to handlebars.min.jsRoeland Jago Douma2017-04-125-9192/+34
|/ / / | | | | | | | | | | | | | | | core.js is now below 1mb! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4307 from nextcloud/sharing-emailsRoeland Jago Douma2017-04-1216-279/+388
|\ \ \ | | | | | | | | New emails for sharebymail
| * | | Fix unit testsMorris Jobke2017-04-125-13/+19
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Dont add click-button text for plaintext mailsJoas Schilling2017-04-121-3/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | No newlines when heading is emptyJoas Schilling2017-04-122-3/+7
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | make the plain text footer standard compliant and add a space after '--'. It ↵Bjoern Schiessle2017-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | also adds a line break in front so that there is some spacing between the mail body and the footer Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | Use instance name as alt-textJoas Schilling2017-04-125-5/+9
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Don't duplicate the sentence with the headerJoas Schilling2017-04-123-4/+8
| | | | | | | | | | | | | | | | 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>
| * | | Properly escape heading, body and button textMorris Jobke2017-04-122-6/+12
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Add addBodyButton to add a single button to email templatesMorris Jobke2017-04-125-0/+295
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4335 from nextcloud/jquery-ui-minLukas Reschke2017-04-125-29698/+9
|\ \ \ \ | | | | | | | | | | Moved to jquery-ui.custom.min.js
| * | | | Moved to jquery-ui.custom.min.jsRoeland Jago Douma2017-04-125-29698/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shaves off about 200kb of the default loaded js libs Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #4282 from nextcloud/oci-connect-stringMorris Jobke2017-04-122-24/+36
|\ \ \ \ \ | | | | | | | | | | | | use the same oci connectstring in all code paths
| * | | | | use the same oci connectstring in all code pathsRobin Appelman2017-04-102-24/+36
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #4306 from nextcloud/followup-3905Roeland Jago Douma2017-04-121-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Favorites integration tests for shared files
| * | | | | | Favorites integration tests for shared filesMorris Jobke2017-04-121-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #4331 from nextcloud/query-builder-sumMorris Jobke2017-04-122-0/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add sum() to the query function builder
| * | | | | | Add sub() to the query function builderRobin Appelman2017-04-122-0/+14
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #4329 from nextcloud/move-out-shared-folderMorris Jobke2017-04-125-49/+56
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix moving files out of a shared folder
| * | | | | | use unjailed path when moving files out of a shared storageRobin Appelman2017-04-121-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | rename Jail::getSourcePath to getUnjailedPath to fix conflict with ↵Robin Appelman2017-04-124-47/+47
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Local::getSourcePath Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #4325 from nextcloud/downstream-27522Roeland Jago Douma2017-04-122-6/+13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Optimize put - Dont try to fetch filecache for not existing filecache…
| * | | | | Simplify the testJoas Schilling2017-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Optimize put - Dont try to fetch filecache for not existing filecache in ↵Piotr M2017-04-122-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | encription
* | | | | | Merge pull request #3614 from nextcloud/discover-federatedsharing-endpointsBjörn Schießle2017-04-1234-509/+502
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Discover federatedsharing endpoints
| * | | | | Update autoloaderRoeland Jago Douma2017-04-112-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Do proper DIRoeland Jago Douma2017-04-1117-39/+16
| | | | | | | | | | | | | | | | | | | | | | | | 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-1118-468/+81
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | add tests for discovery serviceBjoern Schiessle2017-04-112-3/+102
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | provide public discovery service to discover OCS end-points on another serverBjoern Schiessle2017-04-114-0/+195
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 16:07:56 +0000