]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
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 agoMerge pull request #24178 from nextcloud/backport/24098/stable20
Christoph Wurst [Tue, 17 Nov 2020 12:31:57 +0000 (13:31 +0100)]
Merge pull request #24178 from nextcloud/backport/24098/stable20

[stable20] circleId too short in some request

4 years agocircleId too short in some request 24178/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 [Tue, 17 Nov 2020 02:18:36 +0000 (02:18 +0000)]
[tx-robot] updated from transifex

4 years agoMerge pull request #24091 from nextcloud/version/20.0.2/rc2 v20.0.2RC2
Roeland Jago Douma [Mon, 16 Nov 2020 19:55:05 +0000 (20:55 +0100)]
Merge pull request #24091 from nextcloud/version/20.0.2/rc2

20.0.2 RC2

4 years agoMerge pull request #24159 from nextcloud/backport/24069/stable20
Daniel Calviño Sánchez [Mon, 16 Nov 2020 16:46:37 +0000 (17:46 +0100)]
Merge pull request #24159 from nextcloud/backport/24069/stable20

[stable20] Fix default internal expiration date

4 years agoAdd integration tests for creating shares with default expiration dates 24159/head
Daniel Calviño Sánchez [Thu, 12 Nov 2020 10:52:53 +0000 (11:52 +0100)]
Add integration tests for creating shares with default expiration dates

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoReset app configs by deleting the values instead of setting the defaults
Daniel Calviño Sánchez [Thu, 12 Nov 2020 10:51:37 +0000 (11:51 +0100)]
Reset app configs by deleting the values instead of setting the defaults

This avoids the need to keep the default values in the integration tests
in sync with the code, and also makes possible to reset values with
"dynamic" defaults (defaults that depend on other values).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoAdd unit tests for "validateExpirationDateInternal"
Daniel Calviño Sánchez [Thu, 12 Nov 2020 10:50:16 +0000 (11:50 +0100)]
Add unit tests for "validateExpirationDateInternal"

They were copied and adjusted as needed from the tests for
"validateExpirationDate".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoFix default internal expiration date
Daniel Calviño Sánchez [Thu, 12 Nov 2020 10:49:40 +0000 (11:49 +0100)]
Fix default internal expiration date

The default expiration date for internal shares was set from the default
link expiration date instead of the internal one.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoAdd explicit time to test date for clarity
Daniel Calviño Sánchez [Thu, 12 Nov 2020 07:43:03 +0000 (08:43 +0100)]
Add explicit time to test date for clarity

This shows in a clearer way that the expected expiration date is the
original one, but without time.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoAdd unit test for expiration date with date and with default
Daniel Calviño Sánchez [Thu, 12 Nov 2020 08:35:34 +0000 (09:35 +0100)]
Add unit test for expiration date with date and with default

This adds back what was being actually tested in the unit test fixed in
the previous commit.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoFix unit test for expiration date without date but with default
Daniel Calviño Sánchez [Thu, 12 Nov 2020 08:34:58 +0000 (09:34 +0100)]
Fix unit test for expiration date without date but with default

The expiration date was explicitly given, so it was not testing what it
should. Moreover, "link_defaultExpDays" needs to be mapped when testing
the default value (even if it will just fallback to the value of
"shareapi_expire_after_n_days").

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoFix unit test method name
Daniel Calviño Sánchez [Thu, 12 Nov 2020 07:46:37 +0000 (08:46 +0100)]
Fix unit test method name

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoFix unit test for verifying enforced valid expiration date.
Daniel Calviño Sánchez [Thu, 12 Nov 2020 07:25:36 +0000 (08:25 +0100)]
Fix unit test for verifying enforced valid expiration date.

The enforced expiration date was not actually enabled, as for that
"shareapi_default_expire_date" needs to be explicitly set to "yes".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoFix unit test for verifying enforced expire date too far in the future
Daniel Calviño Sánchez [Wed, 11 Nov 2020 19:50:23 +0000 (20:50 +0100)]
Fix unit test for verifying enforced expire date too far in the future

