Commit Graph

23764 Commits

Author SHA1 Message Date
Roeland Jago Douma fbb719b29d
Merge pull request #25900 from nextcloud/backport/25860/stable20
[stable20] do not die after LDAP auth failed with expired acc
2021-03-03 08:35:16 +01:00
Nextcloud bot 25fbc9fdd6
[tx-robot] updated from transifex 2021-03-03 02:21:42 +00:00
Arthur Schiwon 4b9037e849 do not die after LDAP auth failed with expired acc
- some servers return error code 53

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-03-02 20:40:06 +00:00
Robin Appelman 59d157f1f2 disable trasbin during the moveFromStorage fallback
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-03-02 13:28:00 +00:00
Roeland Jago Douma 9fea75d7d7
Merge pull request #25858 from nextcloud/backport/25856/stable20
[stable20] Card::getOwner should return the actual value
2021-03-02 09:24:40 +01:00
Nextcloud bot 5c474ee142
[tx-robot] updated from transifex 2021-03-02 02:22:41 +00:00
Roeland Jago Douma 622a3b8c74 Card::getOwner should return the actual value
I guess we never call this at runtime or it would already ahve done boom
very loudly.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-03-01 17:30:33 +00:00
Roeland Jago Douma b94ef32ed8
Merge pull request #25740 from nextcloud/backport/25602/stable20
[stable20] Avoid creating two share links when password is enforced
2021-03-01 12:49:36 +01:00
Arthur Schiwon ce6d64b122 fix detecting cyclic group memberships
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-03-01 11:13:14 +00:00
Julius Härtl fc935f1bc8
Avoid creating two share links when password is enforced
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2021-03-01 10:05:20 +01:00
Nextcloud bot 1c7829ce53
[tx-robot] updated from transifex 2021-03-01 02:20:37 +00:00
Nextcloud bot ccd6063eea
[tx-robot] updated from transifex 2021-02-28 02:20:12 +00:00
Nextcloud bot 7f2985aecd
[tx-robot] updated from transifex 2021-02-27 02:22:40 +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 3454f39642
[tx-robot] updated from transifex 2021-02-20 02:37:41 +00:00
Nextcloud bot 17cc8c7579
[tx-robot] updated from transifex 2021-02-19 02:21:14 +00:00
Roeland Jago Douma cb0c2243ac
Merge pull request #25384 from nextcloud/backport/25218/stable20
[stable20] do not remove valid group shares
2021-02-18 20:13:58 +01:00
Roeland Jago Douma b986c9e4e5
Merge pull request #25132 from nextcloud/backport/24661/stable20
[stable20] dont offer to edit external config settings if we can't edit them
2021-02-18 19:41:49 +01:00
Robin Appelman e7805e5009
fix test
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-02-18 15:56:26 +01:00
Robin Appelman 590ef22935
Update apps/files_external/js/statusmanager.js
Co-authored-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-02-18 15:55:02 +01:00
Nextcloud bot ae63016e06
[tx-robot] updated from transifex 2021-02-18 02:22:14 +00:00
Arthur Schiwon a6414a7d05
take into account that UNIQUE index might not work as expected
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-02-17 15:59:50 +01:00
Joas Schilling dbae210a06
Merge pull request #25379 from nextcloud/backport/25101/stable20
[stable20] LDAP: make actually use of batch read known groups
2021-02-17 14:56:45 +01:00
Arthur Schiwon 02ae52bb5b
really use known groups
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-02-17 13:51:08 +01:00
Roeland Jago Douma 4be1dbe40e
Merge pull request #25651 from nextcloud/backport/25594/stable20
[stable20] Use ownerDisplayName for SharingEntry Tooltip
2021-02-17 10:38:18 +01:00
Arthur Schiwon bf61a439d8 do not remove valid group shares
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-02-17 08:51:37 +01:00
Nextcloud bot 39a6ab6b42
[tx-robot] updated from transifex 2021-02-17 02:21:26 +00:00
Nextcloud bot 4923eddaa6
[tx-robot] updated from transifex 2021-02-16 02:21:53 +00:00
Joas Schilling e537a4254a Fix app icon list in dark mode
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-02-15 19:39:58 +00:00
Dan VerWeire d3df65e86f Use ownerDisplayName for SharingEntry Tooltip
Some NC installations may use a LDAP UUID for the username. If that
is the case, then the tooltip for who a file/folder was shared by may say something
like `Shared with Steve McQueen (smqueen@yada.com) by FKDJ39-38D794JG-4398GJODF9H3G-4534`.

