summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-04-0540-82/+550
|
* Merge pull request #4138 from nextcloud/resources_match_fullidMorris Jobke2017-04-041-1/+7
|\ | | | | Match slashes in ../{id} resource routes
| * Match slashes in ../{id} resource routesRoeland Jago Douma2017-04-041-1/+7
| | | | | | | | | | | | | | | | | | | | Fixes #2954 Before we could match on <prefix>/{id} however if the id contains a / this would not match properly. But since we define the resource routes internally we now make sure that we match all chars (up until the ?). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #4192 from ↵Morris Jobke2017-04-041-2/+2
|\ \ | | | | | | | | | | | | nextcloud/fix/custom-default-app-redirect-2fa-selection Redirect to 2FA selection screen
| * | Redirect to 2FA selection screenChristoph Wurst2017-04-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps like 'rainloop' use \OCP\Util::isLoggedIn() to check whether the current request is authenticated. Since we redirected to the index page before, it resulted in an infinite redirection loop. This change sets the redirection URL to the 2FA selection page, which is the only allowed page in that authentication state. Fixes https://github.com/nextcloud/server/issues/3702 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #4204 from nextcloud/append-fixes-swiftRoeland Jago Douma2017-04-041-7/+4
|\ \ \ | | | | | | | | fix fseek (Swift backend) against string not resource by removing append support
| * | | fix fseek against string not resource by removing append supportArthur Schiwon2017-04-041-7/+4
|/ / / | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #3310 from duritong/patch-1Morris Jobke2017-04-041-1/+3
|\ \ \ | | | | | | | | only chmod logfile if necessary
| * | | only chmod logfile if necessaryduritong2017-01-291-1/+3
| | | | | | | | | | | | otherwise e.g. on SELinux this will log an error, so we better avoid it if not necessary.
* | | | Merge pull request #4071 from nextcloud/issue-173-database-conversion-failureJoas Schilling2017-04-041-1/+30
|\ \ \ \ | | | | | | | | | | Make sure blob columns are correctly converted as parameters
| * | | | Use false because null crashes the cacheJoas Schilling2017-03-261-3/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Make sure blob columns are correctly converted as parametersJoas Schilling2017-03-261-1/+24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #2095 from nextcloud/bruteforcesetttingsLukas Reschke2017-04-046-4/+160
|\ \ \ \ \ | | | | | | | | | | | | Introduce bruteforce settings
| * | | | | Fix testsRoeland Jago Douma2017-04-047-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Move app to own repoRoeland Jago Douma2017-04-0213-876/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/nextcloud/bruteforcesettings Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fixed layout of bruteforcesettingsMorris Jobke2017-04-025-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Fix appRoeland Jago Douma2017-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Update App Manager testRoeland Jago Douma2017-04-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | App is always enabledRoeland Jago Douma2017-04-022-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Respect bruteforce settings in the ThrottlerRoeland Jago Douma2017-04-022-1/+154
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Adds security section to the admin pageRoeland Jago Douma2017-04-022-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Initial commit of the bruteforcesettings appRoeland Jago Douma2017-04-0217-1/+874
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the bruteforce settings app that allows to configure (for now) subnets that are to be ignored when doing brute force analysis. This can for example be the LAN since we trust people from there. * Add app * Add php tests * Add js tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12Roeland Jago Douma2017-04-042-18/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make public links work with master key
| * | | | | | Use master key for public links as wellVincent Petry2017-03-242-23/+35
| | | | | | |
| * | | | | | Add tests for null userVincent Petry2017-03-241-1/+5
| | | | | | |
| * | | | | | Fix public link for master keyVincent Petry2017-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In public link mode there is no session, so the code should use the public key instead.
* | | | | | | Merge pull request #4093 from nextcloud/endorse-password-protectionRoeland Jago Douma2017-04-046-7/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Endorse password protection
| * | | | | | | fix unit testsBjoern Schiessle2017-04-031-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | | let the user set an empty password for share linkTimo Benk2017-04-031-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | | endorseLinkPassword changed to enableLinkPasswordByDefaultTimo Benk2017-04-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | | feature endorse password for share linksTimo Benk2017-04-032-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | works like "enforce password protection", but let the user optionally remove the password protection after the password is set. Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | | feature endorse password for share linksBjoern Schiessle2017-04-033-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | works like "enforce password protection", but let the user optionally remove the password protection after the password is set. by Timo Benk Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | | Merge pull request #4147 from nextcloud/fix_3890Roeland Jago Douma2017-04-042-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't try to parse empty body if there is no body
| * | | | | | | | Don't try to parse empty body if there is no bodyRoeland Jago Douma2017-04-042-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3890 If we do a put request without a body the current code still tries to read the body. This patch makes sure that we do not try to read the body if the content length is 0. See RFC 2616 Section 4.3 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | Merge pull request #3896 from nextcloud/xx621998xx-newbranchRoeland Jago Douma2017-04-041-1/+11
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Fix remaining upload time calculation
| * | | | | | | | Some more hardeningJoas Schilling2017-04-041-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | file-upload.js modified : Remaining upload time correctedSarthikaDhawan2017-04-041-1/+10
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / / / / / / [tx-robot] updated from transifexNextcloud bot2017-04-0434-38/+962
|/ / / / / / /
* | | | | | | Merge pull request #3620 from ↵Morris Jobke2017-04-035-15/+207
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/feature/1463/editable_color_name_for_shared_calendars allow sharees to edit certain calendar properties for themselves
| * | | | | | | OCA\DAV\Files\CustomPropertiesBackend -> OCA\DAV\DAV\CustomPropertiesBackendGeorg Ehrke2017-03-273-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | | | | allow sharees to edit certain calendar properties for themselvesGeorg Ehrke2017-03-274-13/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | | | Merge pull request #4191 from nextcloud/bump-autosizeRoeland Jago Douma2017-04-036-533/+20
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Bump autosize
| * | | | | | | Move to autosize.min.jsRoeland Jago Douma2017-04-035-555/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | Bump autosize.jsRoeland Jago Douma2017-04-032-35/+62
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #4166 from ↵Roeland Jago Douma2017-04-031-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/issue-4165-invalid-int-for-transparency-on-calendars Make sure transparency is an integer when saving a calendar
| * | | | | | | Make sure transparency is an integer when saving a calendarJoas Schilling2017-03-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #4189 from nextcloud/add-issue-template-appJos Poortvliet2017-04-031-3/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add reference to issue template app
| * | | | | | | | Update issue_template.mdJos Poortvliet2017-04-031-1/+1
| | | | | | | | |
| * | | | | | | | Add reference to issue template appLukas Reschke2017-04-021-3/+4
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | | Merge pull request #4131 from nextcloud/fix-jscombinerChristoph Wurst2017-04-031-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix check for cache value in JSCombiner
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 05:07:21 +0000