Commit Graph

23504 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
essys 8d44a1006a Update ScanLegacyFormat.php
Fixed a small typo on line 99.
2020-11-20 19:42:37 +00: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 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 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
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
Nextcloud bot 6a4ced077e
[tx-robot] updated from transifex 2020-11-19 02:20:21 +00:00
Maxence Lange d4ea5fd63f circleId too short in some request
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2020-11-18 07:57:22 +00:00
Nextcloud bot c03db79569
[tx-robot] updated from transifex 2020-11-18 02:18:47 +00:00
Julius Härtl 8c7030e0bd
Bump bundles
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-17 19:47:56 +01:00
Julius Härtl 892bb8cae5
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>
2020-11-17 15:33:54 +01:00
Christoph Wurst 1941f1b1a8
Revert "[stable20] circleId too short in some request" 2020-11-17 14:20:02 +01:00
Maxence Lange 6db68e9ba3 circleId too short in some request
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2020-11-17 10:28:24 +00:00
Nextcloud bot 51d8134e50
[tx-robot] updated from transifex 2020-11-17 02:18:36 +00:00
Roeland Jago Douma b14ec966c1
Merge pull request #24156 from nextcloud/backport/24112/stable20
[stable20] Set up FS before querying storage info in settings
2020-11-16 14:14:43 +01:00
Vincent Petry 32758894a4 Set up FS before querying storage info in settings
The personal info section of the personal settings is querying the
storage quota information. For this it requires the FS to be setup which
is not always guaranteed.

