]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
3 years agoMerge pull request #25120 from nextcloud/backport/25036/stable20
blizzz [Thu, 14 Jan 2021 20:40:54 +0000 (21:40 +0100)]
Merge pull request #25120 from nextcloud/backport/25036/stable20

[stable20] respect DB restrictions on number of arguments in statements and queries

3 years agoCI satisfaction 25120/head
Arthur Schiwon [Thu, 14 Jan 2021 12:16:02 +0000 (13:16 +0100)]
CI satisfaction

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agosilence psalm false positive
Arthur Schiwon [Wed, 13 Jan 2021 10:54:29 +0000 (11:54 +0100)]
silence psalm false positive

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agoDB: warn on parameter number constraints
Arthur Schiwon [Fri, 8 Jan 2021 11:46:10 +0000 (12:46 +0100)]
DB: warn on parameter number constraints

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agorespect DB limits limit per statement and query
Arthur Schiwon [Fri, 8 Jan 2021 10:54:07 +0000 (11:54 +0100)]
respect DB limits limit per statement and query

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agoMerge pull request #25102 from nextcloud/version/20.0.5/final v20.0.5
Roeland Jago Douma [Thu, 14 Jan 2021 09:22:39 +0000 (10:22 +0100)]
Merge pull request #25102 from nextcloud/version/20.0.5/final

20.0.5

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 14 Jan 2021 02:19:15 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 13 Jan 2021 02:20:30 +0000 (02:20 +0000)]
[tx-robot] updated from transifex

3 years ago20.0.5 25102/head
Roeland Jago Douma [Tue, 12 Jan 2021 22:01:01 +0000 (23:01 +0100)]
20.0.5

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
3 years agoMerge pull request #25064 from nextcloud/version/20.0.5/rc2 v20.0.5RC2
Roeland Jago Douma [Tue, 12 Jan 2021 10:51:22 +0000 (11:51 +0100)]
Merge pull request #25064 from nextcloud/version/20.0.5/rc2

20.0.5 RC2

3 years agoMerge pull request #25076 from nextcloud/backport/25016/stable20
Roeland Jago Douma [Tue, 12 Jan 2021 10:50:52 +0000 (11:50 +0100)]
Merge pull request #25076 from nextcloud/backport/25016/stable20

[stable20] Add setup check to verify that the used DB version is still supported…

3 years agoAdd setup check to verify that the used DB version is still supported in the next... 25076/head
Morris Jobke [Thu, 7 Jan 2021 15:26:51 +0000 (16:26 +0100)]
Add setup check to verify that the used DB version is still supported in the next major release

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
3 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 12 Jan 2021 02:20:00 +0000 (02:20 +0000)]
[tx-robot] updated from transifex

3 years agoMerge pull request #25074 from nextcloud/backport/25069/stable20
Morris Jobke [Mon, 11 Jan 2021 13:26:14 +0000 (14:26 +0100)]
Merge pull request #25074 from nextcloud/backport/25069/stable20

[stable20] Don't remove assignable column for now

3 years agoDon't remove assignable column for now 25074/head
Vincent Petry [Mon, 11 Jan 2021 10:58:14 +0000 (11:58 +0100)]
Don't remove assignable column for now

It causes side effects.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
3 years agoMerge pull request #25066 from nextcloud/psalm/noid/update-psalm-baseline
Roeland Jago Douma [Mon, 11 Jan 2021 09:46:08 +0000 (10:46 +0100)]
Merge pull request #25066 from nextcloud/psalm/noid/update-psalm-baseline

[stable20] Update psalm-baseline.xml

3 years agoMerge pull request #25019 from nextcloud/backport/24999/stable20
Morris Jobke [Mon, 11 Jan 2021 09:24:17 +0000 (10:24 +0100)]
Merge pull request #25019 from nextcloud/backport/24999/stable20

[stable20] Set the user language when adding the footer

