]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
3 years agoA valid user session is required for circles. 24446/head
Daniel Kesselberg [Fri, 23 Oct 2020 19:18:02 +0000 (21:18 +0200)]
A valid user session is required for circles.

The circles app depends on a valid userId. A public shared calender might be viewed by guests without a user session. For such requests the principal is null.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
3 years agoUpdate phpdoc for circleToPrincipal
Daniel Kesselberg [Fri, 23 Oct 2020 19:12:15 +0000 (21:12 +0200)]
Update phpdoc for circleToPrincipal

as the QueryException is already catched inside circleToPrincipal.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
3 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 30 Nov 2020 02:19:54 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 29 Nov 2020 02:19:21 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 28 Nov 2020 02:18:33 +0000 (02:18 +0000)]
[tx-robot] updated from transifex

3 years agoMerge pull request #24387 from nextcloud/backport/24382/stable20
Christoph Wurst [Fri, 27 Nov 2020 08:44:45 +0000 (09:44 +0100)]
Merge pull request #24387 from nextcloud/backport/24382/stable20

[stable20] Properly encode path when fetching inherited shares

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 27 Nov 2020 02:18:26 +0000 (02:18 +0000)]
[tx-robot] updated from transifex

3 years agoMerge pull request #24391 from nextcloud/backport/24375/stable20
blizzz [Thu, 26 Nov 2020 21:13:43 +0000 (22:13 +0100)]
Merge pull request #24391 from nextcloud/backport/24375/stable20

[stable20] formatting remote sharer should take protocol, path into account

4 years agoCompile assets 24391/head
npmbuildbot-nextcloud[bot] [Thu, 26 Nov 2020 14:11:40 +0000 (14:11 +0000)]
Compile assets

Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
4 years agoMerge pull request #24333 from nextcloud/backport/24315/stable20
Joas Schilling [Thu, 26 Nov 2020 13:50:27 +0000 (14:50 +0100)]
Merge pull request #24333 from nextcloud/backport/24315/stable20

[stable20] avoid empty null default with value that will be inserted anyways

4 years agoformatting remote sharer should take protocol, path into account
Arthur Schiwon [Wed, 25 Nov 2020 15:36:30 +0000 (16:36 +0100)]
formatting remote sharer should take protocol, path into  account

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
4 years agoProperly encode path when fetching inherited shares 24387/head
Julius Härtl [Thu, 26 Nov 2020 08:22:12 +0000 (09:22 +0100)]
Properly encode path when fetching inherited shares

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 26 Nov 2020 02:18:57 +0000 (02:18 +0000)]
[tx-robot] updated from transifex

4 years agoMerge pull request #24377 from nextcloud/backport/24374/stable20
blizzz [Wed, 25 Nov 2020 19:38:29 +0000 (20:38 +0100)]
Merge pull request #24377 from nextcloud/backport/24374/stable20

[stable20] Use proper bundles for files client and fileinfo

4 years agoFiles client and info bundles are always loaded so we don't need to load them again 24377/head
Julius Härtl [Wed, 25 Nov 2020 14:05:04 +0000 (15:05 +0100)]
Files client and info bundles are always loaded so we don't need to load them again

Signed-off-by: Julius Härtl <jus@bitgrid.net>
4 years agoMerge pull request #24353 from nextcloud/backport/24162/stable20
Roeland Jago Douma [Wed, 25 Nov 2020 15:18:23 +0000 (16:18 +0100)]
Merge pull request #24353 from nextcloud/backport/24162/stable20

[stable20] set the display name of federated sharees from addressbook

4 years agoMerge pull request #24367 from nextcloud/backport/24363/stable20
Roeland Jago Douma [Wed, 25 Nov 2020 15:17:34 +0000 (16:17 +0100)]
Merge pull request #24367 from nextcloud/backport/24363/stable20

[stable20] Catch storage not available in versions expire command

4 years agosend expected format of cloud id 24353/head
Arthur Schiwon [Tue, 24 Nov 2020 22:14:43 +0000 (23:14 +0100)]
send expected format of cloud id

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
4 years agoCatch storage not available in versions expire command 24367/head
Christoph Wurst [Wed, 25 Nov 2020 08:28:38 +0000 (09:28 +0100)]
Catch storage not available in versions expire command

