]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
3 years agoReplace abandoned log normalizer with our fork 24530/head
Christoph Wurst [Thu, 3 Dec 2020 08:50:10 +0000 (09:50 +0100)]
Replace abandoned log normalizer with our fork

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
3 years agoMerge pull request #24517 from nextcloud/backport/24459/stable20
Roeland Jago Douma [Thu, 3 Dec 2020 08:37:44 +0000 (09:37 +0100)]
Merge pull request #24517 from nextcloud/backport/24459/stable20

[stable20] Only execute plain mimetype check for directories and do the fallback…

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 3 Dec 2020 02:20:01 +0000 (02:20 +0000)]
[tx-robot] updated from transifex

3 years agoOnly execute plain mimetype check for directories and do the fallback only for non... 24517/head
Morris Jobke [Mon, 30 Nov 2020 15:43:55 +0000 (16:43 +0100)]
Only execute plain mimetype check for directories and do the fallback only for non-directories

Ref #23096

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
3 years agoMerge pull request #24513 from nextcloud/backport/24501/stable20
Morris Jobke [Wed, 2 Dec 2020 19:50:08 +0000 (20:50 +0100)]
Merge pull request #24513 from nextcloud/backport/24501/stable20

[stable20] set mountid for personal external storage mounts

3 years agoMerge pull request #24509 from nextcloud/backport/23257/stable20
Roeland Jago Douma [Wed, 2 Dec 2020 19:03:24 +0000 (20:03 +0100)]
Merge pull request #24509 from nextcloud/backport/23257/stable20

[stable20] Fix file size computation on 32bit platforms

3 years agoset mountid for personal external storage mounts 24513/head
Robin Appelman [Wed, 2 Dec 2020 13:25:48 +0000 (14:25 +0100)]
set mountid for personal external storage mounts

Signed-off-by: Robin Appelman <robin@icewind.nl>
3 years agoMerge pull request #24511 from nextcloud/backport/23278/stable20
Roeland Jago Douma [Wed, 2 Dec 2020 18:47:18 +0000 (19:47 +0100)]
Merge pull request #24511 from nextcloud/backport/23278/stable20

[stable20] Allow subscription to indicate that a userlimit is reached

3 years agoAdd notification for user limit 24511/head
Morris Jobke [Wed, 2 Dec 2020 09:07:34 +0000 (10:07 +0100)]
Add notification for user limit

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
3 years agoAllow subscription to indicate that a userlimit is reached
Morris Jobke [Thu, 8 Oct 2020 09:41:16 +0000 (11:41 +0200)]
Allow subscription to indicate that a userlimit is reached

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
3 years agoMerge pull request #24491 from nextcloud/backport/24376/stable20
Greta [Wed, 2 Dec 2020 15:45:17 +0000 (16:45 +0100)]
Merge pull request #24491 from nextcloud/backport/24376/stable20

[stable20] fix loading mtime of new file in conflict dialog in firefox

3 years agoFix file size computation on 32bit platforms 24509/head
aler9 [Wed, 7 Oct 2020 11:50:29 +0000 (13:50 +0200)]
Fix file size computation on 32bit platforms

Signed-off-by: aler9 <46489434+aler9@users.noreply.github.com>
3 years agoMerge pull request #24502 from nextcloud/backport/24499/stable20
Morris Jobke [Wed, 2 Dec 2020 15:14:12 +0000 (16:14 +0100)]
Merge pull request #24502 from nextcloud/backport/24499/stable20

[stable20] Harden setup check for TLS version if host is not reachable

3 years agoHarden setup check for TLS version if host is not reachable 24502/head
Morris Jobke [Wed, 2 Dec 2020 12:16:33 +0000 (13:16 +0100)]
Harden setup check for TLS version if host is not reachable

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
3 years agofix loading mtime of new file in conflict dialog in firefox 24491/head
Robin Appelman [Wed, 25 Nov 2020 15:56:06 +0000 (16:56 +0100)]
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>
3 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 2 Dec 2020 02:20:20 +0000 (02:20 +0000)]
[tx-robot] updated from transifex