3 years ago[stable20] Update psalm-baseline.xml 25066/head
Morris Jobke [Mon, 11 Jan 2021 09:18:58 +0000 (10:18 +0100)]
[stable20] Update psalm-baseline.xml

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
3 years agoMerge pull request #25035 from nextcloud/backport/25017/stable20
Morris Jobke [Mon, 11 Jan 2021 09:02:21 +0000 (10:02 +0100)]
Merge pull request #25035 from nextcloud/backport/25017/stable20

[stable20] Fix clearing the label of a share

3 years ago20.0.5 RC2 25064/head
Roeland Jago Douma [Mon, 11 Jan 2021 08:41:58 +0000 (09:41 +0100)]
20.0.5 RC2

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
3 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 11 Jan 2021 02:20:05 +0000 (02:20 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 10 Jan 2021 02:22:51 +0000 (02:22 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 9 Jan 2021 02:21:47 +0000 (02:21 +0000)]
[tx-robot] updated from transifex

3 years agoFix clearing the label of a share 25035/head
Daniel Calviño Sánchez [Thu, 7 Jan 2021 17:10:11 +0000 (18:10 +0100)]
Fix clearing the label of a share

When the label is being edited its value is stored in "newLabel", and
the original label is shown only if "newLabel" is not set. However, as
it was checked against any falsy value instead of only undefined when
the label was cleared and thus it has an empty value the original label
was shown instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
3 years agoMerge pull request #25030 from nextcloud/backport/25029/stable20
Roeland Jago Douma [Fri, 8 Jan 2021 11:17:42 +0000 (12:17 +0100)]
Merge pull request #25030 from nextcloud/backport/25029/stable20

[stable20] Change defaultapp in config.sample.php to dashboard to improve docs and align it to source code

3 years agoChange defaultapp to dashboard 25030/head
rakekniven [Fri, 8 Jan 2021 08:49:12 +0000 (09:49 +0100)]
Change defaultapp to dashboard

Result of discussion at https://help.nextcloud.com/t/enable-dashboard-on-per-user-basis/94872

Code reference:
https://github.com/nextcloud/server/blob/db86bea18ce41ad73e9c1a06f2b2d89d8d4f2ef8/lib/private/legacy/OC_Util.php#L1106

Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
3 years agoSet the user language when adding the footer 25019/head
Julius Härtl [Thu, 7 Jan 2021 09:41:09 +0000 (10:41 +0100)]
Set the user language when adding the footer

Signed-off-by: Julius Härtl <jus@bitgrid.net>
3 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 8 Jan 2021 02:22:41 +0000 (02:22 +0000)]
[tx-robot] updated from transifex

3 years agoMerge pull request #24960 from nextcloud/version/20.0.5/rc1 v20.0.5RC1
Roeland Jago Douma [Thu, 7 Jan 2021 19:43:19 +0000 (20:43 +0100)]
Merge pull request #24960 from nextcloud/version/20.0.5/rc1

20.0.5 RC1

3 years agoMerge pull request #25009 from nextcloud/backport/25001/stable20
Roeland Jago Douma [Thu, 7 Jan 2021 18:46:56 +0000 (19:46 +0100)]
Merge pull request #25009 from nextcloud/backport/25001/stable20

[stable20] Fix column name to check prior to deleting

3 years agoMerge pull request #25013 from nextcloud/backport/25011/stable20
blizzz [Thu, 7 Jan 2021 17:14:22 +0000 (18:14 +0100)]
Merge pull request #25013 from nextcloud/backport/25011/stable20

[stable20] Catch throwable instead of exception

3 years agoCatch throwable instead of exception 25013/head
Roeland Jago Douma [Thu, 7 Jan 2021 13:32:26 +0000 (14:32 +0100)]
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>
3 years agoMerge pull request #24590 from nextcloud/backport/24358/stable20
Morris Jobke [Thu, 7 Jan 2021 13:08:17 +0000 (14:08 +0100)]
Merge pull request #24590 from nextcloud/backport/24358/stable20

[stable20] use storage copy implementation when doing dav copy