External storage with session credentials is not accessible without a
user session, hence background jobs and CLI commands can't work with
them. The previously unhandled exception causes logged errors in the
nextcloud log. This patch catches the specific exception and logs it as
warnings. So for a production instance the error won't spam their logs
for this non-recoverable and technically unsolvable error if the minimum
log level is set to the default of 3 (error).

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 25 Nov 2020 02:19:04 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

4 years agoset the display name of federated sharees from addressbook
Arthur Schiwon [Mon, 16 Nov 2020 16:56:44 +0000 (17:56 +0100)]
set the display name of federated sharees from addressbook

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
4 years agoMerge pull request #24346 from nextcloud/backport/24341/stable20
John Molakvoæ [Tue, 24 Nov 2020 17:38:46 +0000 (18:38 +0100)]
Merge pull request #24346 from nextcloud/backport/24341/stable20

[stable20] Fix the config key on the sharing expire checkbox

4 years agoMerge pull request #24342 from nextcloud/backport/24331/stable20
John Molakvoæ [Tue, 24 Nov 2020 17:37:23 +0000 (18:37 +0100)]
Merge pull request #24342 from nextcloud/backport/24331/stable20

[stable20] Fix contacts menu position and show uid as a tooltip

4 years agoFix contacts menu position and show uid as a tooltip 24342/head
Julius Härtl [Tue, 29 Sep 2020 11:32:18 +0000 (13:32 +0200)]
Fix contacts menu position and show uid as a tooltip

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
4 years agoFix the config key on the sharing expire checkbox 24346/head
Christoph Wurst [Tue, 24 Nov 2020 13:17:41 +0000 (14:17 +0100)]
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>
4 years agoavoid empty null default with value that will be inserted anyways 24333/head
Arthur Schiwon [Mon, 23 Nov 2020 20:17:37 +0000 (21:17 +0100)]
avoid empty null default with value that will be inserted anyways

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 24 Nov 2020 02:19:05 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

4 years agoMerge pull request #24297 from nextcloud/backport/stable20/23023
Morris Jobke [Mon, 23 Nov 2020 20:06:33 +0000 (21:06 +0100)]
Merge pull request #24297 from nextcloud/backport/stable20/23023

 [stable20] Delete files that exceed trashbin size immediately

4 years agoMerge pull request #24311 from nextcloud/fix/stable20-sabre-parse-xml-errors
Christoph Wurst [Mon, 23 Nov 2020 13:40:34 +0000 (14:40 +0100)]
Merge pull request #24311 from nextcloud/fix/stable20-sabre-parse-xml-errors

[stable20] Update sabre/xml to fix XML parsing errors

4 years agoUpdate sabre/xml to fix XML parsing errors 24311/head
Christoph Wurst [Mon, 23 Nov 2020 13:00:19 +0000 (14:00 +0100)]
Update sabre/xml to fix XML parsing errors

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
4 years agoDelete files that exceed trashbin size immediately 24297/head
Julius Härtl [Wed, 23 Sep 2020 14:38:24 +0000 (16:38 +0200)]
Delete files that exceed trashbin size immediately

Signed-off-by: Julius Härtl <jus@bitgrid.net>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 23 Nov 2020 02:18:57 +0000 (02:18 +0000)]
[tx-robot] updated from transifex

4 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 22 Nov 2020 02:18:39 +0000 (02:18 +0000)]
[tx-robot] updated from transifex

4 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 21 Nov 2020 02:19:27 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

4 years agoMerge pull request #24249 from nextcloud/backport/24241/stable20
Morris Jobke [Fri, 20 Nov 2020 21:42:17 +0000 (22:42 +0100)]
Merge pull request #24249 from nextcloud/backport/24241/stable20

[stable20] Harden EncryptionLegacyCipher a bit

4 years agoMerge pull request #24263 from nextcloud/backport/24108/stable20
Morris Jobke [Fri, 20 Nov 2020 21:41:51 +0000 (22:41 +0100)]
Merge pull request #24263 from nextcloud/backport/24108/stable20

[stable20] Use correct year for generated birthdays events

4 years agoUse correct year for generated birthdays events 24263/head
Sven Strickroth [Fri, 13 Nov 2020 14:57:12 +0000 (15:57 +0100)]
Use correct year for generated birthdays events