The test should fail if no exception was thrown, and no exception was
thrown due to a missing configuration parameter. However, the use of
"addToAssertionCount(1)" made the test pass even if no exception was
thrown and, therefore, to silently fail.

Now the missing configuration parameter was added and the test will fail
if the expected exception is not thrown.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoAdd unit tests to enforce a relaxed default share expiration date
Daniel Calviño Sánchez [Wed, 11 Nov 2020 18:36:04 +0000 (19:36 +0100)]
Add unit tests to enforce a relaxed default share expiration date

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoRemove wrong and misleading comment
Daniel Calviño Sánchez [Wed, 11 Nov 2020 19:27:01 +0000 (20:27 +0100)]
Remove wrong and misleading comment

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoRemove extra spaces
Daniel Calviño Sánchez [Thu, 12 Nov 2020 08:38:20 +0000 (09:38 +0100)]
Remove extra spaces

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoFix typo in variable name
Daniel Calviño Sánchez [Wed, 11 Nov 2020 18:55:20 +0000 (19:55 +0100)]
Fix typo in variable name

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoFix typos in method names
Daniel Calviño Sánchez [Wed, 11 Nov 2020 18:34:26 +0000 (19:34 +0100)]
Fix typos in method names

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoMerge pull request #24156 from nextcloud/backport/24112/stable20
Roeland Jago Douma [Mon, 16 Nov 2020 13:14:43 +0000 (14:14 +0100)]
Merge pull request #24156 from nextcloud/backport/24112/stable20

[stable20] Set up FS before querying storage info in settings

4 years agoMerge pull request #24153 from nextcloud/dependencies/dompurify
John Molakvoæ [Mon, 16 Nov 2020 12:12:40 +0000 (13:12 +0100)]
Merge pull request #24153 from nextcloud/dependencies/dompurify

4 years agoMerge pull request #24147 from nextcloud/backport/24146/stable20
Roeland Jago Douma [Mon, 16 Nov 2020 11:08:56 +0000 (12:08 +0100)]
Merge pull request #24147 from nextcloud/backport/24146/stable20

[stable20] Don't throw on SHOW VERSION query

4 years agoSet up FS before querying storage info in settings 24156/head
Vincent Petry [Fri, 13 Nov 2020 15:52:08 +0000 (16:52 +0100)]
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>
4 years agoBump bundles 24153/head
Julius Härtl [Mon, 16 Nov 2020 10:36:35 +0000 (11:36 +0100)]
Bump bundles

Signed-off-by: Julius Härtl <jus@bitgrid.net>
4 years agoBump dompurify to 2.2.2
Julius Härtl [Mon, 16 Nov 2020 10:27:52 +0000 (11:27 +0100)]
Bump dompurify to 2.2.2

Signed-off-by: Julius Härtl <jus@bitgrid.net>
4 years agoMerge pull request #24079 from nextcloud/backport/24053/stable20
Joas Schilling [Mon, 16 Nov 2020 10:23:17 +0000 (11:23 +0100)]
Merge pull request #24079 from nextcloud/backport/24053/stable20

[stable20] Make is_user_defined nullable so we can store false on oracle

4 years agoMerge pull request #24114 from nextcloud/backport/24096/stable20
John Molakvoæ [Mon, 16 Nov 2020 09:15:18 +0000 (10:15 +0100)]
Merge pull request #24114 from nextcloud/backport/24096/stable20

[stable20] Convert the card resource to a string if necessary

4 years agoDon't throw on SHOW VERSION query 24147/head
Joas Schilling [Mon, 16 Nov 2020 07:43:48 +0000 (08:43 +0100)]
Don't throw on SHOW VERSION query

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoBump versions 24079/head
Joas Schilling [Mon, 16 Nov 2020 07:54:30 +0000 (08:54 +0100)]
Bump versions

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoMerge pull request #24106 from nextcloud/backport/24085/stable20
Joas Schilling [Mon, 16 Nov 2020 07:50:01 +0000 (08:50 +0100)]
Merge pull request #24106 from nextcloud/backport/24085/stable20