3 years agoMerge pull request #24477 from nextcloud/backport/24189/stable20
Morris Jobke [Tue, 1 Dec 2020 22:44:35 +0000 (23:44 +0100)]
Merge pull request #24477 from nextcloud/backport/24189/stable20

[stable20] Set frame-ancestors to none if none are filled

3 years agoMerge pull request #24478 from nextcloud/backport/24186/stable20
Morris Jobke [Tue, 1 Dec 2020 22:29:35 +0000 (23:29 +0100)]
Merge pull request #24478 from nextcloud/backport/24186/stable20

[stable20] Move the password fiels of chaging passwords to post

3 years agoMerge pull request #24479 from nextcloud/backport/24188/stable20
Morris Jobke [Tue, 1 Dec 2020 22:28:33 +0000 (23:28 +0100)]
Merge pull request #24479 from nextcloud/backport/24188/stable20

[stable20] Move the global password for files external to post

3 years agoMerge pull request #24483 from nextcloud/backport/24094/stable20
Morris Jobke [Tue, 1 Dec 2020 22:20:48 +0000 (23:20 +0100)]
Merge pull request #24483 from nextcloud/backport/24094/stable20

[stable20] Only attempt to move to trash if a file is not in appdata

3 years agoSet frame-ancestors to none if none are filled 24477/head
Roeland Jago Douma [Tue, 17 Nov 2020 15:19:03 +0000 (16:19 +0100)]
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>
3 years agoMove the password fiels of chaging passwords to post 24478/head
Roeland Jago Douma [Tue, 17 Nov 2020 15:10:18 +0000 (16:10 +0100)]
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>
3 years agoMove the global password for files external to post 24479/head
Roeland Jago Douma [Tue, 17 Nov 2020 15:14:21 +0000 (16:14 +0100)]
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>
3 years agoOnly attempt to move to trash if a file is not in appdata 24483/head
Julius Härtl [Fri, 13 Nov 2020 07:30:35 +0000 (08:30 +0100)]
Only attempt to move to trash if a file is not in appdata

Signed-off-by: Julius Härtl <jus@bitgrid.net>
3 years agoMerge pull request #24325 from nextcloud/backport/24103/stable20
Morris Jobke [Tue, 1 Dec 2020 10:04:22 +0000 (11:04 +0100)]
Merge pull request #24325 from nextcloud/backport/24103/stable20

[stable20] Only check path for being accessible when the storage is a object home

3 years agoMerge pull request #24462 from nextcloud/backport/24460/stable20
Roeland Jago Douma [Tue, 1 Dec 2020 07:48:16 +0000 (08:48 +0100)]
Merge pull request #24462 from nextcloud/backport/24460/stable20

[stable20] Use correct l10n source in files_sharing JS code

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 1 Dec 2020 02:19:56 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

3 years agoUse correct l10n source in files_sharing JS code 24462/head
Morris Jobke [Mon, 30 Nov 2020 16:03:19 +0000 (17:03 +0100)]
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>
3 years agoMerge pull request #24455 from nextcloud/backport/24451/stable20
Morris Jobke [Mon, 30 Nov 2020 16:22:42 +0000 (17:22 +0100)]
Merge pull request #24455 from nextcloud/backport/24451/stable20

[stable20] external storages: save group ids not display names in configuration

3 years agoMerge pull request #24453 from nextcloud/backport/24449/stable20
Morris Jobke [Mon, 30 Nov 2020 15:54:02 +0000 (16:54 +0100)]
Merge pull request #24453 from nextcloud/backport/24449/stable20

[stable20] Store scss variables under a different prefix for each theming config version

