Roeland Jago Douma
bf9888870c
Fix vsprint parameter
...
%2\$; is not valid. On php7 this is just ignored but on php8 it gives an
error. %2\$s; works.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-03 08:20:06 +00:00
Morris Jobke
c4d29cc3f1
Merge pull request #24514 from nextcloud/backport/24501/stable19
...
[stable19] set mountid for personal external storage mounts
2020-12-03 09:09:09 +01:00
John Molakvoæ
769f4daece
Merge pull request #24492 from nextcloud/backport/24376/stable19
...
[stable19] fix loading mtime of new file in conflict dialog in firefox
2020-12-03 07:44:33 +01:00
Nextcloud bot
253aeb3049
[tx-robot] updated from transifex
2020-12-03 02:20:10 +00:00
Robin Appelman
a2300b4968
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 19:02:55 +00:00
Robin Appelman
3b9a432136
set mountid for personal external storage mounts
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-12-02 18:55:13 +00:00
Roeland Jago Douma
fb874e5d6d
Merge pull request #24508 from nextcloud/backport/23257/stable19
...
[stable19] Fix file size computation on 32bit platforms
2020-12-02 19:51:10 +01:00
aler9
349f754833
Fix file size computation on 32bit platforms
...
Signed-off-by: aler9 <46489434+aler9@users.noreply.github.com>
2020-12-02 15:27:22 +00:00
Christoph Wurst
32b7a0e13f
Merge pull request #24503 from nextcloud/backport/24499/stable19
...
[stable19] Harden setup check for TLS version if host is not reachable
2020-12-02 16:06:08 +01:00
Morris Jobke
2ff7bc51a7
Harden setup check for TLS version if host is not reachable
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 13:30:23 +00:00
John Molakvoæ
379bb17a48
Merge pull request #24386 from nextcloud/backport/24382/stable19
...
[stable19] Properly encode path when fetching inherited shares
2020-12-02 12:20:07 +01:00
Julius Härtl
85177501a4
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-12-02 08:28:34 +00:00
Nextcloud bot
6f97488915
[tx-robot] updated from transifex
2020-12-02 02:20:28 +00:00
Morris Jobke
e4bccaf624
Merge pull request #24484 from nextcloud/backport/24094/stable19
...
[stable19] Only attempt to move to trash if a file is not in appdata
2020-12-01 23:03:18 +01:00
Julius Härtl
59e60a0756
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:02:43 +01:00
Morris Jobke
6c7b0faeec
Merge pull request #24480 from nextcloud/backport/24242/stable19
...
[stable19] Update ScanLegacyFormat.php
2020-12-01 13:42:07 +01:00
essys
f5e1da1aa9
Update ScanLegacyFormat.php
...
Fixed a small typo on line 99.
2020-12-01 12:09:42 +00:00
Morris Jobke
21defabc41
Merge pull request #24327 from nextcloud/backport/24103/stable19
...
[stable19] Only check path for being accessible when the storage is a object home
2020-12-01 11:04:09 +01:00
Morris Jobke
9ae16703ae
Merge pull request #24343 from nextcloud/backport/24331/stable19
...
[stable19] Fix contacts menu position and show uid as a tooltip
2020-12-01 11:01:23 +01:00
Roeland Jago Douma
2e1c583fbd
Merge pull request #24463 from nextcloud/backport/24460/stable19
...
[stable19] Use correct l10n source in files_sharing JS code
2020-12-01 08:47:58 +01:00
Nextcloud bot
df795519ad
[tx-robot] updated from transifex
2020-12-01 02:20:05 +00:00
Morris Jobke
65da0ef3b5
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:10:52 +00:00
Morris Jobke
739fdbaeba
Merge pull request #24457 from nextcloud/backport/24451/stable19
...
[stable19] external storages: save group ids not display names in configuration
2020-11-30 17:22:31 +01:00
Morris Jobke
4d341334c8
Merge pull request #24452 from nextcloud/backport/24449/stable19
...
[stable19] Store scss variables under a different prefix for each theming config version
2020-11-30 16:54:28 +01:00
Arthur Schiwon
bc82799663
save group ids not display names in configuration
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-30 14:52:02 +00:00
Julius Härtl
73787958d0
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:20 +00:00
Morris Jobke
0cc0d826a8
Merge pull request #24447 from nextcloud/backport/23652/stable19
...
[stable19] Fix public calendars shared to circles
2020-11-30 11:33:21 +01:00
Morris Jobke
7bc8135013
Merge pull request #24444 from nextcloud/backport/24357/stable19
...
[stable19] Make sure we add new line between vcf groups exports
2020-11-30 10:19:55 +01:00
Daniel Kesselberg
23263f9490
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:02:05 +00:00
Daniel Kesselberg
04364169ed
Update phpdoc for circleToPrincipal
...
as the QueryException is already catched inside circleToPrincipal.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-11-30 09:02:02 +00:00
John Molakvoæ (skjnldsv)
0d43076f07
Make sure we add new line between vcf groups exports
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-11-30 08:14:01 +00:00
Nextcloud bot
ae3bfb97c3
[tx-robot] updated from transifex
2020-11-30 02:20:02 +00:00
Nextcloud bot
e2a30e2996
[tx-robot] updated from transifex
2020-11-29 02:19:29 +00:00
Nextcloud bot
dc443c55c3
[tx-robot] updated from transifex
2020-11-28 02:18:41 +00:00
blizzz
5a4e066ec2
Merge pull request #24392 from nextcloud/backport/24375/stable19
...
[stable19] formatting remote sharer should take protocol, path into account
2020-11-26 22:12:53 +01:00
npmbuildbot-nextcloud[bot]
86cf119993
Compile assets
...
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-26 17:22:57 +00:00
Joas Schilling
45616f09f6
Merge pull request #24334 from nextcloud/backport/24315/stable19
...
[stable19] avoid empty null default with value that will be inserted anyways
2020-11-26 14:50:39 +01:00
Arthur Schiwon
e4b1d135a5
formatting remote sharer should take protocol, path into account
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-26 13:12:33 +00:00
Nextcloud bot
1636dfcbfa
[tx-robot] updated from transifex
2020-11-26 02:19:05 +00:00
Roeland Jago Douma
6d6382a55d
Merge pull request #24354 from nextcloud/backport/24162/stable19
...
[stable19] set the display name of federated sharees from addressbook
2020-11-25 16:18:12 +01:00
Roeland Jago Douma
b760aa903b
Merge pull request #24368 from nextcloud/backport/24363/stable19
...
[stable19] Catch storage not available in versions expire command
2020-11-25 16:17:37 +01:00
Roeland Jago Douma
35cc99fdf6
Merge pull request #24370 from nextcloud/backport/21844/stable19
...
[stable19] Avoid substr() error when strpos returns false
2020-11-25 14:42:56 +01:00
Arthur Schiwon
29a452c693
send expected format of cloud id
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-25 14:32:30 +01:00
Arthur Schiwon
10a252c905
set the display name of federated sharees from addressbook
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-25 14:32:06 +01:00
lui87kw
aecf4eff27
Extra white space to follow other ifs
...
Signed-off-by: lui87kw <lukas.ifflaender@uni-wuerzburg.de>
2020-11-25 11:55:16 +00:00
bladewing
43e401e3a2
Avoid substr() error when strpos returns false
...
"Exception: substr() expects parameter 3 to be int, bool given" can occur on Line 378 $mimePart = substr($icon, 0, strpos($icon, '-'));
This happens, when '-' is not found and strpos returns false instead of an int.
When this occurs, e.g., Activity hangs.
Signed-off-by: lui87kw <lukas.ifflaender@uni-wuerzburg.de>
2020-11-25 11:55:15 +00:00
Christoph Wurst
2e511e3ea0
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 11:52:26 +01:00
Nextcloud bot
48ef5148c1
[tx-robot] updated from transifex
2020-11-25 02:19:13 +00:00
Julius Härtl
ef95ac67ea
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 17:45:59 +00:00
John Molakvoæ
ef37e375db
Merge pull request #24347 from nextcloud/backport/24341/stable19
...
[stable19] Fix the config key on the sharing expire checkbox
2020-11-24 18:39:16 +01:00