[stable20] Register new command db:add-missing-primary-keys

4 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 16 Nov 2020 02:19:33 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

4 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 15 Nov 2020 02:19:11 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

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

4 years agoConvert the card resource to a string if necessary 24114/head
Christoph Wurst [Fri, 13 Nov 2020 08:10:35 +0000 (09:10 +0100)]
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>
4 years agoRegister new command db:add-missing-primary-keys 24106/head
MichaIng [Thu, 12 Nov 2020 23:02:05 +0000 (00:02 +0100)]
Register new command db:add-missing-primary-keys

Introduced with: https://github.com/nextcloud/server/commit/d5df033ede1f2b19b87c365b1f808130023edf17

Signed-off-by: MichaIng <micha@dietpi.com>
4 years ago20.0.2 RC2 24091/head
Roeland Jago Douma [Fri, 13 Nov 2020 07:38:57 +0000 (08:38 +0100)]
20.0.2 RC2

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
4 years agoMerge pull request #24081 from nextcloud/backport/24066/stable20
Roeland Jago Douma [Fri, 13 Nov 2020 07:37:54 +0000 (08:37 +0100)]
Merge pull request #24081 from nextcloud/backport/24066/stable20

[stable20] Fix default internal expiration date enforce

4 years agoFix default internal expiration date enforce 24081/head
John Molakvoæ (skjnldsv) [Thu, 12 Nov 2020 07:10:28 +0000 (08:10 +0100)]
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>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 13 Nov 2020 02:19:35 +0000 (02:19 +0000)]
[tx-robot] updated from transifex

4 years agoDump autoloader
Morris Jobke [Wed, 11 Nov 2020 15:49:37 +0000 (16:49 +0100)]
Dump autoloader

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
4 years agoAlso make direct_edit.accessed nullable
Joas Schilling [Wed, 11 Nov 2020 13:46:06 +0000 (14:46 +0100)]
Also make direct_edit.accessed nullable

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoMake is_user_defined nullable so we can store false on oracle
Joas Schilling [Wed, 11 Nov 2020 13:04:09 +0000 (14:04 +0100)]
Make is_user_defined nullable so we can store false on oracle

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoMerge pull request #23989 from nextcloud/version/20.0.2/rc1 v20.0.2RC1
Roeland Jago Douma [Thu, 12 Nov 2020 20:08:19 +0000 (21:08 +0100)]
Merge pull request #23989 from nextcloud/version/20.0.2/rc1

20.0.2 RC1

4 years ago20.0.2 RC1 23989/head
Roeland Jago Douma [Mon, 9 Nov 2020 08:00:05 +0000 (09:00 +0100)]
20.0.2 RC1

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
4 years agoMerge pull request #24049 from nextcloud/backport/23882/stable20
Morris Jobke [Thu, 12 Nov 2020 18:54:36 +0000 (19:54 +0100)]
Merge pull request #24049 from nextcloud/backport/23882/stable20

[stable20] Run unit tests against oracle

4 years agoUpdate psalm-baseline 24049/head
Morris Jobke [Thu, 12 Nov 2020 18:38:06 +0000 (19:38 +0100)]
Update psalm-baseline

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
4 years agofix migration of oc_credentials table
Robin Appelman [Thu, 12 Nov 2020 14:03:21 +0000 (15:03 +0100)]
fix migration of oc_credentials table

