Commit Graph

56174 Commits

Author SHA1 Message Date
Morris Jobke d2fd49c461 Allow subscription to indicate that a userlimit is reached
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 17:24:42 +00:00
Greta 02427cd76f
Merge pull request #24491 from nextcloud/backport/24376/stable20
[stable20] fix loading mtime of new file in conflict dialog in firefox
2020-12-02 16:45:17 +01:00
aler9 dc7eb53a8f Fix file size computation on 32bit platforms
Signed-off-by: aler9 <46489434+aler9@users.noreply.github.com>
2020-12-02 15:27:30 +00:00
Morris Jobke e8b284e807
Merge pull request #24502 from nextcloud/backport/24499/stable20
[stable20] Harden setup check for TLS version if host is not reachable
2020-12-02 16:14:12 +01:00
Morris Jobke 03956c5862 Harden setup check for TLS version if host is not reachable
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 13:27:43 +00:00
Robin Appelman 1f6e5c6d8e fix loading mtime of new file in conflict dialog in firefox
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-12-02 07:37:19 +00:00
Nextcloud bot 2a0c0ea584
[tx-robot] updated from transifex 2020-12-02 02:20:20 +00:00
Morris Jobke 4949429567
Merge pull request #24477 from nextcloud/backport/24189/stable20
[stable20] Set frame-ancestors to none if none are filled
2020-12-01 23:44:35 +01:00
Morris Jobke 41cc1f7360
Merge pull request #24478 from nextcloud/backport/24186/stable20
[stable20] Move the password fiels of chaging passwords to post
2020-12-01 23:29:35 +01:00
Morris Jobke 74f734dc97
Merge pull request #24479 from nextcloud/backport/24188/stable20
[stable20] Move the global password for files external to post
2020-12-01 23:28:33 +01:00
Morris Jobke 910fecf8f8
Merge pull request #24483 from nextcloud/backport/24094/stable20
[stable20] Only attempt to move to trash if a file is not in appdata
2020-12-01 23:20:48 +01:00
Roeland Jago Douma 3fb850940f
Set frame-ancestors to none if none are filled
frame-ancestors doesn't fall back to default-src. So when we apply a
very restricted CSP we should make sure to set it to 'none' and not
leave it empty.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-01 22:23:13 +01:00
Roeland Jago Douma 3e982a3346
Move the password fiels of chaging passwords to post
* This is not actually used with GET (obviously). But else some scanners
  trip on it

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-01 22:23:02 +01:00
Roeland Jago Douma c24534866b
Move the global password for files external to post
Again more false positives in some scanners

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-01 22:22:33 +01:00
Julius Härtl 7d786a4e37
Only attempt to move to trash if a file is not in appdata
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-01 22:20:11 +01:00
Morris Jobke 86da5013c8
Merge pull request #24325 from nextcloud/backport/24103/stable20
[stable20] Only check path for being accessible when the storage is a object home
2020-12-01 11:04:22 +01:00
Roeland Jago Douma ebf046bc15
Merge pull request #24462 from nextcloud/backport/24460/stable20
[stable20] Use correct l10n source in files_sharing JS code
2020-12-01 08:48:16 +01:00
Nextcloud bot 965614f3e2
[tx-robot] updated from transifex 2020-12-01 02:19:56 +00:00
Morris Jobke fba0145bef Use correct l10n source in files_sharing JS code
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-30 19:30:28 +00:00
Morris Jobke d56300a86c
Merge pull request #24455 from nextcloud/backport/24451/stable20
[stable20] external storages: save group ids not display names in configuration
2020-11-30 17:22:42 +01:00
Morris Jobke 4a2b72dcbe
Merge pull request #24453 from nextcloud/backport/24449/stable20
[stable20] Store scss variables under a different prefix for each theming config version
2020-11-30 16:54:02 +01:00
Arthur Schiwon a6d288e1ac save group ids not display names in configuration
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-30 14:49:11 +00:00
Julius Härtl 7d57b2c317 Store scss variables under a different prefix for each theming config version
The main issue with using the general theming- prefix is that with APCu caching
the cache is not shared between processes, so when trying to reset the cache
through the CLI, e.g. when updating the theming config the old cache is never
invalidated.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-30 14:24:28 +00:00
Morris Jobke 6916240d98
Merge pull request #24446 from nextcloud/backport/23652/stable20
[stable20] Fix public calendars shared to circles
2020-11-30 11:24:38 +01:00
Morris Jobke b1f3f5d7cb
Merge pull request #24443 from nextcloud/backport/24357/stable20
[stable20] Make sure we add new line between vcf groups exports
2020-11-30 10:24:27 +01:00
Daniel Kesselberg 6635dbb3bd A valid user session is required for circles.
The circles app depends on a valid userId. A public shared calender might be viewed by guests without a user session. For such requests the principal is null.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-11-30 09:01:53 +00:00
Daniel Kesselberg 761ee14fd7 Update phpdoc for circleToPrincipal
as the QueryException is already catched inside circleToPrincipal.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-11-30 09:01:51 +00:00
John Molakvoæ (skjnldsv) 8e262d9e59 Make sure we add new line between vcf groups exports
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-11-30 08:13:46 +00:00
Nextcloud bot c1e993333e
[tx-robot] updated from transifex 2020-11-30 02:19:54 +00:00
Nextcloud bot 7ea0f2b936
[tx-robot] updated from transifex 2020-11-29 02:19:21 +00:00
Nextcloud bot 7ad1420e61
[tx-robot] updated from transifex 2020-11-28 02:18:33 +00:00
Christoph Wurst f4d1f01209
Merge pull request #24387 from nextcloud/backport/24382/stable20
[stable20] Properly encode path when fetching inherited shares
2020-11-27 09:44:45 +01:00
Nextcloud bot 80bf325bb0
[tx-robot] updated from transifex 2020-11-27 02:18:26 +00:00
blizzz e78989fd8a
Merge pull request #24391 from nextcloud/backport/24375/stable20
[stable20] formatting remote sharer should take protocol, path into account
2020-11-26 22:13:43 +01:00
npmbuildbot-nextcloud[bot] ad79aa3f32 Compile assets
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-26 14:11:40 +00:00
Joas Schilling 61f1c12fb1
Merge pull request #24333 from nextcloud/backport/24315/stable20
[stable20] avoid empty null default with value that will be inserted anyways
2020-11-26 14:50:27 +01:00
Arthur Schiwon 8e8861f716 formatting remote sharer should take protocol, path into account
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-26 13:12:11 +00:00
Julius Härtl 72a3f5cd31 Properly encode path when fetching inherited shares
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-26 12:39:57 +00:00
Nextcloud bot 921f9441d3
[tx-robot] updated from transifex 2020-11-26 02:18:57 +00:00
blizzz 76671c2a46
Merge pull request #24377 from nextcloud/backport/24374/stable20
[stable20] Use proper bundles for files client and fileinfo
2020-11-25 20:38:29 +01:00
Julius Härtl 49bd82292c Files client and info bundles are always loaded so we don't need to load them again
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-25 16:11:36 +00:00
Roeland Jago Douma 2003995e32
Merge pull request #24353 from nextcloud/backport/24162/stable20
[stable20] set the display name of federated sharees from addressbook
2020-11-25 16:18:23 +01:00
Roeland Jago Douma ae9fd3e225
Merge pull request #24367 from nextcloud/backport/24363/stable20
[stable20] Catch storage not available in versions expire command
2020-11-25 16:17:34 +01:00
Arthur Schiwon 4e6f0df777
send expected format of cloud id
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-25 14:16:08 +01:00
Christoph Wurst 2ff42f6b1a Catch storage not available in versions expire command
External storage with session credentials is not accessible without a
user session, hence background jobs and CLI commands can't work with
them. The previously unhandled exception causes logged errors in the
nextcloud log. This patch catches the specific exception and logs it as
warnings. So for a production instance the error won't spam their logs
for this non-recoverable and technically unsolvable error if the minimum
log level is set to the default of 3 (error).

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-25 10:40:21 +00:00
Nextcloud bot 940e8c3a99
[tx-robot] updated from transifex 2020-11-25 02:19:04 +00:00
Arthur Schiwon c9814c716a
set the display name of federated sharees from addressbook
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-24 22:52:31 +01:00
John Molakvoæ 6e279bf6c6
Merge pull request #24346 from nextcloud/backport/24341/stable20
[stable20] Fix the config key on the sharing expire checkbox
2020-11-24 18:38:46 +01:00
John Molakvoæ bd4931032e
Merge pull request #24342 from nextcloud/backport/24331/stable20
[stable20] Fix contacts menu position and show uid as a tooltip
2020-11-24 18:37:23 +01:00
Julius Härtl a1a178eb53 Fix contacts menu position and show uid as a tooltip
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-24 14:55:21 +00:00