aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* when downloading from web, skip files that are not accessibleArthur Schiwon2019-12-192-5/+15
| | | | | | | * avoids a 403, but enables download of resources that are not restricted * single file downloads still cause 403 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* use Nodes API for zip streamingArthur Schiwon2019-12-191-17/+30
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Use files node API for single file downloadsJulius Härtl2019-12-191-14/+28
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #18162 from nextcloud/enh/noid/url-fileentityblizzz2019-12-191-1/+13
|\ | | | | flow file entity to provide the internal URL
| * flow file entity to provide the internal URLArthur Schiwon2019-12-131-1/+13
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #18235 from nextcloud/enh/noid/federated-on-circlesRoeland Jago Douma2019-12-193-1/+19
|\ \ | | | | | | confirm auth on share generated by Circles
| * | confirm auth on share generated by CirclesMaxence Lange2019-12-163-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com> returns true Signed-off-by: Maxence Lange <maxence@artificial-owl.com> DI Signed-off-by: Maxence Lange <maxence@artificial-owl.com> DI Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | Merge pull request #16792 from MichaIng/patch-1Roeland Jago Douma2019-12-192-25/+46
|\ \ \ | | | | | | | | Harden data and config protection .htaccess
| * \ \ Merge branch 'master' into patch-1MichaIng2019-12-044376-105549/+106050
| |\ \ \
| * | | | Add missing newlines to .htaccessMichaIng2019-10-311-2/+2
| | | | | | | | | | | | | | | Signed-off-by: MichaIng <micha@dietpi.com>
| * | | | Add "Order" to assure that no parental "Allow" can grant accessMichaIng2019-09-261-0/+2
| | | | | | | | | | | | | | | Signed-off-by: MichaIng <micha@dietpi.com>
| * | | | Add "Order" to assure that no parental "Allow" can grant accessMichaIng2019-09-261-0/+2
| | | | | | | | | | | | | | | Signed-off-by: MichaIng <micha@dietpi.com>
| * | | | Apache 2.5 will be released as 2.6MichaIng2019-08-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | + Ref: https://github.com/nextcloud/server/pull/16792/files#r315206147 Signed-off-by: Micha Felle <micha@dietpi.com>
| * | | | Minor syntaxMichaIng2019-08-191-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Use Apache syntax with cases according to official docs: https://github.com/nextcloud/server/pull/16792/files#r315207691 + Add missing whitespace for concatenating strings to variable: https://github.com/nextcloud/server/pull/16792/files#r315207520 + Apache 2.5 will be released as 2.6: https://github.com/nextcloud/server/pull/16792/files#r315206147 Signed-off-by: Micha Felle <micha@dietpi.com>
| * | | | Use syntax with cases according to official docsMichaIng2019-08-191-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | + Ref: https://github.com/nextcloud/server/pull/16792/files#r315207691 Signed-off-by: Micha Felle <micha@dietpi.com>
| * | | | Update lib/private/Setup.php MichaIng2019-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | + Remove unnecessary spaces from code Co-Authored-By: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Harden config protection .htaccessMichaIng2019-08-191-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Set "Satisfy All" whenever available, as well on Apache 2.4+. This is required to override possible "Satisfy Any" on parent dir, which otherwise would allow direct access to data, regardless of "Require" directive. + Set "Deny from all" as well whenever available, to block access regardless of which access control directive takes priority. + Assume Apache 2.2 only, if mod_authz_core and mod_access_compat are both not available, to avoid doubled directives. In this case set "Deny from all" directive only if the providing mod_authz_host module is available. "Satisfy" is a core directive on Apache 2.2. + Update Apache version strings. Regarding the used directives/modules, Apache 2.4 and 2.5 behave the same. + Add ordering spaces to better reflect the nested directives and to match style of other .htaccess files. Fixes: #6449 (for the config directory) Signed-off-by: Micha Felle <micha@dietpi.com>
| * | | | Harden data protection .htaccessMichaIng2019-08-191-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Set "Satisfy All" whenever available, as well on Apache 2.4+. This is required to override possible "Satisfy Any" on parent dir, which otherwise would allow direct access to data, regardless of "Require" directive. + Set "Deny from all" as well whenever available, to block access regardless of which access control directive takes priority. + Assume Apache 2.2 only, if mod_authz_core and mod_access_compat are both not available, to avoid doubled directives. In this case set "Deny from all" directive only if the providing mod_authz_host module is available. "Satisfy" is a core directive on Apache 2.2. + Update Apache version strings. Regarding the used directives/modules, Apache 2.4 and 2.5 behave the same. + Add ordering spaces to better reflect the nested directives and to match style of other .htaccess files. Fixes: https://github.com/nextcloud/server/issues/6449 Signed-off-by: Micha Felle <micha@dietpi.com>
* | | | | Fix Sidebar enabled check (#18449)John Molakvoæ2019-12-195-16/+24
|\ \ \ \ \ | | | | | | | | | | | | Fix Sidebar enabled check
| * | | | | Fix Sidebar enabled checkJohn Molakvoæ (skjnldsv)2019-12-195-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | Merge pull request #18470 from nextcloud/techdebt/app-code-checker-php7-onlyRoeland Jago Douma2019-12-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Only parse php7 code in app code checker
| * | | | | | Only parse php7 code in app code checkerChristoph Wurst2019-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | Merge pull request #18370 from nextcloud/version/18/beta3v18.0.0beta3Roeland Jago Douma2019-12-191-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | 18 beta 3
| * | | | | | | 18 beta 3Roeland Jago Douma2019-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | fix credentials saving success message notification color (#18469)John Molakvoæ2019-12-191-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix credentials saving success message notification color
| * | | | | | | | fix credentials saving success message notification colorSascha Wiswedel2019-12-181-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was red, now green Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
* | | | | | | | Wiswedel/inherited shares/design polishing (#18447)John Molakvoæ2019-12-194-10/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Wiswedel/inherited shares/design polishing
| * | | | | | | | removed inherited shares counterSascha Wiswedel2019-12-173-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | | | | | | clarifying share source folder link stringSascha Wiswedel2019-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
| * | | | | | | | Streamline "unshare" wordingSascha Wiswedel2019-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
| * | | | | | | | replace "invited by" with "added by"Sascha Wiswedel2019-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-12-1990-4/+504
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #18457 from nextcloud/fix/sharing/notifier/uidRoeland Jago Douma2019-12-181-7/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use the user from the notification
| * | | | | | | | Use the user from the notificationRoeland Jago Douma2019-12-181-7/+2
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Merge pull request #18462 from nextcloud/fix/18211/list-group-with-slashRoeland Jago Douma2019-12-183-8/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix listing users in groups with slash in the name
| * | | | | | | | Fix listing users in groups with slash in the nameGary Kim2019-12-183-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | | | | | | | Merge pull request #18461 from ↵blizzz2019-12-181-8/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/noid/ensure-entity-on-scope-extension Flows that are managing themselves do not necessarily set the entity
| * | | | | | | | | Flows that are managing themselves do not necessarily set the entityArthur Schiwon2019-12-181-8/+10
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for instance files_automatedtagging, which works on a lower level. Fixes a Call to a member function isLegitimatedForUserId() on null. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | | Merge pull request #18456 from nextcloud/fix/office/previewsRoeland Jago Douma2019-12-181-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix Office preview generation
| * | | | | | | | Fix Office preview generationRoeland Jago Douma2019-12-181-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / / / / / / [tx-robot] updated from transifexNextcloud bot2019-12-18228-784/+272
|/ / / / / / /
* | | | | | | Merge pull request #18448 from nextcloud/fix/noid/wrong-paths-for-fileidsRoeland Jago Douma2019-12-171-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | pass the proper storage-internal path
| * | | | | | | pass the proper storage-internal pathArthur Schiwon2019-12-171-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | Merge pull request #18446 from nextcloud/fix/personal-settings-fixRoeland Jago Douma2019-12-173-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Don't overwrite the settings from files
| * | | | | | Don't overwrite the settings from filesRoeland Jago Douma2019-12-173-3/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #18443 from nextcloud/fix/noid/update-xsdRoeland Jago Douma2019-12-172-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | update app info schema files
| * | | | | | update app info schema filesArthur Schiwon2019-12-172-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | Merge pull request #18429 from nextcloud/locale-fallbackRoeland Jago Douma2019-12-171-0/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | add a fallback locale for personal settings page
| * | | | | | add a fallback locale for personal settings pageRobin Appelman2019-12-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise if the locale is set to an invalid or no longer existing locale the rendering of the setting page will throw an exception Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #18422 from nextcloud/design/recommended-appsRoeland Jago Douma2019-12-173-18/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Design fixes for recommended apps