Commit Graph

23551 Commits

Author SHA1 Message Date
Morris Jobke 8295cc90d8
Merge pull request #24590 from nextcloud/backport/24358/stable20
[stable20] use storage copy implementation when doing dav copy
2021-01-07 14:08:17 +01:00
Roeland Jago Douma 7db2278ef9
Merge pull request #24716 from nextcloud/backport/24402/stable20
[stable20] LDAP: fix inGroup for memberUid type of group memberships
2021-01-07 13:17:59 +01:00
Vincent Petry 9c7d733c01
Also add missing oc_share_external.share_type column
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2021-01-07 09:39:10 +01:00
Vincent Petry 9c54467c94
Adjust share_external table
Add column "parent" if missing.
Drop column "lastscan" if exists.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2021-01-07 09:38:59 +01:00
Roeland Jago Douma 9e6cc31f60
Merge pull request #24972 from nextcloud/backport/24964/stable20
[stable20] Don't throw a 500 when importing a broken ics reminder file
2021-01-07 09:08:11 +01:00
Nextcloud bot 2f1c118d3b
[tx-robot] updated from transifex 2021-01-07 02:21:21 +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
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
Joas Schilling 088418fd91 Don't throw a 500 when importing a broken ics reminder file
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-05 11:59:40 +00: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
Nextcloud bot f00e1e778a
[tx-robot] updated from transifex 2020-12-30 02:19:19 +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
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
Nextcloud bot f4a2a7302e
[tx-robot] updated from transifex 2020-12-23 02:20:21 +00: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
Nextcloud bot bfb8c07724
[tx-robot] updated from transifex 2020-12-20 02:19:39 +00:00
Nextcloud bot b47bbce075
[tx-robot] updated from transifex 2020-12-19 02:19:47 +00:00
Arthur Schiwon b432a9f5da consider local external storages, too
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-12-18 10:48:46 +00:00
Arthur Schiwon c0c88e3bd8 enables the file name check also to match name of mountpoints
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-12-18 10:48:42 +00:00
Nextcloud bot 5ea6481355
[tx-robot] updated from transifex 2020-12-18 02:20:20 +00:00
Nextcloud bot 8363530294
[tx-robot] updated from transifex 2020-12-17 02:20:29 +00:00
Julius Härtl 979331baae Bump bundles
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-12-16 13:16:04 +00:00
Julius Härtl 824b10956f Only let the infinite handler fetch more results if the limit is hit
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-16 12:59:40 +00:00
Julius Härtl d2e63cd31a Cancel user search requests to avoid duplicate results being added
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-16 12:59:38 +00:00
Nextcloud bot 257e3dd50b
[tx-robot] updated from transifex 2020-12-16 02:20:51 +00:00
Arthur Schiwon 270eb6c593 php-cs happyness
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-12-15 21:37:58 +00:00
Arthur Schiwon 43c6bc134e add unit tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-12-15 21:37:56 +00:00
Arthur Schiwon cca1fb792b check number of members after potential resolving of rdns
- the type check is not necessary anymore for the return type of
  _groupMembers()

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-12-15 21:37:54 +00:00