Commit Graph

56073 Commits

Author SHA1 Message Date
Morris Jobke 568d46a3a5
[stable20] Update psalm-baseline.xml
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2021-01-11 10:18:58 +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
Roeland Jago Douma f71f9a32ec
20.0.5 RC2
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-01-11 09:41:58 +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
Roeland Jago Douma f66d88c85a
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
2021-01-08 12:17:42 +01:00
rakekniven a4e6c44581 Change defaultapp to dashboard
Result of discussion at https://help.nextcloud.com/t/enable-dashboard-on-per-user-basis/94872

Code reference:
db86bea18c/lib/private/legacy/OC_Util.php (L1106)

Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
2021-01-08 09:10:24 +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
Roeland Jago Douma 6d5f5bfa61
Merge pull request #24960 from nextcloud/version/20.0.5/rc1
20.0.5 RC1
2021-01-07 20:43:19 +01:00
Roeland Jago Douma 102a6fedd0
Merge pull request #25009 from nextcloud/backport/25001/stable20
[stable20] Fix column name to check prior to deleting
2021-01-07 19:46:56 +01:00
blizzz b2cfd43b8f
Merge pull request #25013 from nextcloud/backport/25011/stable20
[stable20] Catch throwable instead of exception
2021-01-07 18:14:22 +01:00
Roeland Jago Douma cb958df63a 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>
2021-01-07 14:25:15 +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
Joas Schilling 1142b17cda Fix column name to check prior to deleting
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-07 12:33:01 +00:00
Morris Jobke fb0067a777
Merge pull request #24592 from nextcloud/backport/23912/stable20
[stable20] use in objectstore copy
2021-01-07 13:28:10 +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
Roeland Jago Douma 0f395d8527
Merge pull request #24976 from nextcloud/backport/24961/stable20
[stable20] Fix unreliable ViewTest
2021-01-07 13:17:29 +01:00
Roeland Jago Douma 2dbf407f7e
Merge pull request #24963 from nextcloud/backport/24829/stable20
[stable20] Add migration for oc_share_external columns
2021-01-07 13:16:56 +01:00
Roeland Jago Douma 2fa3f24d04
Merge pull request #24997 from nextcloud/backport/24988/stable20
[stable20] Set the JSCombiner cache if needed
2021-01-07 09:56:06 +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
Roeland Jago Douma 82fab4d621 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>
2021-01-07 07:43:25 +00:00
Nextcloud bot 2f1c118d3b
[tx-robot] updated from transifex 2021-01-07 02:21:21 +00:00
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 8d9fa73371
Properly handle result when copying with failure and throw in tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-01-05 16:57:51 +01:00
Julius Härtl 865e4ab0ec Fix writeStream mocking
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-01-05 14:51:40 +00:00
Julius Härtl 2f6b2b6fa4
Merge pull request #24878 from nextcloud/backport/stable20/23017 2021-01-05 15:14:21 +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
Roeland Jago Douma f96e680fdf
20.0.5 RC1
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-01-05 09:20:14 +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