Signed-off-by: Robin Appelman <robin@icewind.nl>
4 years agoUpdate baseline, I'm sorry
Joas Schilling [Wed, 11 Nov 2020 09:56:29 +0000 (10:56 +0100)]
Update baseline, I'm sorry

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoFix unique key in test table
Joas Schilling [Tue, 10 Nov 2020 18:21:08 +0000 (19:21 +0100)]
Fix unique key in test table

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoFix naming of jobs and steps
Joas Schilling [Tue, 10 Nov 2020 17:49:02 +0000 (18:49 +0100)]
Fix naming of jobs and steps

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoFix CS
Joas Schilling [Tue, 10 Nov 2020 14:43:34 +0000 (15:43 +0100)]
Fix CS

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoCreate primary keys on all tables and add a command to create the afterwards
Joas Schilling [Tue, 10 Nov 2020 08:34:57 +0000 (09:34 +0100)]
Create primary keys on all tables and add a command to create the afterwards

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoReplace the credentials table with one that can have empty user
Joas Schilling [Tue, 10 Nov 2020 08:33:29 +0000 (09:33 +0100)]
Replace the credentials table with one that can have empty user

Primary key columns on Oracle can not have empty strings

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoDon't try to update on NotNullConstraintViolationException, only on unique or foreign key
Joas Schilling [Mon, 9 Nov 2020 16:33:32 +0000 (17:33 +0100)]
Don't try to update on NotNullConstraintViolationException, only on unique or foreign key

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoFix comparing the empty string for global credentials
Joas Schilling [Mon, 9 Nov 2020 16:33:05 +0000 (17:33 +0100)]
Fix comparing the empty string for global credentials

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoEmpty string is returned as null, but empty string in file cache is the root and...
Joas Schilling [Mon, 9 Nov 2020 15:26:09 +0000 (16:26 +0100)]
Empty string is returned as null, but empty string in file cache is the root and exists

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoFix public calendars as they are stored with null on oracle
Joas Schilling [Mon, 9 Nov 2020 09:40:55 +0000 (10:40 +0100)]
Fix public calendars as they are stored with null on oracle

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoMake sure columns with an empty default are nullable for Oracle
Joas Schilling [Mon, 9 Nov 2020 09:38:47 +0000 (10:38 +0100)]
Make sure columns with an empty default are nullable for Oracle

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoFix "Invalid fetch style: 12" on Oracle
Joas Schilling [Fri, 6 Nov 2020 13:13:11 +0000 (14:13 +0100)]
Fix "Invalid fetch style: 12" on Oracle

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoMake the test pass on repeating calls
Joas Schilling [Fri, 6 Nov 2020 13:12:40 +0000 (14:12 +0100)]
Make the test pass on repeating calls

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoSkip the insertIfNotExists() tests on Oracle because it doesn't work with clob
Joas Schilling [Wed, 4 Nov 2020 15:40:31 +0000 (16:40 +0100)]
Skip the insertIfNotExists() tests on Oracle because it doesn't work with clob

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoEasier debugging and spell fix
Joas Schilling [Wed, 4 Nov 2020 15:03:45 +0000 (16:03 +0100)]
Easier debugging and spell fix

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoUse a different column for the primary key as we can not insert it on oracle
Joas Schilling [Wed, 4 Nov 2020 15:02:58 +0000 (16:02 +0100)]
Use a different column for the primary key as we can not insert it on oracle

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoAdd github action for oci8
Julius Härtl [Tue, 3 Nov 2020 16:24:06 +0000 (17:24 +0100)]
Add github action for oci8

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

4 years agoMerge pull request #24058 from nextcloud/backport/24054/stable20
Roeland Jago Douma [Wed, 11 Nov 2020 20:54:55 +0000 (21:54 +0100)]
Merge pull request #24058 from nextcloud/backport/24054/stable20

[stable20] Manually iterate over calendardata when oracle is used

4 years agoMerge pull request #24050 from nextcloud/backport/23915/stable20
Roeland Jago Douma [Wed, 11 Nov 2020 20:27:53 +0000 (21:27 +0100)]
Merge pull request #24050 from nextcloud/backport/23915/stable20

[stable20] Use png icons in caldav reminder emails

4 years agoManually iterate over calendardata when oracle is used 24058/head
Julius Härtl [Wed, 11 Nov 2020 13:15:52 +0000 (14:15 +0100)]
Manually iterate over calendardata when oracle is used