This fixes an issue where refreshing the settings page would cause it to
fail after Redis caches are full. It is likely that when Redis cache is
populated, some code path is initializing the FS, so it works so far.
But when the cache is populated, that code path is skipped so the FS is
not guaranteed to be setup...

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-11-16 11:06:35 +00:00
Julius Härtl 889d162ab7
Bump bundles
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-16 11:36:35 +01:00
Joas Schilling 7a821da1bc
Merge pull request #24079 from nextcloud/backport/24053/stable20
[stable20] Make is_user_defined nullable so we can store false on oracle
2020-11-16 11:23:17 +01:00
John Molakvoæ 18f5ad1a34
Merge pull request #24114 from nextcloud/backport/24096/stable20
[stable20] Convert the card resource to a string if necessary
2020-11-16 10:15:18 +01:00
Joas Schilling 9b694e59f5
Bump versions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16 08:54:30 +01:00
Nextcloud bot 9abc65c573
[tx-robot] updated from transifex 2020-11-16 02:19:33 +00:00
Nextcloud bot c9001eb7ef
[tx-robot] updated from transifex 2020-11-15 02:19:11 +00:00
Nextcloud bot 66b6ccc69e
[tx-robot] updated from transifex 2020-11-14 02:19:47 +00:00
Christoph Wurst 07861fe52d Convert the card resource to a string if necessary
Apparently the fetched column can be a string or resource. Hence we have
to catch the resource type and convert it to a string.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-13 18:18:24 +00:00
John Molakvoæ (skjnldsv) 680853d077 Fix default internal expiration date enforce
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-13 06:31:16 +00:00
Joas Schilling 32d7459d8b Make is_user_defined nullable so we can store false on oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 20:46:55 +00:00
Joas Schilling cd76043691
Fix CS
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:52 +01:00
Joas Schilling bb52911d16
Create primary keys on all tables and add a command to create the afterwards
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:52 +01:00
Joas Schilling b6ce689e25
Fix public calendars as they are stored with null on oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:51 +01:00
Joas Schilling 8ff0523c3d
Make sure columns with an empty default are nullable for Oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:51 +01:00
Joas Schilling fcef3c0e8a
Fix "Invalid fetch style: 12" on Oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:51 +01:00
Joas Schilling 48c2f6d5a0
Make the test pass on repeating calls
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:51 +01:00
Nextcloud bot 140068e91d
[tx-robot] updated from transifex 2020-11-12 02:19:35 +00:00
Roeland Jago Douma a0f95cd1d3
Merge pull request #24058 from nextcloud/backport/24054/stable20
[stable20] Manually iterate over calendardata when oracle is used
2020-11-11 21:54:55 +01:00
Roeland Jago Douma 8270aed206
Merge pull request #24050 from nextcloud/backport/23915/stable20
[stable20] Use png icons in caldav reminder emails
2020-11-11 21:27:53 +01:00
Julius Härtl bf0dbffe81 Manually iterate over calendardata when oracle is used
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-11 16:12:25 +00:00
Morris Jobke bcb6a71548
Merge pull request #24044 from nextcloud/backport/24042/stable20
[stable20] Fix sharing tab state not matching resharing admin settings
2020-11-11 13:45:46 +01:00
Richard Steinmetz b82b3b0140 Use png icons in caldav reminder emails
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2020-11-11 12:38:21 +00:00
Daniel Calviño Sánchez bafab8af2d Disable share input for a received share if resharing is not allowed
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-11 11:51:26 +01:00
Daniel Calviño Sánchez c034dff408 Do not show "Can reshare" in the menu if resharing is not allowed
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-11 11:51:18 +01:00
Joas Schilling 60ca39bb53
Merge pull request #24033 from nextcloud/backport/23993/stable20
[stable20] Don't leave cursors open
2020-11-11 10:56:53 +01:00
Nextcloud bot 3d3cebc321
[tx-robot] updated from transifex 2020-11-11 02:20:23 +00:00
Joas Schilling 19816fe85f Don't leave cursors open when tests fail
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 14:18:02 +00:00
John Molakvoæ 7032c880f0
Merge pull request #24012 from nextcloud/backport/23981/stable20
[stable20] Fix js search in undefined ocs response
2020-11-10 07:00:19 +01:00
Nextcloud bot 34fae53598
[tx-robot] updated from transifex 2020-11-10 02:18:56 +00:00
John Molakvoæ (skjnldsv) 49676d909b Fix js search in undefined ocs response
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-09 19:28:15 +00:00
Morris Jobke cc777911c2 Shortcut to avoid file system setup when generating the logo URL
If an SVG is requested and the app config value for logoMime is set then the logo is there. Otherwise we need to check it and maybe also generate a PNG from the SVG (that's done in getImage() which needs to be called then).

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-09 13:13:31 +00:00
Morris Jobke 3459db0472
Merge pull request #23992 from nextcloud/backport/23574/stable20
[stable20] Fix link share label placeholder not showing
2020-11-09 14:10:41 +01:00
Morris Jobke 20885847c8
Merge pull request #23971 from nextcloud/backport/23936/stable20
[stable20] Use query builder instead of OC_DB in trashbin
2020-11-09 10:27:29 +01:00
Gary Kim baf06b9894 Fix link share label placeholder not showing
Signed-off-by: Gary Kim <gary@garykim.dev>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-09 08:29:05 +00:00
Nextcloud bot 0624ca3527
[tx-robot] updated from transifex 2020-11-09 02:19:02 +00:00
Nextcloud bot d34145f942
[tx-robot] updated from transifex 2020-11-08 02:18:33 +00:00
Joas Schilling ef22580a32 Use query builder instead of OC_DB in trashbin
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-07 09:21:46 +00:00
Nextcloud bot c9f3f2563f
[tx-robot] updated from transifex 2020-11-07 02:19:08 +00:00
Nextcloud bot 43a80714a7
[tx-robot] updated from transifex 2020-11-06 02:19:21 +00:00
GretaD 6787f5de50 Add default font size
Signed-off-by: GretaD <gretadoci@gmail.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-05 08:40:28 +00:00
Nextcloud bot 841801b9ac
[tx-robot] updated from transifex 2020-11-05 02:18:59 +00:00
Morris Jobke e30c80c490
Merge pull request #23894 from nextcloud/backport/23799/stable20-minimal
[stable20] fix potentially passing null to events where IUser is expected
2020-11-04 21:14:51 +01:00
Morris Jobke 5e4debcd98
Merge pull request #23899 from nextcloud/backport/23898/stable20
[stable20] Make user status styles scoped
2020-11-04 19:34:55 +01:00
Morris Jobke cea90b9dcb
Merge pull request #23900 from nextcloud/backport/23897/stable20
[stable20] Move help to separate stylesheet
2020-11-04 19:34:44 +01:00
Julius Härtl 2386f8e1cc Make user status styles scoped
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-04 14:51:48 +00:00
John Molakvoæ 54fd9bfecf
Merge pull request #23884 from nextcloud/backport/23097/stable20
[stable20] Restrict query when searching for versions of trashbin files
2020-11-04 15:40:32 +01:00
Julius Härtl 0d457ce76d Move help to separate stylesheet
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-04 14:34:33 +00:00