3 years agoFix column name to check prior to deleting 25009/head
Joas Schilling [Thu, 7 Jan 2021 09:50:36 +0000 (10:50 +0100)]
Fix column name to check prior to deleting

Signed-off-by: Joas Schilling <coding@schilljs.com>
3 years agoMerge pull request #24592 from nextcloud/backport/23912/stable20
Morris Jobke [Thu, 7 Jan 2021 12:28:10 +0000 (13:28 +0100)]
Merge pull request #24592 from nextcloud/backport/23912/stable20

[stable20] use in objectstore copy

3 years agoMerge pull request #24716 from nextcloud/backport/24402/stable20
Roeland Jago Douma [Thu, 7 Jan 2021 12:17:59 +0000 (13:17 +0100)]
Merge pull request #24716 from nextcloud/backport/24402/stable20

[stable20] LDAP: fix inGroup for memberUid type of group memberships

3 years agoMerge pull request #24976 from nextcloud/backport/24961/stable20
Roeland Jago Douma [Thu, 7 Jan 2021 12:17:29 +0000 (13:17 +0100)]
Merge pull request #24976 from nextcloud/backport/24961/stable20

[stable20] Fix unreliable ViewTest

3 years agoMerge pull request #24963 from nextcloud/backport/24829/stable20
Roeland Jago Douma [Thu, 7 Jan 2021 12:16:56 +0000 (13:16 +0100)]
Merge pull request #24963 from nextcloud/backport/24829/stable20

[stable20] Add migration for oc_share_external columns

3 years agoMerge pull request #24997 from nextcloud/backport/24988/stable20
Roeland Jago Douma [Thu, 7 Jan 2021 08:56:06 +0000 (09:56 +0100)]
Merge pull request #24997 from nextcloud/backport/24988/stable20

[stable20] Set the JSCombiner cache if needed

3 years agoAlso add missing oc_share_external.share_type column 24963/head
Vincent Petry [Wed, 23 Dec 2020 15:17:29 +0000 (16:17 +0100)]
Also add missing oc_share_external.share_type column

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
3 years agoAdjust share_external table
Vincent Petry [Wed, 23 Dec 2020 13:41:02 +0000 (14:41 +0100)]
Adjust share_external table

Add column "parent" if missing.
Drop column "lastscan" if exists.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
3 years agoMerge pull request #24972 from nextcloud/backport/24964/stable20
Roeland Jago Douma [Thu, 7 Jan 2021 08:08:11 +0000 (09:08 +0100)]
Merge pull request #24972 from nextcloud/backport/24964/stable20

[stable20] Don't throw a 500 when importing a broken ics reminder file

3 years agoSet the JSCombiner cache if needed 24997/head
Roeland Jago Douma [Wed, 6 Jan 2021 15:15:17 +0000 (16:15 +0100)]
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>
3 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 7 Jan 2021 02:21:21 +0000 (02:21 +0000)]
[tx-robot] updated from transifex

3 years agoMerge pull request #24990 from nextcloud/backport/24986/stable20
Morris Jobke [Wed, 6 Jan 2021 20:06:29 +0000 (21:06 +0100)]
Merge pull request #24990 from nextcloud/backport/24986/stable20

[stable20] Update root.crl due to revocation of transmission.crt

3 years agoUpdate root.crl due to revocation of transmission.crt 24990/head
Morris Jobke [Wed, 6 Jan 2021 12:30:02 +0000 (13:30 +0100)]
Update root.crl due to revocation of transmission.crt

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
3 years agoMerge pull request #24760 from nextcloud/backport/24703/stable20
blizzz [Wed, 6 Jan 2021 08:54:44 +0000 (09:54 +0100)]
Merge pull request #24760 from nextcloud/backport/24703/stable20

[stable20] enables the file name check also to match name of mountpoints

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 6 Jan 2021 02:20:12 +0000 (02:20 +0000)]
[tx-robot] updated from transifex