Signed-off-by: Julius Härtl <jus@bitgrid.net>
4 years agoMerge pull request #24044 from nextcloud/backport/24042/stable20
Morris Jobke [Wed, 11 Nov 2020 12:45:46 +0000 (13:45 +0100)]
Merge pull request #24044 from nextcloud/backport/24042/stable20

[stable20] Fix sharing tab state not matching resharing admin settings

4 years agoUse png icons in caldav reminder emails 24050/head
Richard Steinmetz [Thu, 5 Nov 2020 17:18:40 +0000 (18:18 +0100)]
Use png icons in caldav reminder emails

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
4 years agoAdd integration tests for default share permissions 24044/head
Daniel Calviño Sánchez [Tue, 10 Nov 2020 21:17:04 +0000 (22:17 +0100)]
Add integration tests for default share permissions

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoAdd acceptance tests for reshares by link when resharing is disabled
Daniel Calviño Sánchez [Tue, 10 Nov 2020 21:16:50 +0000 (22:16 +0100)]
Add acceptance tests for reshares by link when resharing is disabled

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoAdd acceptance tests for reshares when resharing is disabled
Daniel Calviño Sánchez [Tue, 10 Nov 2020 21:16:10 +0000 (22:16 +0100)]
Add acceptance tests for reshares when resharing is disabled

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoDisable share input for a received share if resharing is not allowed
Daniel Calviño Sánchez [Tue, 10 Nov 2020 21:14:12 +0000 (22:14 +0100)]
Disable share input for a received share if resharing is not allowed

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoDo not show "Can reshare" in the menu if resharing is not allowed
Daniel Calviño Sánchez [Tue, 10 Nov 2020 21:13:48 +0000 (22:13 +0100)]
Do not show "Can reshare" in the menu if resharing is not allowed

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
4 years agoMerge pull request #24033 from nextcloud/backport/23993/stable20
Joas Schilling [Wed, 11 Nov 2020 09:56:53 +0000 (10:56 +0100)]
Merge pull request #24033 from nextcloud/backport/23993/stable20

[stable20] Don't leave cursors open

4 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 11 Nov 2020 02:20:23 +0000 (02:20 +0000)]
[tx-robot] updated from transifex

4 years agoDon't leave cursors open when tests fail 24033/head
Joas Schilling [Thu, 5 Nov 2020 09:50:53 +0000 (10:50 +0100)]
Don't leave cursors open when tests fail

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoMerge pull request #23950 from nextcloud/backport/23928/stable20
Morris Jobke [Tue, 10 Nov 2020 12:46:15 +0000 (13:46 +0100)]
Merge pull request #23950 from nextcloud/backport/23928/stable20

[stable20] Fix repair mimetype step to not leave stray cursors

4 years agoUpdate psalm-baseline.xml to accept new errors 23950/head
Morris Jobke [Tue, 10 Nov 2020 12:43:51 +0000 (13:43 +0100)]
Update psalm-baseline.xml to accept new errors

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
4 years agoFix repair mimetype step to not leave stray cursors
Joas Schilling [Fri, 6 Nov 2020 09:26:41 +0000 (10:26 +0100)]
Fix repair mimetype step to not leave stray cursors

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoMerge pull request #23998 from nextcloud/backport/23937/stable20
Morris Jobke [Tue, 10 Nov 2020 09:26:04 +0000 (10:26 +0100)]
Merge pull request #23998 from nextcloud/backport/23937/stable20

[stable20] Use query builder instead of OC_DB in OC\Files\*

4 years agoMerge pull request #23995 from nextcloud/backport/23741/stable20
Morris Jobke [Tue, 10 Nov 2020 09:16:34 +0000 (10:16 +0100)]
Merge pull request #23995 from nextcloud/backport/23741/stable20

[stable20] Unlock when promoting to exclusive lock fails

4 years agoMerge pull request #23955 from nextcloud/backport/23938/stable20
Roeland Jago Douma [Tue, 10 Nov 2020 07:59:54 +0000 (08:59 +0100)]
Merge pull request #23955 from nextcloud/backport/23938/stable20

