Commit Graph

56523 Commits

Author SHA1 Message Date
Christoph Wurst cb5bb693de
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 09:10:35 +01:00
Christoph Wurst ae0a496da8
Bump jquery from 2.2.4 to 3.1.0
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-13 08:46:35 +01:00
Julius Härtl f4b036f249
Only attempt to move to trash if a file is not in appdata
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-13 08:30:35 +01:00
Julien Veyssier f5ef2d7d58 override default dashboard background with theming one
fix getAppValue default value in theming app
fix cacheBuster value injection

Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-13 06:51:26 +00:00
Roeland Jago Douma 25f8d76f26
Merge pull request #24088 from nextcloud-pr-bot/automated/noid/psalm-baseline-update
[Automated] Update psalm-baseline.xml
2020-11-13 07:25:36 +01:00
Nextcloud-PR-Bot 05cd789e9d Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2020-11-13 04:22:06 +00:00
Nextcloud bot fe5482e2f5
[tx-robot] updated from transifex 2020-11-13 02:19:24 +00:00
MichaIng 7224db548d
Register new command db:add-missing-primary-keys
Introduced with: d5df033ede

Signed-off-by: MichaIng <micha@dietpi.com>
2020-11-13 00:02:05 +01:00
Julius Härtl 35be4fdb01
Merge pull request #24066 from nextcloud/fix/sharing/expiration-date-internal
Fix default internal expiration date enforce
2020-11-12 21:57:19 +01:00
Julius Härtl 81070c753b
Merge pull request #24053 from nextcloud/bugfix/noid/fix-user-status-for-oracle 2020-11-12 21:43:31 +01:00
Morris Jobke 29b97468f8
Merge pull request #24072 from nextcloud/fix-storage-credential-migration
fix migration of oc_credentials table
2020-11-12 15:49:05 +01:00
Robin Appelman 6b8078a009
fix migration of oc_credentials table
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-12 15:03:21 +01:00
Daniel Calviño Sánchez baaaacd650 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>
2020-11-12 11:57:34 +01:00
Daniel Calviño Sánchez 578b57837a 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>
2020-11-12 11:57:34 +01:00
Daniel Calviño Sánchez 70018ddabf 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>
2020-11-12 11:57:32 +01:00
Daniel Calviño Sánchez 3a53c2b6e5 Fix unit test method name
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:31 +01:00
Daniel Calviño Sánchez e997f0fa46 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>
2020-11-12 11:57:31 +01:00
Daniel Calviño Sánchez 8f1fff40e8 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>
2020-11-12 11:57:29 +01:00
Daniel Calviño Sánchez ec92e82571 Add unit tests to enforce a relaxed default share expiration date
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:28 +01:00
Daniel Calviño Sánchez 4dbeab5cff Remove wrong and misleading comment
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:26 +01:00
Daniel Calviño Sánchez 72f51422ec Remove extra spaces
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:25 +01:00
Daniel Calviño Sánchez 7cfa2701b9 Fix typo in variable name
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:23 +01:00
Daniel Calviño Sánchez c8dc51f0ba Fix typos in method names
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-12 11:57:22 +01:00
Christoph Wurst 2f678e0aad
Merge pull request #24065 from nextcloud/enh/pimp_accessibilitycontroller
Pimp the accesibility controller
2020-11-12 08:32:21 +01:00
John Molakvoæ (skjnldsv) bd70dd739e
Fix default internal expiration date enforce
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-11-12 08:14:33 +01:00
Nextcloud bot 2d7d82f525
[tx-robot] updated from transifex 2020-11-12 02:19:24 +00:00
Morris Jobke 2b43644833
Merge pull request #24063 from nextcloud/techdebt/noid/switch-to-class-names-for-encryption-DI
Change to full class names for the encryption app DI in preparation of auto-wiring
2020-11-11 22:34:17 +01:00
Roeland Jago Douma f2ed6df9c4
Pimp the accesibility controller
* No usused members
* appRoot member
* less constructor args

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-11 22:26:40 +01:00
Roeland Jago Douma c2588b0b10
Merge pull request #24037 from nextcloud/enh/reflectionparamter_getclass_deprecatred
ReflectionParamter::getClass is deprecated
2020-11-11 21:53:55 +01:00
Morris Jobke 42a033bbc4
Change to full class names for the encryption app DI in preparation of auto-wiring
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-11 21:30:45 +01:00
Roeland Jago Douma 51a02c8009
ReflectionParamter::getClass is deprecated
In php8 this starts throwing warnings. And since we use it quite often
we flood the log. This moves it to getType which does the same. Only non
deprecated now.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-11 20:42:14 +01:00
Joas Schilling d7b5d4cb58
Revert "Revert "Installation goes brrrr"" 2020-11-11 20:12:13 +01:00
Morris Jobke fec679dd8d
Merge pull request #24060 from nextcloud/revert-24039-faster-installation
Revert "Installation goes brrrr"
2020-11-11 20:10:36 +01:00
Christoph Wurst d36155620c
Revert "Installation goes brrrr" 2020-11-11 17:40:12 +01:00
Morris Jobke 9db321cf11
Merge pull request #24054 from nextcloud/bugfix/noid/calendar-repair-oracle
Manually iterate over calendardata when oracle is used
2020-11-11 17:09:28 +01:00
Morris Jobke c27ed22488
Dump autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-11 16:49:37 +01:00
Julius Härtl e69655e9a6
Manually iterate over calendardata when oracle is used
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-11 15:08:43 +01:00
Joas Schilling 85ec5eb531
Also make direct_edit.accessed nullable
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-11 14:46:06 +01:00
Joas Schilling 7a1750af44
Make is_user_defined nullable so we can store false on oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-11 14:04:09 +01:00
Joas Schilling 48f1f961b9
Merge pull request #24039 from nextcloud/faster-installation
Installation goes brrrr
2020-11-11 13:27:40 +01:00
Morris Jobke 0c7bed26e8
Merge pull request #23915 from st3iny/fix/noid/png-icons-in-caldav-reminder-emails
Use png icons in caldav reminder emails
2020-11-11 12:45:23 +01:00
Morris Jobke 410e295d01
Merge pull request #24038 from nextcloud/techdebt/noid/remove-unused-static-methods-files_external
Remove unused and deprecated methods from files_external MountConfig
2020-11-11 12:41:04 +01:00
Joas Schilling 77713ab454
Don't create a schema to check if the migrations table exists
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-11 11:45:00 +01:00
Joas Schilling dde0e73c6b
Reduce the number of schemas we generate when we just run all migrations anyway
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-11 11:45:00 +01:00
Joas Schilling 7f45f90789
Only update the schema when we install anyway
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-11 11:40:51 +01:00
Julius Härtl 61496d3482
Merge pull request #24041 from nextcloud/techdebt/noid/remove-oc_hooks-for-group-management
Remove old OC_Hook for OC_Group events
2020-11-11 11:17:31 +01:00
Joas Schilling e39d657e24
Merge pull request #23882 from nextcloud/tests/oracle
Run unit tests against oracle
2020-11-11 10:05:24 +01:00
Julius Härtl cdfad9aaac
Merge pull request #24042 from nextcloud/fix-sharing-tab-state-not-matching-resharing-admin-settings 2020-11-11 09:28:23 +01:00
Nextcloud bot 0ee4f43048
[tx-robot] updated from transifex 2020-11-11 02:20:12 +00:00
Daniel Calviño Sánchez ee852d7e0e Add integration tests for default share permissions
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-11 02:31:25 +01:00