'X-APPLE-OMIT-YEAR' is not always present, at least iOS 12.4 uses the hard coded date of 1604 (the start of the gregorian calendar) when the year is unknown.

cf. https://forums.bitfire.at/topic/2050/bday-without-year-for-vcard-3-0-if-server-drops-property-x-apple-omit-year and https://gitlab.com/CardBook/CardBook/-/issues/586

Signed-off-by: Sven Strickroth <email@cs-ware.de>
4 years agoMerge pull request #24258 from nextcloud/backport/24242/stable20
Morris Jobke [Fri, 20 Nov 2020 20:31:17 +0000 (21:31 +0100)]
Merge pull request #24258 from nextcloud/backport/24242/stable20

[stable20] Update ScanLegacyFormat.php

4 years agoMerge pull request #24259 from nextcloud/backport/24257/stable20
Morris Jobke [Fri, 20 Nov 2020 20:29:15 +0000 (21:29 +0100)]
Merge pull request #24259 from nextcloud/backport/24257/stable20

[stable20] Simple typo in comments

4 years agoSimple typo in comments 24259/head
Carlos Ferreira [Fri, 20 Nov 2020 19:01:28 +0000 (20:01 +0100)]
Simple typo in comments

4 years agoUpdate ScanLegacyFormat.php 24258/head
essys [Fri, 20 Nov 2020 09:16:35 +0000 (10:16 +0100)]
Update ScanLegacyFormat.php

Fixed a small typo on line 99.

4 years agoMerge pull request #24230 from nextcloud/backport/24007/stable20
Morris Jobke [Fri, 20 Nov 2020 13:27:27 +0000 (14:27 +0100)]
Merge pull request #24230 from nextcloud/backport/24007/stable20

[stable20] allow selecting multiple columns with SELECT DISTINCT

4 years agoMerge pull request #24228 from nextcloud/backport/24135/stable20
Morris Jobke [Fri, 20 Nov 2020 13:23:00 +0000 (14:23 +0100)]
Merge pull request #24228 from nextcloud/backport/24135/stable20

[stable20] Fix nextcloud logo in email notifications misalignment

4 years agoHarden EncryptionLegacyCipher a bit 24249/head
Roeland Jago Douma [Fri, 20 Nov 2020 08:46:31 +0000 (09:46 +0100)]
Harden EncryptionLegacyCipher a bit

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
4 years agoMerge pull request #24239 from nextcloud/backport/24203/stable20
Roeland Jago Douma [Fri, 20 Nov 2020 09:15:04 +0000 (10:15 +0100)]
Merge pull request #24239 from nextcloud/backport/24203/stable20

[stable20] Use regex when searching on single file shares

4 years agoMerge pull request #24231 from nextcloud/backport/23757/stable20
Roeland Jago Douma [Fri, 20 Nov 2020 09:04:54 +0000 (10:04 +0100)]
Merge pull request #24231 from nextcloud/backport/23757/stable20

[stable20] use file name instead of path in 'not allowed to share' message

4 years agoMerge pull request #24232 from nextcloud/backport/24211/stable20
Roeland Jago Douma [Fri, 20 Nov 2020 09:04:30 +0000 (10:04 +0100)]
Merge pull request #24232 from nextcloud/backport/24211/stable20

[stable20] Fix setting images through occ for theming

4 years agoLimit shared cache search if it is just a file 24239/head
Roeland Jago Douma [Thu, 19 Nov 2020 08:14:29 +0000 (09:14 +0100)]
Limit shared cache search if it is just a file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 20 Nov 2020 02:20:19 +0000 (02:20 +0000)]
[tx-robot] updated from transifex

4 years agoFix setting images through occ for theming 24232/head
Julius Härtl [Thu, 19 Nov 2020 07:28:48 +0000 (08:28 +0100)]
Fix setting images through occ for theming

Signed-off-by: Julius Härtl <jus@bitgrid.net>
4 years agouse file name instead of path in 'not allowed to share' message 24231/head
Robin Appelman [Wed, 28 Oct 2020 15:00:49 +0000 (16:00 +0100)]
use file name instead of path in 'not allowed to share' message

