Robin Appelman
20ab946c3f
use returned file id for object store copy
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 16:18:01 +00:00
Robin Appelman
aaa4c071ed
add ICopyFromCache trait to expose existing implementation
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 16:18:01 +00:00
Robin Appelman
bdd7f28fa6
only use share cacheentry when available
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 15:22:23 +01:00
Robin Appelman
f500e2396e
adjust tests
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 15:22:23 +01:00
Robin Appelman
7fd53b91c3
fix search in nested jails
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 15:22:22 +01:00
Robin Appelman
a20eb9a229
fix cachjail searching for root
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 15:22:22 +01:00
Robin Appelman
5d08beb3d2
do cachejail search filtering in sql
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-16 15:22:22 +01:00
Robin Appelman
797645bc49
send share notification instead of erroring on duplicate share
...
when creating a share that already exists, instead of erroring, resend the notifications
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-15 14:13:05 +00:00
Roeland Jago Douma
ff64514bea
Allow overwriting isAuthenticated
...
* Some implementations might check for different things
* IT will not change how the current ones work
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-03-15 13:59:10 +00:00
Robin Appelman
5827a156af
apply object store copy optimization when 'cross storage' copy is within the same object store
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-12 16:16:32 +00:00
Nextcloud bot
60756e8e3e
[tx-robot] updated from transifex
2021-03-12 02:23:01 +00:00
Robin Appelman
a1935d0f74
cache baseurl in url generator
...
Servers don't tend to change their url in the middle of a request
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-10 19:38:41 +00:00
Nextcloud bot
2046e71da2
[tx-robot] updated from transifex
2021-03-08 02:23:30 +00:00
Nextcloud bot
14b9c26b8a
[tx-robot] updated from transifex
2021-03-07 02:22:25 +00:00
Nextcloud bot
f209e862c2
[tx-robot] updated from transifex
2021-03-06 02:22:41 +00:00
Robin Appelman
326f7ac857
catch notfound and forbidden exception in smb::getmetadata
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-05 07:54:09 +00:00
Nextcloud bot
b4d001db3a
[tx-robot] updated from transifex
2021-03-05 02:22:16 +00:00
Nextcloud bot
21ff951ca3
[tx-robot] updated from transifex
2021-03-04 02:22:30 +00:00
Roeland Jago Douma
ff5491bf69
Merge pull request #25873 from nextcloud/backport/25869/stable20
...
[stable20] Fix namespacing
2021-03-03 08:46:21 +01:00
Nextcloud bot
25fbc9fdd6
[tx-robot] updated from transifex
2021-03-03 02:21:42 +00:00
Anna Larch
4b9e638cca
Fix namespacing
...
Signed-off-by: Anna Larch <anna@nextcloud.com>
2021-03-02 10:10:29 +00:00
Nextcloud bot
5c474ee142
[tx-robot] updated from transifex
2021-03-02 02:22:41 +00:00
Nextcloud bot
ccd6063eea
[tx-robot] updated from transifex
2021-02-28 02:20:12 +00:00
Nextcloud bot
792d82b967
[tx-robot] updated from transifex
2021-02-26 02:22:05 +00:00
Nextcloud bot
1e4af96055
[tx-robot] updated from transifex
2021-02-25 02:21:40 +00:00
Nextcloud bot
147e2798d7
[tx-robot] updated from transifex
2021-02-24 02:22:24 +00:00
Nextcloud bot
a85fa7b6d3
[tx-robot] updated from transifex
2021-02-23 02:39:44 +00:00
Nextcloud bot
ea8e83a000
[tx-robot] updated from transifex
2021-02-21 02:40:17 +00:00
Nextcloud bot
17cc8c7579
[tx-robot] updated from transifex
2021-02-19 02:21:14 +00:00
Roeland Jago Douma
d9186a2f46
Merge pull request #25703 from nextcloud/backport/25700/stable20
...
[stable20] Initialize \OCP\AppFramework\Http\ZipResponse::$resources
2021-02-18 08:31:41 +01:00
Nextcloud bot
ae63016e06
[tx-robot] updated from transifex
2021-02-18 02:22:14 +00:00
Christoph Wurst
5b15e16706
Initialize \OCP\AppFramework\Http\ZipResponse::$resources
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-02-17 21:30:53 +00:00
Arthur Schiwon
9b3bff87a0
bump affected version
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-02-17 17:10:29 +01:00
Arthur Schiwon
c882bc68ba
compatibility to Nc 20
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-02-17 17:09:33 +01:00
Arthur Schiwon
ca7a7a5c85
add missing changes from backport source
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-02-17 15:59:50 +01:00
Arthur Schiwon
04496a71ca
show suggestion to clean up possible invalid shares later
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-02-17 15:59:50 +01:00
Arthur Schiwon
c2ba3ca0ed
add repair job for unencoded calendars
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-02-17 15:59:49 +01:00
Nextcloud bot
4799201c94
[tx-robot] updated from transifex
2021-02-13 02:20:46 +00:00
Nextcloud bot
9b978a714d
[tx-robot] updated from transifex
2021-02-12 02:20:35 +00:00
Nextcloud bot
0c4de17482
[tx-robot] updated from transifex
2021-02-10 02:21:17 +00:00
Robin Appelman
b51f32ec08
change reconect wrapper to only check connection after inactivity
...
instead of always checking every minute, only check the connection after a minute of inactivity.
this should better reflect how idle timeouts of sql servers work and remove most of the cases where this check was previously done.
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-02-09 16:30:59 +01:00
Nextcloud bot
b3ac30c4da
[tx-robot] updated from transifex
2021-02-09 02:21:02 +00:00
Nextcloud bot
783b519886
[tx-robot] updated from transifex
2021-02-08 02:20:22 +00:00
Nextcloud bot
83cb1897f3
[tx-robot] updated from transifex
2021-02-07 02:21:08 +00:00
Roeland Jago Douma
30230a436e
Merge pull request #25388 from nextcloud/backport/25302/stable20
...
[stable20] Use RFC-compliant URL encoding for cookies
2021-02-06 10:56:27 +01:00
Nextcloud bot
a6ebb5be79
[tx-robot] updated from transifex
2021-02-06 02:21:08 +00:00
Christoph Wurst
61278d2461
Log deprecation notice of GenericEventWrapper just once
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-02-05 10:17:16 +00:00
Nextcloud bot
6552f03d1f
[tx-robot] updated from transifex
2021-02-05 02:21:51 +00:00
Nextcloud bot
333ff64b40
[tx-robot] updated from transifex
2021-02-04 02:20:21 +00:00
Nextcloud bot
9bb3212433
[tx-robot] updated from transifex
2021-02-02 02:20:04 +00:00
Nextcloud bot
20cc5584f9
[tx-robot] updated from transifex
2021-02-01 02:19:48 +00:00
Nextcloud bot
a49a9a4945
[tx-robot] updated from transifex
2021-01-31 02:19:14 +00:00
Nextcloud bot
dcce572b55
[tx-robot] updated from transifex
2021-01-30 02:20:45 +00:00
Marco Ziech
52229154a5
Use RFC-compliant URL encoding for cookies
...
PHP 7.4.2 changed the way how cookies are decoded, applying RFC-compliant raw URL decoding. This leads to a conflict Nextcloud's own cookie encoding, breaking the remember-me function if the UID contains a space character.
Fixes #24438
Signed-off-by: Marco Ziech <marco@ziech.net>
2021-01-29 12:41:59 +00:00
Roeland Jago Douma
b745acdc14
The objectid is a string
...
This allows the query to use the index. Else it has to resort on
scanning all the rows.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-01-29 07:15:16 +00:00
Christoph Wurst
9010937535
Fix app fetcher php comparison to allow wider ranges
...
When app app specifies php 7.4 as upper limit we have to allow the
installation on php>7.4.0. The previous version check didn't do that.
This adjusts the regexes to discard any irrelevant suffix after the
three version numbers so that we can use more fine granular checks than
php's version_compare can do out of the box, like for php 7.4 we only
compare the major and minor version numbers and ignore the patch level.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-01-27 14:51:54 +00:00
Christoph Wurst
fbe893016f
Revert "Fix comparison of PHP versions"
...
This reverts commit bedd9acf78
.
2021-01-27 14:51:54 +00:00
Nextcloud bot
b527ffc4c9
[tx-robot] updated from transifex
2021-01-27 02:20:58 +00:00
Nextcloud bot
16509c61a0
[tx-robot] updated from transifex
2021-01-25 02:20:41 +00:00
blizzz
b6d175a609
adjust since
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Co-authored-by: Morris Jobke <hey@morrisjobke.de>
2021-01-22 13:33:33 +00:00
Robin Appelman
b38149edaa
extend ILDAPProvider to allow reading arbitrairy ldap attributes for users
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-01-22 13:33:32 +00:00
Nextcloud bot
f92289f5a7
[tx-robot] updated from transifex
2021-01-22 02:20:07 +00:00
Nextcloud bot
5f5203a285
[tx-robot] updated from transifex
2021-01-21 02:20:47 +00:00
Joas Schilling
85781d8d36
Compare and store the login name via the event
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-20 09:09:15 +01:00
Roeland Jago Douma
b04d566c89
Merge pull request #25193 from nextcloud/backport/25186/stable20
...
[stable20] Don't log keys on checkSignature
2021-01-19 09:34:49 +01:00
Nextcloud bot
f94215a58e
[tx-robot] updated from transifex
2021-01-19 02:20:55 +00:00
Joas Schilling
aa309afc59
Don't log keys on checkSignature
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-18 21:26:01 +00:00
Nextcloud bot
63a8349e1b
[tx-robot] updated from transifex
2021-01-18 02:19:40 +00:00
Roeland Jago Douma
71f57e0b5e
Merge pull request #25152 from nextcloud/backport/25138/stable20
...
[stable20] Fix comparison of PHP versions
2021-01-17 21:16:34 +01:00
Nextcloud bot
6ef830a7d9
[tx-robot] updated from transifex
2021-01-17 02:20:08 +00:00
Damien Goutte-Gattat
151abca91c
Fix comparison of PHP versions
...
Use the builtin function `version_compare` to check an app's
compatibility with the available PHP version, instead of reusing
the `OC\App\CompareVersion::isCompatible` method which is intended
to compare Nextcloud versions. PHP version strings do not always
necessarily follow the simple Major.Minor.Patch format used by
Nextcloud and therefore cannot be properly compared by that method.
Signed-off-by: Damien Goutte-Gattat <dgouttegattat@incenp.org>
2021-01-15 14:20:51 +00:00
Joas Schilling
b07ff57b2b
Add a hint about the direction of priority
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-15 08:49:19 +00:00
Morris Jobke
48eea6f74b
Merge pull request #25077 from nextcloud/backport/25034/stable20
...
[stable20] Make sure to do priority app upgrades first
2021-01-15 09:31:57 +01:00
Arthur Schiwon
26f77d879e
CI satisfaction
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-01-14 13:16:02 +01:00
Arthur Schiwon
b82efbdee5
DB: warn on parameter number constraints
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-01-14 13:03:54 +01:00
Nextcloud bot
4ca0fb2282
[tx-robot] updated from transifex
2021-01-13 02:20:30 +00:00
Nextcloud bot
6a1d17312c
[tx-robot] updated from transifex
2021-01-12 02:20:00 +00:00
Julius Härtl
f17033fa12
Make sure to do priority app upgrades first
...
Otherwise those apps might not be loaded when the others app migrations
are running. The previous loading of authentication apps in the upgrade
step never worked as it just returns in maintenance mode
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-01-11 13:46:47 +00:00
Nextcloud bot
a156722ece
[tx-robot] updated from transifex
2021-01-11 02:20:05 +00:00
Nextcloud bot
df3ba2fde2
[tx-robot] updated from transifex
2021-01-09 02:21:47 +00:00
Nextcloud bot
0e20ce014a
[tx-robot] updated from transifex
2021-01-08 02:22:41 +00:00
Roeland Jago Douma
cb958df63a
Catch throwable instead of exception
...
The error that gets thrown can also be a type error etc. So we should
properly catch the Throwable.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-01-07 14:25:15 +00:00
Morris Jobke
fb0067a777
Merge pull request #24592 from nextcloud/backport/23912/stable20
...
[stable20] use in objectstore copy
2021-01-07 13:28:10 +01:00
Roeland Jago Douma
0f395d8527
Merge pull request #24976 from nextcloud/backport/24961/stable20
...
[stable20] Fix unreliable ViewTest
2021-01-07 13:17:29 +01:00
Roeland Jago Douma
82fab4d621
Set the JSCombiner cache if needed
...
Found while debugging a customer setup. They had to flush their Redis.
Hence the info was no longer there. Since they also used S3 this meant
requesting the files over and over on template render. Which on S3 is
not cheap.
Now we just write it back if we can't get it from the cache in the first
place. So that the next run has it cached properly again.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-01-07 07:43:25 +00:00
Julius Härtl
8d9fa73371
Properly handle result when copying with failure and throw in tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-01-05 16:57:51 +01:00
Julius Härtl
3666754be7
Show unique displayname context in the sharing input
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-01-05 10:05:52 +01:00
Nextcloud bot
48865b30f5
[tx-robot] updated from transifex
2021-01-05 02:21:38 +00:00
Nextcloud bot
ddeb7446cb
[tx-robot] updated from transifex
2021-01-03 02:21:07 +00:00
Nextcloud bot
85d5a815fc
[tx-robot] updated from transifex
2021-01-01 02:21:13 +00:00
Nextcloud bot
0943120949
[tx-robot] updated from transifex
2020-12-31 02:27:13 +00:00
Roeland Jago Douma
f16746e902
Merge pull request #24876 from nextcloud/backport/24874/stable20
...
[stable20] Avoid huge exception argument logging
2020-12-30 10:51:01 +01:00
Nextcloud bot
f00e1e778a
[tx-robot] updated from transifex
2020-12-30 02:19:19 +00:00
Roeland Jago Douma
6762e616f5
Avoid huge exception argument logging
...
In some cases it might happen that you have an argument that deep down
somewhere has an array with a lot of entries (think thousands). Now
before we would just happily print them all. Which would fill the log.
Now it will just print the first 5. And add a line that there are N
more.
If you are on debug level we will still print them all.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-29 10:46:56 +00:00
Nextcloud bot
af77e89e67
[tx-robot] updated from transifex
2020-12-29 02:20:01 +00:00
Roeland Jago Douma
1935993e47
Merge pull request #24709 from nextcloud/backport/24683/stable20
...
[stable20] [Fix #24682 ]: ensure federation cloud id is retruned if FN property not found
2020-12-28 11:24:29 +01:00
J0WI
d749f515de
Fix IPv6 localhost regex
...
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
2020-12-22 20:55:55 +00:00
Roeland Jago Douma
d5f4ca6e74
Merge pull request #24798 from nextcloud/backport/24796/stable20
...
[stable20] Actually set the TTL on redis set
2020-12-22 09:10:47 +01:00
Nextcloud bot
1b19cc5bae
[tx-robot] updated from transifex
2020-12-22 02:19:17 +00:00
Guillaume Virlet
a8f60c82e4
[ Fix #24682 ]: ensure federation cloud id is retruned if FN property not found
...
Signed-off-by: Guillaume Virlet <github@virlet.org>
2020-12-21 22:59:43 +01:00
Roeland Jago Douma
34b8e42bf0
Actually set the TTL on redis set
...
Else well the keys remain for ever and ever.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-21 13:51:18 +00:00
Roeland Jago Douma
98c235a436
Merge pull request #24751 from nextcloud/backport/24737/stable20
...
[stable20] Also unset the other possible unused paramters
2020-12-21 11:43:49 +01:00
Daniel Kesselberg
d22ff8624b
Limit getIncomplete query to one row
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-12-21 08:17:46 +00:00
Nextcloud bot
bfb8c07724
[tx-robot] updated from transifex
2020-12-20 02:19:39 +00:00
Roeland Jago Douma
5de0c3c5f7
Also unset the other possible unused paramters
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-18 07:41:00 +00:00
Nextcloud bot
5ea6481355
[tx-robot] updated from transifex
2020-12-18 02:20:20 +00:00
Julius Härtl
55d7848384
Do not include non-required scripts on the upgrade page
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-15 20:42:07 +00:00
Roeland Jago Douma
9305a00414
Merge pull request #24546 from nextcloud/backport/24543/stable20
...
[stable20] Don't log params of imagecreatefromstring
2020-12-15 16:36:00 +01:00
Roeland Jago Douma
f0c2807cac
Merge pull request #24698 from nextcloud/backport/24416/stable20
...
[stable20] Check php compatibility of app store app releases
2020-12-15 09:15:17 +01:00
Nextcloud bot
2304f1ef10
[tx-robot] updated from transifex
2020-12-15 02:22:22 +00:00
Christoph Wurst
0ae5c8dd3b
Check php compatibility of app store app releases
...
Apps might increase the minimum php version requirement, in which case
an update could break the app or even the whole instance. We must not
install those releases, or better, don't even show them for
update/installation. This extends the app fetcher code to filter out the
releases that are not installable.
The filter respects minimum and maximum requirements. E.g. apps that are
still only released for php7.3 won't show up for php7.4 instances. This
behavior is new but if an app lists an explicit version requirement,
then we ought to repect that.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-14 17:22:10 +00:00
Julius Härtl
b84bdb1080
Make sure the migrations table schema is always checked
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Revert "Make sure the migrations table schema is always checked"
This reverts commit 258955ef738a52d9da2ac2fe59466e6093d7e9bc.
Set current vendor during upgrade and perform migrations table change if needed
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-14 11:12:52 +01:00
Julius Härtl
368dac3ba3
Properly migrate from new owncloud avatar location
...
as the files are not scanned we cannot use the OCP\Files api
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-14 11:12:52 +01:00
Julius Härtl
7c3d3c58d3
Dump autoloader
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-14 11:12:52 +01:00
Julius Härtl
7ce95a4fcb
Readd repair steps that are relevant when migrating from ownCloud
...
This reverts commit d9b1492e03
.
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-14 11:12:52 +01:00
Julius Härtl
ab40a7c585
Allow major/minor match for owncloud version
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-14 11:12:50 +01:00
Julius Härtl
934f8a17f9
Avoid checking for brute force protection capabilities when upgrading
...
This might happen a releases that doesn't have this table yet
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-14 11:12:50 +01:00
Julius Härtl
5d2988e3bd
Drop fk constraints on locks table
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-14 11:12:49 +01:00
Nextcloud bot
c676da759e
[tx-robot] updated from transifex
2020-12-12 02:18:57 +00:00
Nextcloud bot
4a51875a73
[tx-robot] updated from transifex
2020-12-10 02:20:27 +00:00
Nextcloud bot
c007cd01e9
[tx-robot] updated from transifex
2020-12-08 02:20:33 +00:00
Robin Appelman
694032c54c
use in objectstore copy
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-12-07 16:07:21 +00:00
Roeland Jago Douma
b9011c1d1d
Merge pull request #24563 from nextcloud/backport/24552/stable20
...
[stable20] Remember me is not an app_password
2020-12-07 11:52:17 +01:00
Nextcloud bot
b8e8bc5ddd
[tx-robot] updated from transifex
2020-12-07 02:20:52 +00:00
Nextcloud bot
80ef7e14da
[tx-robot] updated from transifex
2020-12-06 02:19:39 +00:00
Nextcloud bot
4a2abf3d49
[tx-robot] updated from transifex
2020-12-05 02:19:00 +00:00
Morris Jobke
607e902070
Fix typo
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-04 15:56:29 +00:00
Roeland Jago Douma
e6947bd6ca
Remember me is not an app_password
...
While technically they are stored the same. This session variable is
used to indicate that a user is using an app password to authenticate.
Like from a client. Or when having it generated automatically.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-04 15:56:24 +00:00
Roeland Jago Douma
233d4164a6
Merge pull request #24553 from nextcloud/backport/24550/stable20
...
[stable20] Generate a new session id if the decrypting the session data fails
2020-12-04 16:09:52 +01:00
Morris Jobke
b1e9752169
Revert "Do not read certificate bundle from data dir by default"
...
This reverts commit 18b0d753f2
.
2020-12-04 13:37:10 +01:00
Roeland Jago Douma
f52337e8be
Generate a new session id if the decrypting the session data fails
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-04 11:55:31 +00:00
Vincent Petry
d4d009fc8e
Don't log params of imagecreatefromstring
...
To prevent flooding the log with actual image data.
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-04 09:45:29 +00:00
Nextcloud bot
a53871f629
[tx-robot] updated from transifex
2020-12-04 02:19:34 +00:00
Roeland Jago Douma
ce953d1571
Merge pull request #24532 from nextcloud/backport/24409/stable20
...
[stable20] Also run repair steps when encryption is disabled but a legacy key is present
2020-12-03 12:22:41 +01:00
Morris Jobke
1a041f7ac7
Merge pull request #24530 from nextcloud/fix/stable20-nextcloud-log-normalizer
...
[stable20] Replace abandoned log normalizer with our fork
2020-12-03 11:14:46 +01:00
Julius Härtl
14d95cb2e3
Also handle legacy cipher support when encryption is disabled but an old master key is present
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-03 09:56:59 +00:00
Christoph Wurst
67e5af58ed
Replace abandoned log normalizer with our fork
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-03 09:50:10 +01:00
Roeland Jago Douma
428f0ec151
Fix vsprint parameter
...
%2\$; is not valid. On php7 this is just ignored but on php8 it gives an
error. %2\$s; works.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-03 08:20:04 +00:00
Nextcloud bot
6093d1bcc1
[tx-robot] updated from transifex
2020-12-03 02:20:01 +00:00
Roeland Jago Douma
bdbb60a67b
Merge pull request #24509 from nextcloud/backport/23257/stable20
...
[stable20] Fix file size computation on 32bit platforms
2020-12-02 20:03:24 +01:00
Morris Jobke
a8780debd3
Add notification for user limit
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 17:24:44 +00:00
Morris Jobke
d2fd49c461
Allow subscription to indicate that a userlimit is reached
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 17:24:42 +00:00
aler9
dc7eb53a8f
Fix file size computation on 32bit platforms
...
Signed-off-by: aler9 <46489434+aler9@users.noreply.github.com>
2020-12-02 15:27:30 +00:00
Roeland Jago Douma
3fb850940f
Set frame-ancestors to none if none are filled
...
frame-ancestors doesn't fall back to default-src. So when we apply a
very restricted CSP we should make sure to set it to 'none' and not
leave it empty.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-01 22:23:13 +01:00
Morris Jobke
86da5013c8
Merge pull request #24325 from nextcloud/backport/24103/stable20
...
[stable20] Only check path for being accessible when the storage is a object home
2020-12-01 11:04:22 +01:00
Nextcloud bot
965614f3e2
[tx-robot] updated from transifex
2020-12-01 02:19:56 +00:00
Roeland Jago Douma
2003995e32
Merge pull request #24353 from nextcloud/backport/24162/stable20
...
[stable20] set the display name of federated sharees from addressbook
2020-11-25 16:18:23 +01:00
Arthur Schiwon
4e6f0df777
send expected format of cloud id
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-25 14:16:08 +01:00
Arthur Schiwon
c9814c716a
set the display name of federated sharees from addressbook
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-24 22:52:31 +01:00
Christoph Wurst
4b9d8c75ec
Fix the config key on the sharing expire checkbox
...
We don't use `shareapi_internal_enforce_expire_date` anywhere.
`shareapi_enforce_internal_expire_date` is the one we want.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-24 14:54:02 +00:00