3 years agoMerge pull request #24763 from nextcloud/backport/24515/stable20
blizzz [Tue, 5 Jan 2021 22:35:26 +0000 (23:35 +0100)]
Merge pull request #24763 from nextcloud/backport/24515/stable20

[stable20] fixes sharing to group ids with characters that are being url encoded

3 years agofixes sharing to group ids /w chars that are being url encoded, carddav 24763/head
Arthur Schiwon [Wed, 16 Dec 2020 21:42:57 +0000 (22:42 +0100)]
fixes sharing to group ids /w chars that are being url encoded, carddav

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agofix finding of groups with decodable chars in their id via DAV
Arthur Schiwon [Thu, 3 Dec 2020 11:35:51 +0000 (12:35 +0100)]
fix finding of groups with decodable chars in their id via DAV

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agofixes sharing to group ids with characters that are being url encoded
Arthur Schiwon [Wed, 2 Dec 2020 19:00:46 +0000 (20:00 +0100)]
fixes sharing to group ids with characters that are being url encoded

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agoProperly handle result when copying with failure and throw in tests 24976/head
Julius Härtl [Tue, 5 Jan 2021 08:12:11 +0000 (09:12 +0100)]
Properly handle result when copying with failure and throw in tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
3 years agoFix writeStream mocking
Julius Härtl [Tue, 5 Jan 2021 07:53:21 +0000 (08:53 +0100)]
Fix writeStream mocking

Signed-off-by: Julius Härtl <jus@bitgrid.net>
3 years agoMerge pull request #24878 from nextcloud/backport/stable20/23017
Julius Härtl [Tue, 5 Jan 2021 14:14:21 +0000 (15:14 +0100)]
Merge pull request #24878 from nextcloud/backport/stable20/23017

3 years agoDon't throw a 500 when importing a broken ics reminder file 24972/head
Joas Schilling [Tue, 5 Jan 2021 09:08:14 +0000 (10:08 +0100)]
Don't throw a 500 when importing a broken ics reminder file

Signed-off-by: Joas Schilling <coding@schilljs.com>
3 years agoBump bundles 24878/head
Julius Härtl [Tue, 29 Dec 2020 13:32:09 +0000 (14:32 +0100)]
Bump bundles

Signed-off-by: Julius Härtl <jus@bitgrid.net>
3 years agoShow unique displayname context in the user share list entries
Julius Härtl [Wed, 7 Oct 2020 10:32:16 +0000 (12:32 +0200)]
Show unique displayname context in the user share list entries

Signed-off-by: Julius Härtl <jus@bitgrid.net>
3 years agoShow unique displayname context in the sharing input
Julius Härtl [Wed, 7 Oct 2020 10:31:30 +0000 (12:31 +0200)]
Show unique displayname context in the sharing input

Signed-off-by: Julius Härtl <jus@bitgrid.net>
3 years agoMake share results distinguishable if there are more than one with the exact same...
Julius Härtl [Wed, 23 Sep 2020 10:39:53 +0000 (12:39 +0200)]
Make share results distinguishable if there are more than one with the exact same display name