Signed-off-by: Robin Appelman <robin@icewind.nl>
4 years agoallow selecting multiple columns with SELECT DISTINCT 24230/head
Robin Appelman [Mon, 9 Nov 2020 16:43:29 +0000 (17:43 +0100)]
allow selecting multiple columns with SELECT DISTINCT

Signed-off-by: Robin Appelman <robin@icewind.nl>
4 years agoFix #23357 24228/head
medcloud [Sat, 14 Nov 2020 15:19:44 +0000 (16:19 +0100)]
Fix #23357

Signed-off-by: medcloud <42641918+medcloud@users.noreply.github.com>
4 years agoMerge pull request #24181 from nextcloud/backport/24102/stable20
Roeland Jago Douma [Thu, 19 Nov 2020 09:40:11 +0000 (10:40 +0100)]
Merge pull request #24181 from nextcloud/backport/24102/stable20

[stable20] Check quota of subdirectories when uploading to them

4 years agoMerge pull request #24196 from nextcloud/backport/24098/stable20
Roeland Jago Douma [Thu, 19 Nov 2020 09:09:45 +0000 (10:09 +0100)]
Merge pull request #24196 from nextcloud/backport/24098/stable20

[stable20] circleId too short in some request

4 years agoMerge pull request #24212 from nextcloud/backport/24207/stable20
Roeland Jago Douma [Thu, 19 Nov 2020 08:50:32 +0000 (09:50 +0100)]
Merge pull request #24212 from nextcloud/backport/24207/stable20

[stable20] missing level in ScopedPsrLogger

4 years agomissing level 24212/head
Maxence Lange [Wed, 18 Nov 2020 19:30:07 +0000 (18:30 -0100)]
missing level

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 19 Nov 2020 02:20:21 +0000 (02:20 +0000)]
[tx-robot] updated from transifex

4 years agoMerge pull request #24172 from nextcloud/version/20.0.2/final v20.0.2
Roeland Jago Douma [Wed, 18 Nov 2020 19:35:11 +0000 (20:35 +0100)]
Merge pull request #24172 from nextcloud/version/20.0.2/final

20.0.2

4 years agocircleId too short in some request 24196/head
Maxence Lange [Fri, 13 Nov 2020 09:58:54 +0000 (08:58 -0100)]
circleId too short in some request

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 18 Nov 2020 02:18:47 +0000 (02:18 +0000)]
[tx-robot] updated from transifex

4 years agoMerge pull request #24183 from nextcloud/revert-24178-backport/24098/stable20
Roeland Jago Douma [Tue, 17 Nov 2020 20:53:22 +0000 (21:53 +0100)]
Merge pull request #24183 from nextcloud/revert-24178-backport/24098/stable20

Revert "[stable20] circleId too short in some request"

4 years agoBump bundles 24181/head
Julius Härtl [Tue, 17 Nov 2020 18:47:56 +0000 (19:47 +0100)]
Bump bundles

Signed-off-by: Julius Härtl <jus@bitgrid.net>
4 years agoCheck for target folder available quota when uploading
Julius Härtl [Fri, 13 Nov 2020 11:46:12 +0000 (12:46 +0100)]
Check for target folder available quota when uploading

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
4 years agoFetch quota with files propfind
Julius Härtl [Fri, 16 Oct 2020 12:22:47 +0000 (14:22 +0200)]
Fetch quota with files propfind

Signed-off-by: Julius Härtl <jus@bitgrid.net>
4 years agoRevert "[stable20] circleId too short in some request" 24183/head
Christoph Wurst [Tue, 17 Nov 2020 13:20:02 +0000 (14:20 +0100)]
Revert "[stable20] circleId too short in some request"

4 years agoMerge pull request #24178 from nextcloud/backport/24098/stable20
Christoph Wurst [Tue, 17 Nov 2020 12:31:57 +0000 (13:31 +0100)]
Merge pull request #24178 from nextcloud/backport/24098/stable20

[stable20] circleId too short in some request

4 years agocircleId too short in some request 24178/head
Maxence Lange [Fri, 13 Nov 2020 09:58:54 +0000 (08:58 -0100)]
circleId too short in some request

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
4 years ago20.0.2 24172/head
Roeland Jago Douma [Tue, 17 Nov 2020 08:38:45 +0000 (09:38 +0100)]
20.0.2

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 17 Nov 2020 02:18:36 +0000 (02:18 +0000)]
[tx-robot] updated from transifex