[stable20] Replace some usages of OC_DB in OC\Share\* with query builder

4 years agoMerge pull request #24012 from nextcloud/backport/23981/stable20
John Molakvoæ [Tue, 10 Nov 2020 06:00:19 +0000 (07:00 +0100)]
Merge pull request #24012 from nextcloud/backport/23981/stable20

[stable20] Fix js search in undefined ocs response

4 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 10 Nov 2020 02:18:56 +0000 (02:18 +0000)]
[tx-robot] updated from transifex

4 years agoFix js search in undefined ocs response 24012/head
John Molakvoæ (skjnldsv) [Sat, 7 Nov 2020 22:29:23 +0000 (23:29 +0100)]
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>
4 years agoMerge pull request #24001 from nextcloud/backport/23889/stable20
Roeland Jago Douma [Mon, 9 Nov 2020 18:55:38 +0000 (19:55 +0100)]
Merge pull request #24001 from nextcloud/backport/23889/stable20

[stable20] Shortcut to avoid file system setup when generating the logo URL

4 years agoMerge pull request #24004 from nextcloud/backport/23999/stable20
Roeland Jago Douma [Mon, 9 Nov 2020 18:38:21 +0000 (19:38 +0100)]
Merge pull request #24004 from nextcloud/backport/23999/stable20

[stable20] Remove old legacy scripts references

4 years agoRemoved config.js 24004/head
John Molakvoæ [Mon, 9 Nov 2020 11:23:51 +0000 (12:23 +0100)]
Removed config.js

4 years agoRemove old legacy search script
John Molakvoæ [Mon, 9 Nov 2020 11:18:34 +0000 (12:18 +0100)]
Remove old legacy search script

4 years agoMerge pull request #23996 from nextcloud/backport/23982/stable20
Morris Jobke [Mon, 9 Nov 2020 14:37:24 +0000 (15:37 +0100)]
Merge pull request #23996 from nextcloud/backport/23982/stable20

[stable20] Make sure root storage is valid before checking its size

4 years agoShortcut to avoid file system setup when generating the logo URL 24001/head
Morris Jobke [Wed, 4 Nov 2020 08:59:32 +0000 (09:59 +0100)]
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>
4 years agoMerge pull request #23992 from nextcloud/backport/23574/stable20
Morris Jobke [Mon, 9 Nov 2020 13:10:41 +0000 (14:10 +0100)]
Merge pull request #23992 from nextcloud/backport/23574/stable20

[stable20] Fix link share label placeholder not showing

4 years agoUse query builder instead of OC_DB in OC\Files\* 23998/head
Joas Schilling [Fri, 6 Nov 2020 11:06:24 +0000 (12:06 +0100)]
Use query builder instead of OC_DB in OC\Files\*

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoMake sure root storage is valid before checking its size 23996/head
John Molakvoæ (skjnldsv) [Sat, 7 Nov 2020 23:10:06 +0000 (00:10 +0100)]
Make sure root storage is valid before checking its size

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
4 years agoUnlock when promoting to exclusive lock fails 23995/head
Ashod Nakashian [Wed, 28 Oct 2020 02:57:24 +0000 (22:57 -0400)]
Unlock when promoting to exclusive lock fails

In certain cases changeLock to EXCLUSIVE fails
and throws LockedException. This leaves the
file locked as SHARED in file_put_contents,
which prevents retrying (because on second
call file_put_contents takes another SHARED
lock on the same file, and changeLock doesn't
allow more than a single SHARED lock to promote
to EXCLUSIVE).

To avoid this case, we catch the LockedException
and unlock before re-throwing.

Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
4 years agoMerge pull request #23971 from nextcloud/backport/23936/stable20
Morris Jobke [Mon, 9 Nov 2020 09:27:29 +0000 (10:27 +0100)]
Merge pull request #23971 from nextcloud/backport/23936/stable20

[stable20] Use query builder instead of OC_DB in trashbin