3 years agosave group ids not display names in configuration 24455/head
Arthur Schiwon [Mon, 30 Nov 2020 13:39:13 +0000 (14:39 +0100)]
save group ids not display names in configuration

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agoStore scss variables under a different prefix for each theming config version 24453/head
Julius Härtl [Mon, 30 Nov 2020 12:06:10 +0000 (13:06 +0100)]
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>
3 years agoMerge pull request #24446 from nextcloud/backport/23652/stable20
Morris Jobke [Mon, 30 Nov 2020 10:24:38 +0000 (11:24 +0100)]
Merge pull request #24446 from nextcloud/backport/23652/stable20

[stable20] Fix public calendars shared to circles

3 years agoMerge pull request #24443 from nextcloud/backport/24357/stable20
Morris Jobke [Mon, 30 Nov 2020 09:24:27 +0000 (10:24 +0100)]
Merge pull request #24443 from nextcloud/backport/24357/stable20

[stable20] Make sure we add new line between vcf groups exports

3 years agoA valid user session is required for circles. 24446/head
Daniel Kesselberg [Fri, 23 Oct 2020 19:18:02 +0000 (21:18 +0200)]
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>
3 years agoUpdate phpdoc for circleToPrincipal
Daniel Kesselberg [Fri, 23 Oct 2020 19:12:15 +0000 (21:12 +0200)]
Update phpdoc for circleToPrincipal

as the QueryException is already catched inside circleToPrincipal.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
3 years agoMake sure we add new line between vcf groups exports 24443/head
John Molakvoæ (skjnldsv) [Tue, 24 Nov 2020 17:33:39 +0000 (18:33 +0100)]
Make sure we add new line between vcf groups exports

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
3 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 30 Nov 2020 02:19:54 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 29 Nov 2020 02:19:21 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 28 Nov 2020 02:18:33 +0000 (02:18 +0000)]
[tx-robot] updated from transifex

3 years agoMerge pull request #24387 from nextcloud/backport/24382/stable20
Christoph Wurst [Fri, 27 Nov 2020 08:44:45 +0000 (09:44 +0100)]
Merge pull request #24387 from nextcloud/backport/24382/stable20

[stable20] Properly encode path when fetching inherited shares

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 27 Nov 2020 02:18:26 +0000 (02:18 +0000)]
[tx-robot] updated from transifex

3 years agoMerge pull request #24391 from nextcloud/backport/24375/stable20
blizzz [Thu, 26 Nov 2020 21:13:43 +0000 (22:13 +0100)]
Merge pull request #24391 from nextcloud/backport/24375/stable20

[stable20] formatting remote sharer should take protocol, path into account

4 years agoCompile assets 24391/head
npmbuildbot-nextcloud[bot] [Thu, 26 Nov 2020 14:11:40 +0000 (14:11 +0000)]
Compile assets

Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
4 years agoMerge pull request #24333 from nextcloud/backport/24315/stable20
Joas Schilling [Thu, 26 Nov 2020 13:50:27 +0000 (14:50 +0100)]
Merge pull request #24333 from nextcloud/backport/24315/stable20

[stable20] avoid empty null default with value that will be inserted anyways

4 years agoformatting remote sharer should take protocol, path into account
Arthur Schiwon [Wed, 25 Nov 2020 15:36:30 +0000 (16:36 +0100)]
formatting remote sharer should take protocol, path into  account

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
4 years agoProperly encode path when fetching inherited shares 24387/head
Julius Härtl [Thu, 26 Nov 2020 08:22:12 +0000 (09:22 +0100)]
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>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 26 Nov 2020 02:18:57 +0000 (02:18 +0000)]
[tx-robot] updated from transifex

4 years agoMerge pull request #24377 from nextcloud/backport/24374/stable20
blizzz [Wed, 25 Nov 2020 19:38:29 +0000 (20:38 +0100)]
Merge pull request #24377 from nextcloud/backport/24374/stable20

[stable20] Use proper bundles for files client and fileinfo

4 years agoFiles client and info bundles are always loaded so we don't need to load them again 24377/head
Julius Härtl [Wed, 25 Nov 2020 14:05:04 +0000 (15:05 +0100)]
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>
4 years agoMerge pull request #24353 from nextcloud/backport/24162/stable20
Roeland Jago Douma [Wed, 25 Nov 2020 15:18:23 +0000 (16:18 +0100)]
Merge pull request #24353 from nextcloud/backport/24162/stable20

