Morris Jobke
da150d49be
Merge pull request #24990 from nextcloud/backport/24986/stable20
...
[stable20] Update root.crl due to revocation of transmission.crt
2021-01-06 21:06:29 +01:00
Morris Jobke
9fb384cf7c
Update root.crl due to revocation of transmission.crt
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2021-01-06 19:44:38 +00:00
blizzz
cb610c9b31
Merge pull request #24760 from nextcloud/backport/24703/stable20
...
[stable20] enables the file name check also to match name of mountpoints
2021-01-06 09:54:44 +01:00
Nextcloud bot
bf0bbc0846
[tx-robot] updated from transifex
2021-01-06 02:20:12 +00:00
blizzz
25143fc87b
Merge pull request #24763 from nextcloud/backport/24515/stable20
...
[stable20] fixes sharing to group ids with characters that are being url encoded
2021-01-05 23:35:26 +01:00
Arthur Schiwon
f34202190c
fixes sharing to group ids /w chars that are being url encoded, carddav
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-01-05 18:54:15 +01:00
Arthur Schiwon
b4434833af
fix finding of groups with decodable chars in their id via DAV
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-01-05 18:54:15 +01:00
Arthur Schiwon
3ce013fa14
fixes sharing to group ids with characters that are being url encoded
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-01-05 18:54:15 +01:00
Julius Härtl
2f6b2b6fa4
Merge pull request #24878 from nextcloud/backport/stable20/23017
2021-01-05 15:14:21 +01:00
Julius Härtl
24053edf8a
Bump bundles
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-01-05 10:05:52 +01:00
Julius Härtl
61b574b130
Show unique displayname context in the user share list entries
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-01-05 10:05:52 +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
Julius Härtl
defdaf1e18
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>
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
13e5504dcc
[tx-robot] updated from transifex
2021-01-04 02:21:58 +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
d96555c413
Merge pull request #24854 from nextcloud/backport/24833/stable20
...
[stable20] Fix total upload size overwritten by next upload
2020-12-28 14:19:49 +01:00
Julius Härtl
530e637e35
Merge pull request #24853 from nextcloud/backport/24832/stable20
...
[stable20] Make oc_files_trash.auto_id a bigint
2020-12-28 12:40:20 +01:00
Roeland Jago Douma
fc327ee9de
Merge pull request #24728 from nextcloud/backport/24721/stable20
...
[stable20] Cancel user search requests to avoid duplicate results being added
2020-12-28 11:27:30 +01: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
Daniel Calviño Sánchez
d4b1ba7785
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 7c4c5fe6ae
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>
2020-12-28 10:21:13 +00:00
Roeland Jago Douma
afbc2d5cd3
Merge pull request #24826 from nextcloud/backport/24824/stable20
...
[stable20] Catch the error on heartbeat update
2020-12-28 10:47:29 +01:00
Vincent Petry
558cf72a28
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>
2020-12-28 09:46:02 +00:00
Nextcloud bot
fab7e85bbb
[tx-robot] updated from transifex
2020-12-28 02:19:20 +00:00
Nextcloud bot
3cb3125c4c
[tx-robot] updated from transifex
2020-12-27 02:24:54 +00:00
Nextcloud bot
421244e777
[tx-robot] updated from transifex
2020-12-26 02:19:59 +00:00
Nextcloud bot
1524e7b431
[tx-robot] updated from transifex
2020-12-24 02:20:20 +00:00
Roeland Jago Douma
72c5356a55
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>
2020-12-23 11:48:21 +00:00
Roeland Jago Douma
e97a0c1307
Merge pull request #24823 from nextcloud/backport/24730/stable20
...
[stable20] Fix IPv6 localhost regex
2020-12-23 09:33:42 +01:00
Nextcloud bot
f4a2a7302e
[tx-robot] updated from transifex
2020-12-23 02:20:21 +00:00
J0WI
d749f515de
Fix IPv6 localhost regex
...
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
2020-12-22 20:55:55 +00:00
John Molakvoæ
680e03c628
Merge pull request #24806 from nextcloud/backport/24604/stable20
...
[stable20] Allow to force rename a conflicting calendar
2020-12-22 10:59:08 +01: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
John Molakvoæ (skjnldsv)
4fa34362a3
Allow to force rename a conflicting calendar
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-12-22 07:35:23 +00: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
db22392fd0
Merge pull request #24792 from nextcloud/backport/23319/stable20
...
[stable20] Fix Argon2 descriptions
2020-12-21 13:32:55 +01: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
Roeland Jago Douma
2a91d7837b
Merge pull request #24791 from nextcloud/backport/24715/stable20
...
[stable20] Limit getIncomplete query to one row
2020-12-21 10:32:28 +01:00
MichaIng
d8ff570971
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>
2020-12-21 08:26:34 +00: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
98c22e2c77
[tx-robot] updated from transifex
2020-12-21 02:19:05 +00:00
Nextcloud bot
bfb8c07724
[tx-robot] updated from transifex
2020-12-20 02:19:39 +00:00