Signed-off-by: Julius Härtl <jus@bitgrid.net>
3 years ago20.0.5 RC1 24960/head
Roeland Jago Douma [Tue, 5 Jan 2021 08:20:14 +0000 (09:20 +0100)]
20.0.5 RC1

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
3 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 5 Jan 2021 02:21:38 +0000 (02:21 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 4 Jan 2021 02:21:58 +0000 (02:21 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 3 Jan 2021 02:21:07 +0000 (02:21 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 1 Jan 2021 02:21:13 +0000 (02:21 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 31 Dec 2020 02:27:13 +0000 (02:27 +0000)]
[tx-robot] updated from transifex

3 years agoMerge pull request #24876 from nextcloud/backport/24874/stable20
Roeland Jago Douma [Wed, 30 Dec 2020 09:51:01 +0000 (10:51 +0100)]
Merge pull request #24876 from nextcloud/backport/24874/stable20

[stable20] Avoid huge exception argument logging

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 30 Dec 2020 02:19:19 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

3 years agoAvoid huge exception argument logging 24876/head
Roeland Jago Douma [Tue, 29 Dec 2020 09:50:53 +0000 (10:50 +0100)]
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>
3 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 29 Dec 2020 02:20:01 +0000 (02:20 +0000)]
[tx-robot] updated from transifex

3 years agoMerge pull request #24854 from nextcloud/backport/24833/stable20
Roeland Jago Douma [Mon, 28 Dec 2020 13:19:49 +0000 (14:19 +0100)]
Merge pull request #24854 from nextcloud/backport/24833/stable20

[stable20] Fix total upload size overwritten by next upload

3 years agoMerge pull request #24853 from nextcloud/backport/24832/stable20
Julius Härtl [Mon, 28 Dec 2020 11:40:20 +0000 (12:40 +0100)]
Merge pull request #24853 from nextcloud/backport/24832/stable20

[stable20] Make oc_files_trash.auto_id a bigint

3 years agoMerge pull request #24728 from nextcloud/backport/24721/stable20
Roeland Jago Douma [Mon, 28 Dec 2020 10:27:30 +0000 (11:27 +0100)]
Merge pull request #24728 from nextcloud/backport/24721/stable20

[stable20] Cancel user search requests to avoid duplicate results being added

3 years agoMerge pull request #24709 from nextcloud/backport/24683/stable20
Roeland Jago Douma [Mon, 28 Dec 2020 10:24:29 +0000 (11:24 +0100)]
Merge pull request #24709 from nextcloud/backport/24683/stable20

[stable20] [Fix #24682]: ensure federation cloud id is retruned if FN property not found

3 years agoFix total upload size overwritten by next upload 24854/head
Daniel Calviño Sánchez [Wed, 23 Dec 2020 17:53:01 +0000 (18:53 +0100)]
Fix total upload size overwritten by next upload

The upload progress is based on the "totalToUpload" variable. However,
as the variable is set when an upload is submitted, if another upload is
submitted before the previous one finished the upload progress only took
into account the size of the new upload (although the upload itself
worked fine; the files of the new submitted upload are added to the
active one). Now "totalToUpload" is either increased or set depending on
whether an upload is active or not.

Note that although "data.total" holds the total size of the files being
uploaded "totalToUpload" needs to be used in "fileuploadprogressall"
instead; "totalToUpload" is calculated when the upload is submitted, but
since 7c4c5fe6ae91 the actual upload of the files, and thus updating the
value of "data.total", may be deferred until the parent folders were
created.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
3 years agoMerge pull request #24826 from nextcloud/backport/24824/stable20
Roeland Jago Douma [Mon, 28 Dec 2020 09:47:29 +0000 (10:47 +0100)]
Merge pull request #24826 from nextcloud/backport/24824/stable20

[stable20] Catch the error on heartbeat update

3 years agoMake oc_files_trash.auto_id a bigint 24853/head
Vincent Petry [Wed, 23 Dec 2020 16:50:50 +0000 (17:50 +0100)]
Make oc_files_trash.auto_id a bigint

Adjusted migration.
Added to occ command to update existing tables.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
3 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 28 Dec 2020 02:19:20 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 27 Dec 2020 02:24:54 +0000 (02:24 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 26 Dec 2020 02:19:59 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 24 Dec 2020 02:20:20 +0000 (02:20 +0000)]
[tx-robot] updated from transifex

3 years agoCatch the error on heartbeat update 24826/head
Roeland Jago Douma [Wed, 23 Dec 2020 09:35:03 +0000 (10:35 +0100)]
Catch the error on heartbeat update

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
3 years agoMerge pull request #24823 from nextcloud/backport/24730/stable20
Roeland Jago Douma [Wed, 23 Dec 2020 08:33:42 +0000 (09:33 +0100)]
Merge pull request #24823 from nextcloud/backport/24730/stable20

[stable20] Fix IPv6 localhost regex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 23 Dec 2020 02:20:21 +0000 (02:20 +0000)]
[tx-robot] updated from transifex

3 years agoFix IPv6 localhost regex 24823/head
J0WI [Wed, 16 Dec 2020 13:37:56 +0000 (14:37 +0100)]
Fix IPv6 localhost regex

Signed-off-by: J0WI <J0WI@users.noreply.github.com>
3 years agoMerge pull request #24806 from nextcloud/backport/24604/stable20
John Molakvoæ [Tue, 22 Dec 2020 09:59:08 +0000 (10:59 +0100)]
Merge pull request #24806 from nextcloud/backport/24604/stable20

[stable20] Allow to force rename a conflicting calendar

3 years agoMerge pull request #24798 from nextcloud/backport/24796/stable20
Roeland Jago Douma [Tue, 22 Dec 2020 08:10:47 +0000 (09:10 +0100)]
Merge pull request #24798 from nextcloud/backport/24796/stable20

[stable20] Actually set the TTL on redis set

3 years agoAllow to force rename a conflicting calendar 24806/head
John Molakvoæ (skjnldsv) [Tue, 8 Dec 2020 09:22:46 +0000 (10:22 +0100)]
Allow to force rename a conflicting calendar

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
3 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 22 Dec 2020 02:19:17 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

3 years ago[Fix #24682]: ensure federation cloud id is retruned if FN property not found 24709/head
Guillaume Virlet [Sun, 13 Dec 2020 12:12:23 +0000 (13:12 +0100)]
[Fix #24682]: ensure federation cloud id is retruned if FN property not found

Signed-off-by: Guillaume Virlet <github@virlet.org>
3 years agoActually set the TTL on redis set 24798/head
Roeland Jago Douma [Mon, 21 Dec 2020 12:07:20 +0000 (13:07 +0100)]
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>
3 years agoMerge pull request #24792 from nextcloud/backport/23319/stable20
Roeland Jago Douma [Mon, 21 Dec 2020 12:32:55 +0000 (13:32 +0100)]
Merge pull request #24792 from nextcloud/backport/23319/stable20

[stable20] Fix Argon2 descriptions

3 years agoMerge pull request #24751 from nextcloud/backport/24737/stable20
Roeland Jago Douma [Mon, 21 Dec 2020 10:43:49 +0000 (11:43 +0100)]
Merge pull request #24751 from nextcloud/backport/24737/stable20

[stable20] Also unset the other possible unused paramters

3 years agoMerge pull request #24791 from nextcloud/backport/24715/stable20
Roeland Jago Douma [Mon, 21 Dec 2020 09:32:28 +0000 (10:32 +0100)]
Merge pull request #24791 from nextcloud/backport/24715/stable20

[stable20] Limit getIncomplete query to one row

3 years agoFix Argon2 descriptions 24792/head
MichaIng [Fri, 9 Oct 2020 18:18:32 +0000 (20:18 +0200)]
Fix Argon2 descriptions

The threads option for the password_hash function does not define the maximum allowed number of CPU threads to be used by the hashing algorithm but the exact number of threads that is used.

Similarly the memory_cost option for the password_hash function does not define the maximum allowed memory to be used by the hashing algorithm, but the exact amount of memory that is used by the hashing table. The minimum value is 8 KiB per thread.

The time_cost option for the password_hash function does not define the allowed time in seconds, but the number of iterations for the hash function.

If the minimum values are understood, the minimum values are used instead.

Signed-off-by: MichaIng <micha@dietpi.com>
3 years agoLimit getIncomplete query to one row 24791/head
Daniel Kesselberg [Tue, 15 Dec 2020 20:42:26 +0000 (21:42 +0100)]
Limit getIncomplete query to one row

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

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 20 Dec 2020 02:19:39 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 19 Dec 2020 02:19:47 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

3 years agoconsider local external storages, too 24760/head
Arthur Schiwon [Tue, 15 Dec 2020 10:50:04 +0000 (11:50 +0100)]
consider local external storages, too

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>