[stable20] set the display name of federated sharees from addressbook

4 years agoMerge pull request #24367 from nextcloud/backport/24363/stable20
Roeland Jago Douma [Wed, 25 Nov 2020 15:17:34 +0000 (16:17 +0100)]
Merge pull request #24367 from nextcloud/backport/24363/stable20

[stable20] Catch storage not available in versions expire command

4 years agosend expected format of cloud id 24353/head
Arthur Schiwon [Tue, 24 Nov 2020 22:14:43 +0000 (23:14 +0100)]
send expected format of cloud id

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
4 years agoCatch storage not available in versions expire command 24367/head
Christoph Wurst [Wed, 25 Nov 2020 08:28:38 +0000 (09:28 +0100)]
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>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 25 Nov 2020 02:19:04 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

4 years agoset the display name of federated sharees from addressbook
Arthur Schiwon [Mon, 16 Nov 2020 16:56:44 +0000 (17:56 +0100)]
set the display name of federated sharees from addressbook

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
4 years agoMerge pull request #24346 from nextcloud/backport/24341/stable20
John Molakvoæ [Tue, 24 Nov 2020 17:38:46 +0000 (18:38 +0100)]
Merge pull request #24346 from nextcloud/backport/24341/stable20

[stable20] Fix the config key on the sharing expire checkbox

4 years agoMerge pull request #24342 from nextcloud/backport/24331/stable20
John Molakvoæ [Tue, 24 Nov 2020 17:37:23 +0000 (18:37 +0100)]
Merge pull request #24342 from nextcloud/backport/24331/stable20

[stable20] Fix contacts menu position and show uid as a tooltip

4 years agoFix contacts menu position and show uid as a tooltip 24342/head
Julius Härtl [Tue, 29 Sep 2020 11:32:18 +0000 (13:32 +0200)]
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>
4 years agoFix the config key on the sharing expire checkbox 24346/head
Christoph Wurst [Tue, 24 Nov 2020 13:17:41 +0000 (14:17 +0100)]
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>
4 years agoavoid empty null default with value that will be inserted anyways 24333/head
Arthur Schiwon [Mon, 23 Nov 2020 20:17:37 +0000 (21:17 +0100)]
avoid empty null default with value that will be inserted anyways

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
4 years agoOnly check path for being accessible when the storage is a object home 24325/head
Julius Härtl [Fri, 13 Nov 2020 12:48:32 +0000 (13:48 +0100)]
Only check path for being accessible when the storage is a object home

Signed-off-by: Julius Härtl <jus@bitgrid.net>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 24 Nov 2020 02:19:05 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

4 years agoMerge pull request #24297 from nextcloud/backport/stable20/23023
Morris Jobke [Mon, 23 Nov 2020 20:06:33 +0000 (21:06 +0100)]
Merge pull request #24297 from nextcloud/backport/stable20/23023

 [stable20] Delete files that exceed trashbin size immediately

4 years agoMerge pull request #24311 from nextcloud/fix/stable20-sabre-parse-xml-errors
Christoph Wurst [Mon, 23 Nov 2020 13:40:34 +0000 (14:40 +0100)]
Merge pull request #24311 from nextcloud/fix/stable20-sabre-parse-xml-errors

[stable20] Update sabre/xml to fix XML parsing errors

4 years agoUpdate sabre/xml to fix XML parsing errors 24311/head
Christoph Wurst [Mon, 23 Nov 2020 13:00:19 +0000 (14:00 +0100)]
Update sabre/xml to fix XML parsing errors

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
4 years agoDelete files that exceed trashbin size immediately 24297/head
Julius Härtl [Wed, 23 Sep 2020 14:38:24 +0000 (16:38 +0200)]
Delete files that exceed trashbin size immediately