4 years agoMerge pull request #24091 from nextcloud/version/20.0.2/rc2 v20.0.2RC2
Roeland Jago Douma [Mon, 16 Nov 2020 19:55:05 +0000 (20:55 +0100)]
Merge pull request #24091 from nextcloud/version/20.0.2/rc2

20.0.2 RC2

4 years agoMerge pull request #24159 from nextcloud/backport/24069/stable20
Daniel Calviño Sánchez [Mon, 16 Nov 2020 16:46:37 +0000 (17:46 +0100)]
Merge pull request #24159 from nextcloud/backport/24069/stable20

[stable20] Fix default internal expiration date

4 years agoAdd integration tests for creating shares with default expiration dates 24159/head
Daniel Calviño Sánchez [Thu, 12 Nov 2020 10:52:53 +0000 (11:52 +0100)]
Add integration tests for creating shares with default expiration dates

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoReset app configs by deleting the values instead of setting the defaults
Daniel Calviño Sánchez [Thu, 12 Nov 2020 10:51:37 +0000 (11:51 +0100)]
Reset app configs by deleting the values instead of setting the defaults

This avoids the need to keep the default values in the integration tests
in sync with the code, and also makes possible to reset values with
"dynamic" defaults (defaults that depend on other values).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoAdd unit tests for "validateExpirationDateInternal"
Daniel Calviño Sánchez [Thu, 12 Nov 2020 10:50:16 +0000 (11:50 +0100)]
Add unit tests for "validateExpirationDateInternal"

They were copied and adjusted as needed from the tests for
"validateExpirationDate".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoFix default internal expiration date
Daniel Calviño Sánchez [Thu, 12 Nov 2020 10:49:40 +0000 (11:49 +0100)]
Fix default internal expiration date

The default expiration date for internal shares was set from the default
link expiration date instead of the internal one.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoAdd explicit time to test date for clarity
Daniel Calviño Sánchez [Thu, 12 Nov 2020 07:43:03 +0000 (08:43 +0100)]
Add explicit time to test date for clarity

This shows in a clearer way that the expected expiration date is the
original one, but without time.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoAdd unit test for expiration date with date and with default
Daniel Calviño Sánchez [Thu, 12 Nov 2020 08:35:34 +0000 (09:35 +0100)]
Add unit test for expiration date with date and with default

This adds back what was being actually tested in the unit test fixed in
the previous commit.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoFix unit test for expiration date without date but with default
Daniel Calviño Sánchez [Thu, 12 Nov 2020 08:34:58 +0000 (09:34 +0100)]
Fix unit test for expiration date without date but with default

The expiration date was explicitly given, so it was not testing what it
should. Moreover, "link_defaultExpDays" needs to be mapped when testing
the default value (even if it will just fallback to the value of
"shareapi_expire_after_n_days").

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoFix unit test method name
Daniel Calviño Sánchez [Thu, 12 Nov 2020 07:46:37 +0000 (08:46 +0100)]
Fix unit test method name

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoFix unit test for verifying enforced valid expiration date.
Daniel Calviño Sánchez [Thu, 12 Nov 2020 07:25:36 +0000 (08:25 +0100)]
Fix unit test for verifying enforced valid expiration date.

The enforced expiration date was not actually enabled, as for that
"shareapi_default_expire_date" needs to be explicitly set to "yes".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoFix unit test for verifying enforced expire date too far in the future
Daniel Calviño Sánchez [Wed, 11 Nov 2020 19:50:23 +0000 (20:50 +0100)]
Fix unit test for verifying enforced expire date too far in the future

The test should fail if no exception was thrown, and no exception was
thrown due to a missing configuration parameter. However, the use of
"addToAssertionCount(1)" made the test pass even if no exception was
thrown and, therefore, to silently fail.

