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
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
Christoph Wurst
4b9d8c75ec
Fix the config key on the sharing expire checkbox
...
We don't use `shareapi_internal_enforce_expire_date` anywhere.
`shareapi_enforce_internal_expire_date` is the one we want.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-24 14:54:02 +00:00
Arthur Schiwon
4850019fcd
avoid empty null default with value that will be inserted anyways
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-24 10:31:27 +00:00
Nextcloud bot
56cee9e405
[tx-robot] updated from transifex
2020-11-24 02:19:05 +00:00
Morris Jobke
e375010589
Merge pull request #24297 from nextcloud/backport/stable20/23023
...
[stable20] Delete files that exceed trashbin size immediately
2020-11-23 21:06:33 +01:00
Christoph Wurst
fcaa75858c
Merge pull request #24311 from nextcloud/fix/stable20-sabre-parse-xml-errors
...
[stable20] Update sabre/xml to fix XML parsing errors
2020-11-23 14:40:34 +01:00
Christoph Wurst
55d9834c95
Update sabre/xml to fix XML parsing errors
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-23 14:00:19 +01:00
Julius Härtl
e241f14f24
Delete files that exceed trashbin size immediately
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-23 09:11:53 +01:00
Nextcloud bot
aaa9c0ba6c
[tx-robot] updated from transifex
2020-11-23 02:18:57 +00:00
Nextcloud bot
ac8bb267a3
[tx-robot] updated from transifex
2020-11-22 02:18:39 +00:00
Nextcloud bot
9a0c85d0cd
[tx-robot] updated from transifex
2020-11-21 02:19:27 +00:00
Morris Jobke
347aaf23b2
Merge pull request #24249 from nextcloud/backport/24241/stable20
...
[stable20] Harden EncryptionLegacyCipher a bit
2020-11-20 22:42:17 +01:00
Morris Jobke
e772fd6409
Merge pull request #24263 from nextcloud/backport/24108/stable20
...
[stable20] Use correct year for generated birthdays events
2020-11-20 22:41:51 +01:00
Sven Strickroth
5aac8a1b34
Use correct year for generated birthdays events
...
'X-APPLE-OMIT-YEAR' is not always present, at least iOS 12.4 uses the hard coded date of 1604 (the start of the gregorian calendar) when the year is unknown.
cf. https://forums.bitfire.at/topic/2050/bday-without-year-for-vcard-3-0-if-server-drops-property-x-apple-omit-year and https://gitlab.com/CardBook/CardBook/-/issues/586
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2020-11-20 20:47:56 +00:00
Morris Jobke
cb2bed6a8a
Merge pull request #24258 from nextcloud/backport/24242/stable20
...
[stable20] Update ScanLegacyFormat.php
2020-11-20 21:31:17 +01:00
Morris Jobke
72ba3dfe3c
Merge pull request #24259 from nextcloud/backport/24257/stable20
...
[stable20] Simple typo in comments
2020-11-20 21:29:15 +01:00
Carlos Ferreira
a8ba2df8e6
Simple typo in comments
2020-11-20 19:45:23 +00:00
essys
8d44a1006a
Update ScanLegacyFormat.php
...
Fixed a small typo on line 99.
2020-11-20 19:42:37 +00:00
Morris Jobke
e0e3334fc2
Merge pull request #24230 from nextcloud/backport/24007/stable20
...
[stable20] allow selecting multiple columns with SELECT DISTINCT
2020-11-20 14:27:27 +01:00
Morris Jobke
7fa352b28c
Merge pull request #24228 from nextcloud/backport/24135/stable20
...
[stable20] Fix nextcloud logo in email notifications misalignment
2020-11-20 14:23:00 +01:00
Roeland Jago Douma
06286f8c0e
Harden EncryptionLegacyCipher a bit
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-20 13:18:25 +00:00
Roeland Jago Douma
322b0ab2b3
Merge pull request #24239 from nextcloud/backport/24203/stable20
...
[stable20] Use regex when searching on single file shares
2020-11-20 10:15:04 +01:00
Roeland Jago Douma
3839c8449a
Merge pull request #24231 from nextcloud/backport/23757/stable20
...
[stable20] use file name instead of path in 'not allowed to share' message
2020-11-20 10:04:54 +01:00
Roeland Jago Douma
10086b3f43
Merge pull request #24232 from nextcloud/backport/24211/stable20
...
[stable20] Fix setting images through occ for theming
2020-11-20 10:04:30 +01:00
Roeland Jago Douma
37df208bd7
Limit shared cache search if it is just a file
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-20 07:27:47 +00:00
Nextcloud bot
78b62b6b65
[tx-robot] updated from transifex
2020-11-20 02:20:19 +00:00
Julius Härtl
c8e9694a69
Fix setting images through occ for theming
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-19 22:18:55 +00:00
Robin Appelman
f65a89dd07
use file name instead of path in 'not allowed to share' message
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-19 21:44:42 +00:00
Robin Appelman
22bf656e02
allow selecting multiple columns with SELECT DISTINCT
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-19 21:41:13 +00:00
medcloud
7ccf700432
Fix #23357
...
Signed-off-by: medcloud <42641918+medcloud@users.noreply.github.com>
2020-11-19 20:38:54 +00:00
Roeland Jago Douma
8021bacbdc
Merge pull request #24181 from nextcloud/backport/24102/stable20
...
[stable20] Check quota of subdirectories when uploading to them
2020-11-19 10:40:11 +01:00
Roeland Jago Douma
2c5a1fd636
Merge pull request #24196 from nextcloud/backport/24098/stable20
...
[stable20] circleId too short in some request
2020-11-19 10:09:45 +01:00
Roeland Jago Douma
d0417e0d1f
Merge pull request #24212 from nextcloud/backport/24207/stable20
...
[stable20] missing level in ScopedPsrLogger
2020-11-19 09:50:32 +01:00
Maxence Lange
8c398453ac
missing level
...
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2020-11-19 07:40:38 +00:00
Nextcloud bot
6a4ced077e
[tx-robot] updated from transifex
2020-11-19 02:20:21 +00:00