Signed-off-by: Julius Härtl <jus@bitgrid.net>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 23 Nov 2020 02:18:57 +0000 (02:18 +0000)]
[tx-robot] updated from transifex

4 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 22 Nov 2020 02:18:39 +0000 (02:18 +0000)]
[tx-robot] updated from transifex

4 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 21 Nov 2020 02:19:27 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

4 years agoMerge pull request #24249 from nextcloud/backport/24241/stable20
Morris Jobke [Fri, 20 Nov 2020 21:42:17 +0000 (22:42 +0100)]
Merge pull request #24249 from nextcloud/backport/24241/stable20

[stable20] Harden EncryptionLegacyCipher a bit

4 years agoMerge pull request #24263 from nextcloud/backport/24108/stable20
Morris Jobke [Fri, 20 Nov 2020 21:41:51 +0000 (22:41 +0100)]
Merge pull request #24263 from nextcloud/backport/24108/stable20

[stable20] Use correct year for generated birthdays events

4 years agoUse correct year for generated birthdays events 24263/head
Sven Strickroth [Fri, 13 Nov 2020 14:57:12 +0000 (15:57 +0100)]
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>
4 years agoMerge pull request #24258 from nextcloud/backport/24242/stable20
Morris Jobke [Fri, 20 Nov 2020 20:31:17 +0000 (21:31 +0100)]
Merge pull request #24258 from nextcloud/backport/24242/stable20

[stable20] Update ScanLegacyFormat.php

4 years agoMerge pull request #24259 from nextcloud/backport/24257/stable20
Morris Jobke [Fri, 20 Nov 2020 20:29:15 +0000 (21:29 +0100)]
Merge pull request #24259 from nextcloud/backport/24257/stable20

[stable20] Simple typo in comments

4 years agoSimple typo in comments 24259/head
Carlos Ferreira [Fri, 20 Nov 2020 19:01:28 +0000 (20:01 +0100)]
Simple typo in comments

4 years agoUpdate ScanLegacyFormat.php 24258/head
essys [Fri, 20 Nov 2020 09:16:35 +0000 (10:16 +0100)]
Update ScanLegacyFormat.php

Fixed a small typo on line 99.

4 years agoMerge pull request #24230 from nextcloud/backport/24007/stable20
Morris Jobke [Fri, 20 Nov 2020 13:27:27 +0000 (14:27 +0100)]
Merge pull request #24230 from nextcloud/backport/24007/stable20

[stable20] allow selecting multiple columns with SELECT DISTINCT

4 years agoMerge pull request #24228 from nextcloud/backport/24135/stable20
Morris Jobke [Fri, 20 Nov 2020 13:23:00 +0000 (14:23 +0100)]
Merge pull request #24228 from nextcloud/backport/24135/stable20

[stable20] Fix nextcloud logo in email notifications misalignment

4 years agoHarden EncryptionLegacyCipher a bit 24249/head
Roeland Jago Douma [Fri, 20 Nov 2020 08:46:31 +0000 (09:46 +0100)]
Harden EncryptionLegacyCipher a bit

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
4 years agoMerge pull request #24239 from nextcloud/backport/24203/stable20
Roeland Jago Douma [Fri, 20 Nov 2020 09:15:04 +0000 (10:15 +0100)]
Merge pull request #24239 from nextcloud/backport/24203/stable20

[stable20] Use regex when searching on single file shares

4 years agoMerge pull request #24231 from nextcloud/backport/23757/stable20
Roeland Jago Douma [Fri, 20 Nov 2020 09:04:54 +0000 (10:04 +0100)]
Merge pull request #24231 from nextcloud/backport/23757/stable20

[stable20] use file name instead of path in 'not allowed to share' message

4 years agoMerge pull request #24232 from nextcloud/backport/24211/stable20
Roeland Jago Douma [Fri, 20 Nov 2020 09:04:30 +0000 (10:04 +0100)]
Merge pull request #24232 from nextcloud/backport/24211/stable20

[stable20] Fix setting images through occ for theming