Now the missing configuration parameter was added and the test will fail
if the expected exception is not thrown.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoAdd unit tests to enforce a relaxed default share expiration date
Daniel Calviño Sánchez [Wed, 11 Nov 2020 18:36:04 +0000 (19:36 +0100)]
Add unit tests to enforce a relaxed default share expiration date

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoRemove wrong and misleading comment
Daniel Calviño Sánchez [Wed, 11 Nov 2020 19:27:01 +0000 (20:27 +0100)]
Remove wrong and misleading comment

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoRemove extra spaces
Daniel Calviño Sánchez [Thu, 12 Nov 2020 08:38:20 +0000 (09:38 +0100)]
Remove extra spaces

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoFix typo in variable name
Daniel Calviño Sánchez [Wed, 11 Nov 2020 18:55:20 +0000 (19:55 +0100)]
Fix typo in variable name

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoFix typos in method names
Daniel Calviño Sánchez [Wed, 11 Nov 2020 18:34:26 +0000 (19:34 +0100)]
Fix typos in method names

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoMerge pull request #24156 from nextcloud/backport/24112/stable20
Roeland Jago Douma [Mon, 16 Nov 2020 13:14:43 +0000 (14:14 +0100)]
Merge pull request #24156 from nextcloud/backport/24112/stable20

[stable20] Set up FS before querying storage info in settings

4 years agoMerge pull request #24153 from nextcloud/dependencies/dompurify
John Molakvoæ [Mon, 16 Nov 2020 12:12:40 +0000 (13:12 +0100)]
Merge pull request #24153 from nextcloud/dependencies/dompurify

4 years agoMerge pull request #24147 from nextcloud/backport/24146/stable20
Roeland Jago Douma [Mon, 16 Nov 2020 11:08:56 +0000 (12:08 +0100)]
Merge pull request #24147 from nextcloud/backport/24146/stable20

[stable20] Don't throw on SHOW VERSION query

4 years agoSet up FS before querying storage info in settings 24156/head
Vincent Petry [Fri, 13 Nov 2020 15:52:08 +0000 (16:52 +0100)]
Set up FS before querying storage info in settings

The personal info section of the personal settings is querying the
storage quota information. For this it requires the FS to be setup which
is not always guaranteed.

This fixes an issue where refreshing the settings page would cause it to
fail after Redis caches are full. It is likely that when Redis cache is
populated, some code path is initializing the FS, so it works so far.
But when the cache is populated, that code path is skipped so the FS is
not guaranteed to be setup...

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
4 years agoBump bundles 24153/head
Julius Härtl [Mon, 16 Nov 2020 10:36:35 +0000 (11:36 +0100)]
Bump bundles

Signed-off-by: Julius Härtl <jus@bitgrid.net>
4 years agoBump dompurify to 2.2.2
Julius Härtl [Mon, 16 Nov 2020 10:27:52 +0000 (11:27 +0100)]
Bump dompurify to 2.2.2

Signed-off-by: Julius Härtl <jus@bitgrid.net>
4 years agoMerge pull request #24079 from nextcloud/backport/24053/stable20
Joas Schilling [Mon, 16 Nov 2020 10:23:17 +0000 (11:23 +0100)]
Merge pull request #24079 from nextcloud/backport/24053/stable20

[stable20] Make is_user_defined nullable so we can store false on oracle

4 years agoMerge pull request #24114 from nextcloud/backport/24096/stable20
John Molakvoæ [Mon, 16 Nov 2020 09:15:18 +0000 (10:15 +0100)]
Merge pull request #24114 from nextcloud/backport/24096/stable20

[stable20] Convert the card resource to a string if necessary

4 years agoDon't throw on SHOW VERSION query 24147/head
Joas Schilling [Mon, 16 Nov 2020 07:43:48 +0000 (08:43 +0100)]
Don't throw on SHOW VERSION query

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoBump versions 24079/head
Joas Schilling [Mon, 16 Nov 2020 07:54:30 +0000 (08:54 +0100)]
Bump versions

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoMerge pull request #24106 from nextcloud/backport/24085/stable20
Joas Schilling [Mon, 16 Nov 2020 07:50:01 +0000 (08:50 +0100)]
Merge pull request #24106 from nextcloud/backport/24085/stable20

[stable20] Register new command db:add-missing-primary-keys

4 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 16 Nov 2020 02:19:33 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

4 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 15 Nov 2020 02:19:11 +0000 (02:19 +0000)]
[tx-robot] updated from transifex