aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* rename Jail::getSourcePath to getUnjailedPath to fix conflict with ↵Robin Appelman2017-04-122-41/+41
| | | | | | Local::getSourcePath Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #4277 from nextcloud/permissions-mask-scannerBjörn Schießle2017-04-101-0/+4
|\ | | | | Dont use the permissions mask while scanning
| * Dont use the permissions mask while scanningRobin Appelman2017-04-101-0/+4
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #4222 from nextcloud/dav-search-fileidRoeland Jago Douma2017-04-101-1/+3
|\ \ | |/ |/| Allow searching file by fileid
| * Allow searching file by fileidRobin Appelman2017-04-051-1/+3
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #4210 from nextcloud/downstream-26643Roeland Jago Douma2017-04-101-15/+15
|\ \ | | | | | | Removed path to datadir in exception
| * | Lowercase "data" correctlyJoas Schilling2017-04-101-6/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | removed path to datadirKawohl2017-04-041-13/+13
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Also send the new account data with the eventJoas Schilling2017-04-101-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-04-106-10/+18
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-04-0916-0/+18
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-04-084-6/+8
| | |
* | | Merge pull request #4136 from nextcloud/expire-date-for-all-sharesMorris Jobke2017-04-074-60/+93
|\ \ \ | | | | | | | | Unified sharing options
| * | | update unit testsBjoern Schiessle2017-04-073-45/+30
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | setting to disable sending password by mailBjoern Schiessle2017-04-031-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | set expire date for all share typesBjoern Schiessle2017-04-032-25/+48
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | add secure drop functionallity to mail sharesBjoern Schiessle2017-04-031-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | allow password protected mail sharesBjoern Schiessle2017-04-031-2/+23
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | add new password column to the share table in order to set passwords for ↵Bjoern Schiessle2017-04-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | share by mails Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #4253 from nextcloud/downstream-27599Roeland Jago Douma2017-04-071-5/+10
|\ \ \ \ | | | | | | | | | | make JobList::next() lock free
| * | | | make JobList::next() lock freeJörn Friedrich Dreyer2017-04-071-5/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Update autoloaderLukas Reschke2017-04-072-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Add support for themingLukas Reschke2017-04-073-33/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for theming in generated emails and simplify API Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | New layout for welcome emailMorris Jobke2017-04-072-0/+499
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * thanks to @espina2 for make this nice design * the button says "Set password" if the admin didn't specified a password Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Don't force the use of Accept-Language anymoreJoas Schilling2017-04-072-26/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not intended anymore, since it falls back to force english when the header is not set. Also 0228bc6e66cbcb2848eacb41f1de6e7f63ebcb65 makes clear that the order should be: 1. User setting 2. Accept language 3. Admin default This is the case since the commit from above, unless via OCS and DAV. Both forced to accept-language falling back to english. By removing the force, it now also matches the w3 priority list: https://www.w3.org/International/questions/qa-lang-priorities Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-074-2/+46
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-0618-4/+28
| | | |
* | | | Save the scope of an auth token in the sessionRobin Appelman2017-04-053-24/+68
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-052-0/+20
| |/ / |/| |
* | | 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 #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 #2095 from nextcloud/bruteforcesetttingsLukas Reschke2017-04-042-0/+66
|\ \ \ \ \ | | | | | | | | | | | | Introduce bruteforce settings
| * | | | | Fixed layout of bruteforcesettingsMorris Jobke2017-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Respect bruteforce settings in the ThrottlerRoeland Jago Douma2017-04-021-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Adds security section to the admin pageRoeland Jago Douma2017-04-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #4093 from nextcloud/endorse-password-protectionRoeland Jago Douma2017-04-042-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Endorse password protection
| * | | | | | feature endorse password for share linksBjoern Schiessle2017-04-032-0/+5
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-041-0/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | 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-041-0/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* / | | | [tx-robot] updated from transifexNextcloud bot2017-04-044-0/+356
|/ / / /
* | | | Merge pull request #4131 from nextcloud/fix-jscombinerChristoph Wurst2017-04-031-1/+1
|\ \ \ \ | |/ / / |/| | | Fix check for cache value in JSCombiner
| * | | Fix check for cache value in JSCombinerMorris Jobke2017-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes following log output, because there was empty string stored in the cache Invalid argument supplied for foreach() at lib/private/Template/JSCombiner.php#108 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-032-12/+12
| |/ / |/| |
* | | Merge pull request #4140 from nextcloud/no_encryption_no_wrapperBjörn Schießle2017-03-311-2/+5
|\ \ \ | | | | | | | | Don't add the Encryption Storage Wrapper if there are no encryption modules
| * | | Don't add the Encryption Storage Wrapper if there are no encryption modulesRoeland Jago Douma2017-03-291-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #4125 If there is no encryption module enabled it makes no sense to setup the encryption wrapper (because we can't do anything anyway). This saves reading the header of files. Especialy on external storage/objectstore this should improve performance Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-312-70/+72
| | | |