4 years agoLimit shared cache search if it is just a file 24239/head
Roeland Jago Douma [Thu, 19 Nov 2020 08:14:29 +0000 (09:14 +0100)]
Limit shared cache search if it is just a file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 20 Nov 2020 02:20:19 +0000 (02:20 +0000)]
[tx-robot] updated from transifex

4 years agoFix setting images through occ for theming 24232/head
Julius Härtl [Thu, 19 Nov 2020 07:28:48 +0000 (08:28 +0100)]
Fix setting images through occ for theming

Signed-off-by: Julius Härtl <jus@bitgrid.net>
4 years agouse file name instead of path in 'not allowed to share' message 24231/head
Robin Appelman [Wed, 28 Oct 2020 15:00:49 +0000 (16:00 +0100)]
use file name instead of path in 'not allowed to share' message

Signed-off-by: Robin Appelman <robin@icewind.nl>
4 years agoallow selecting multiple columns with SELECT DISTINCT 24230/head
Robin Appelman [Mon, 9 Nov 2020 16:43:29 +0000 (17:43 +0100)]
allow selecting multiple columns with SELECT DISTINCT

Signed-off-by: Robin Appelman <robin@icewind.nl>
4 years agoFix #23357 24228/head
medcloud [Sat, 14 Nov 2020 15:19:44 +0000 (16:19 +0100)]
Fix #23357

Signed-off-by: medcloud <42641918+medcloud@users.noreply.github.com>
4 years agoMerge pull request #24181 from nextcloud/backport/24102/stable20
Roeland Jago Douma [Thu, 19 Nov 2020 09:40:11 +0000 (10:40 +0100)]
Merge pull request #24181 from nextcloud/backport/24102/stable20

[stable20] Check quota of subdirectories when uploading to them

4 years agoMerge pull request #24196 from nextcloud/backport/24098/stable20
Roeland Jago Douma [Thu, 19 Nov 2020 09:09:45 +0000 (10:09 +0100)]
Merge pull request #24196 from nextcloud/backport/24098/stable20

[stable20] circleId too short in some request

4 years agoMerge pull request #24212 from nextcloud/backport/24207/stable20
Roeland Jago Douma [Thu, 19 Nov 2020 08:50:32 +0000 (09:50 +0100)]
Merge pull request #24212 from nextcloud/backport/24207/stable20

[stable20] missing level in ScopedPsrLogger

4 years agomissing level 24212/head
Maxence Lange [Wed, 18 Nov 2020 19:30:07 +0000 (18:30 -0100)]
missing level

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 19 Nov 2020 02:20:21 +0000 (02:20 +0000)]
[tx-robot] updated from transifex

4 years agoMerge pull request #24172 from nextcloud/version/20.0.2/final v20.0.2
Roeland Jago Douma [Wed, 18 Nov 2020 19:35:11 +0000 (20:35 +0100)]
Merge pull request #24172 from nextcloud/version/20.0.2/final

20.0.2

4 years agocircleId too short in some request 24196/head
Maxence Lange [Fri, 13 Nov 2020 09:58:54 +0000 (08:58 -0100)]
circleId too short in some request

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 18 Nov 2020 02:18:47 +0000 (02:18 +0000)]
[tx-robot] updated from transifex

4 years agoMerge pull request #24183 from nextcloud/revert-24178-backport/24098/stable20
Roeland Jago Douma [Tue, 17 Nov 2020 20:53:22 +0000 (21:53 +0100)]
Merge pull request #24183 from nextcloud/revert-24178-backport/24098/stable20

Revert "[stable20] circleId too short in some request"

4 years agoBump bundles 24181/head
Julius Härtl [Tue, 17 Nov 2020 18:47:56 +0000 (19:47 +0100)]
Bump bundles

Signed-off-by: Julius Härtl <jus@bitgrid.net>
4 years agoCheck for target folder available quota when uploading
Julius Härtl [Fri, 13 Nov 2020 11:46:12 +0000 (12:46 +0100)]
Check for target folder available quota when uploading

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>