This commit changes the value showed for the owner to the full display name.

Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2021-02-15 15:54:31 +00:00
Nextcloud bot e83b8fbfae
[tx-robot] updated from transifex 2021-02-15 02:20:26 +00:00
Nextcloud bot 9fb792d1c1
[tx-robot] updated from transifex 2021-02-14 02:20:18 +00:00
Nextcloud bot 4799201c94
[tx-robot] updated from transifex 2021-02-13 02:20:46 +00:00
Roeland Jago Douma f6f6051b73
Merge pull request #25592 from nextcloud/backport/25582/stable20
[stable20] Do not send imip email to invalid recipients
2021-02-12 08:54:48 +01:00
Nextcloud bot 9b978a714d
[tx-robot] updated from transifex 2021-02-12 02:20:35 +00:00
Christoph Wurst d5407764d7 Do not send imip email to invalid recipients
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-02-11 19:03:14 +00:00
Nextcloud bot 799ba83095
[tx-robot] updated from transifex 2021-02-11 02:20:54 +00:00
Nextcloud bot 0c4de17482
[tx-robot] updated from transifex 2021-02-10 02:21:17 +00:00
Roeland Jago Douma c3fc3e739e
Merge pull request #25458 from nextcloud/backport/23588/stable20
[stable20] Override default dashboard background with theming one
2021-02-09 22:03:05 +01:00
Julien Veyssier 451cb39122 override default dashboard background with theming one
fix getAppValue default value in theming app
fix cacheBuster value injection

Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-02-09 21:26:07 +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
Nextcloud bot a6ebb5be79
[tx-robot] updated from transifex 2021-02-06 02:21:08 +00:00
Vincent Petry efe9ef223d
Merge pull request #25475 from nextcloud/backport/25443/stable20
[stable20] Make user list pagination more tolerant
2021-02-05 14:46:49 +01:00
Vincent Petry 1936895a42
Fix duplicate tag info view registration
Only register the tag info view once as it's stored in a singleton.
This fixes an issue where the tag info view did not get rendered after
swiching between different file views.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2021-02-05 11:09:01 +01:00
Vincent Petry ccaa593a44
Make user list pagination more tolerant
In case the server returns more results than expected by the limit, it
is now still interpreted as there being more results to query.

This situation can happen when there are multiple user backends in
place.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2021-02-05 11:08:36 +01:00
Roeland Jago Douma c781bebf64
Merge pull request #25480 from nextcloud/stable20-stray-asset-deletion
[stable20] Remove stray compiled assets
2021-02-05 11:01:52 +01:00
Nextcloud bot 6552f03d1f
[tx-robot] updated from transifex 2021-02-05 02:21:51 +00:00
Vincent Petry cbc06719c2
Remove stray assets
This was automatically deleted and not regenerated by:
make dev-setup && make build-js-production

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2021-02-04 11:50:32 +01:00
Nextcloud bot 333ff64b40
[tx-robot] updated from transifex 2021-02-04 02:20:21 +00:00
Nextcloud bot bb32ba0c07
[tx-robot] updated from transifex 2021-02-03 02:20:01 +00:00
Julius Härtl e70ad108f6
Merge pull request #25421 from nextcloud/backport/25383/stable20
[stable20] Properly handle SMB ACL blocking scanning a directory
2021-02-02 20:44:31 +01:00
Nextcloud bot 9bb3212433
[tx-robot] updated from transifex 2021-02-02 02:20:04 +00:00
Julius Härtl fcfa39183c Properly handle SMB ACL blocking scanning a directory
This makes sure that a possible ForbiddenException is properly passed
through the storage as a ForbiddenException and can be catched when
trying to fetch the quota info of a parent folder

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-02-01 11:13:44 +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
Nextcloud bot cde8b977a0
[tx-robot] updated from transifex 2021-01-29 02:21:27 +00:00
Julius Härtl e6fb478dbe
Merge pull request #25366 from nextcloud/backport/25361/stable20
[stable20] fix parameter provided as string not array
2021-01-28 22:12:36 +01:00
Julius Härtl 2c23dd4b51
Merge pull request #25352 from nextcloud/backport/25185/stable20
[stable20] Show the actual error on share requests
2021-01-28 22:05:25 +01:00
Arthur Schiwon 71a762b3a7 fix parameter provided as string not array
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-01-28 19:40:13 +00:00
Nextcloud bot d7f6a4800c
[tx-robot] updated from transifex 2021-01-28 02:24:21 +00:00
Julius Härtl a2476e19e6 Show the actual error on share requests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2021-01-27 19:00:45 +00:00
Nextcloud bot b527ffc4c9
[tx-robot] updated from transifex 2021-01-27 02:20:58 +00:00
Christoph Wurst 891fbe100e
Merge pull request #25324 from nextcloud/backport/25310/stable20
[stable20] [CalDAV] Validate notified emails
2021-01-26 10:48:21 +01:00
Nextcloud bot 7e2552f142
[tx-robot] updated from transifex 2021-01-26 02:21:43 +00:00
Thomas Citharel 9d0319446e [CalDAV] Validate notified emails
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2021-01-25 19:49:20 +00:00
Vincent Petry ead953addd Catch NotFoundException when querying quota
Fixes parent folder that becomes inaccessible when it contains a
non-existing / broken entry because the quota check made the PROPFIND
on parent fail altogether.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2021-01-25 12:32:18 +00:00
Nextcloud bot 16509c61a0
[tx-robot] updated from transifex 2021-01-25 02:20:41 +00:00
Nextcloud bot d602b047ca
[tx-robot] updated from transifex 2021-01-24 02:19:55 +00:00
Nextcloud bot 6cc8c337dc
[tx-robot] updated from transifex 2021-01-23 02:20:14 +00:00
Morris Jobke 653db23551
Merge pull request #25278 from nextcloud/backport/25274/stable20
[stable20] Do not obtain userFolder of a federated user
2021-01-22 16:18:47 +01:00
Morris Jobke f7d13f1613
Merge pull request #25276 from nextcloud/backport/25128/stable20
[stable20] extend ILDAPProvider to allow reading arbitrairy ldap attributes for users
2021-01-22 16:15:21 +01:00
Roeland Jago Douma b249abc624 Do not obtain userFolder of a federated user
Federated shares are somewhat special. So we can't move the files from
the main user and we should try to get it from the intialized root
already.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-01-22 13:40:25 +00:00
Roeland Jago Douma 1a1beafeeb
Merge pull request #25261 from nextcloud/backport/25255/stable20
[stable20] also use storage copy when dav copying directories
2021-01-22 14:37:01 +01: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
Morris Jobke 24a7772d6c
Merge pull request #25263 from nextcloud/backport/25253/stable20
[stable20] silence log message
2021-01-22 10:24:53 +01:00
Nextcloud bot f92289f5a7
[tx-robot] updated from transifex 2021-01-22 02:20:07 +00:00
Arthur Schiwon 9d8b597605 silence log message
- this appears too often (in some configurations) when qualifying group
members which do not meet the criteria

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-01-21 21:09:57 +00:00
Robin Appelman e0598117e1 also use storage copy when dav copying directories
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-01-21 21:08:58 +00:00
Nextcloud bot 5f5203a285
[tx-robot] updated from transifex 2021-01-21 02:20:47 +00:00
Joas Schilling fcdbd4eca3
Fix potential empty result
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-20 10:11:56 +01: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
Joas Schilling 0c7f0a7d89
Also fix the username when it changed
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-20 09:08:08 +01:00
Joas Schilling 8e3e1f9a32
Don't save credentials of another user
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-20 09:08:00 +01:00
Nextcloud bot 37f3195c6b
[tx-robot] updated from transifex 2021-01-20 02:21:05 +00:00
Nextcloud bot f94215a58e
[tx-robot] updated from transifex 2021-01-19 02:20:55 +00:00
Nextcloud bot 63a8349e1b
[tx-robot] updated from transifex 2021-01-18 02:19:40 +00:00
Nextcloud bot 6ef830a7d9
[tx-robot] updated from transifex 2021-01-17 02:20:08 +00:00
Nextcloud bot 996d6ce994
[tx-robot] updated from transifex 2021-01-16 02:20:15 +00:00
Nextcloud bot 7c8d3709d9
[tx-robot] updated from transifex 2021-01-15 02:20:37 +00:00
Robin Appelman 6404627d0c adjust tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-01-14 16:33:13 +00:00
Robin Appelman e0d85ed9a8 dont offer to edit external config settings if we can't edit them
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-01-14 16:33:13 +00:00
Arthur Schiwon 5dd7665f21
silence psalm false positive
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-01-14 13:04:02 +01:00
Arthur Schiwon b0ea654653
respect DB limits limit per statement and query
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-01-14 13:03:36 +01:00
Nextcloud bot 631f28eb74
[tx-robot] updated from transifex 2021-01-14 02:19:15 +00:00
Nextcloud bot 4ca0fb2282
[tx-robot] updated from transifex 2021-01-13 02:20:30 +00:00
Roeland Jago Douma e89d4a4f40
Merge pull request #25076 from nextcloud/backport/25016/stable20
[stable20] Add setup check to verify that the used DB version is still supported…
2021-01-12 11:50:52 +01:00
Morris Jobke 349c9ef74f
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>
2021-01-12 10:18:19 +01:00
Nextcloud bot 6a1d17312c
[tx-robot] updated from transifex 2021-01-12 02:20:00 +00:00
Morris Jobke 08f6444474
Merge pull request #25019 from nextcloud/backport/24999/stable20
[stable20] Set the user language when adding the footer
2021-01-11 10:24:17 +01:00
Morris Jobke 43ec70d43b
Merge pull request #25035 from nextcloud/backport/25017/stable20
[stable20] Fix clearing the label of a share
2021-01-11 10:02:21 +01:00
Nextcloud bot a156722ece
[tx-robot] updated from transifex 2021-01-11 02:20:05 +00:00
Nextcloud bot c7b9964b4a
[tx-robot] updated from transifex 2021-01-10 02:22:51 +00:00
Nextcloud bot df3ba2fde2
[tx-robot] updated from transifex 2021-01-09 02:21:47 +00:00
Daniel Calviño Sánchez b078f28029 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>
2021-01-08 17:30:17 +00:00
Julius Härtl 36388085f6
Set the user language when adding the footer
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-01-08 10:09:41 +01:00
Nextcloud bot 0e20ce014a
[tx-robot] updated from transifex 2021-01-08 02:22:41 +00:00
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