Robin Appelman
a61a757b85
allow selecting multiple columns with SELECT DISTINCT
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-16 15:45:17 +01:00
Roeland Jago Douma
426dc68b45
Merge pull request #24069 from nextcloud/fix-default-internal-expiration-date
...
Fix default internal expiration date
2020-11-16 14:13:56 +01:00
Christoph Wurst
d0f738fd59
Merge pull request #24112 from nextcloud/bugfix/24099/setup-fs-before-query-storage-in-settings
...
Set up FS before querying storage info in settings
2020-11-16 11:46:22 +01:00
kesselb
17034866f5
Merge pull request #24146 from nextcloud/bugfix/24140/dont-throw-on-show-version-query
...
Don't throw on SHOW VERSION query
2020-11-16 09:56:51 +01:00
Daniel Calviño Sánchez
28c57004dd
Add integration tests for creating shares with default expiration dates
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 08:54:19 +01:00
Daniel Calviño Sánchez
4f5271acf9
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>
2020-11-16 08:54:19 +01:00
Daniel Calviño Sánchez
4d3cb1533e
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>
2020-11-16 08:54:19 +01:00
Daniel Calviño Sánchez
bcf0a69af4
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>
2020-11-16 08:54:18 +01:00
Joas Schilling
91a3e439cb
Don't throw on SHOW VERSION query
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16 08:43:48 +01:00
Nextcloud bot
0bed1c2bd0
[tx-robot] updated from transifex
2020-11-16 02:19:21 +00:00
Nextcloud bot
769f59ec65
[tx-robot] updated from transifex
2020-11-15 02:19:01 +00:00
dependabot-preview[bot]
bcd5376373
Merge pull request #24124 from nextcloud/dependabot/npm_and_yarn/dompurify-2.2.2
2020-11-14 16:51:52 +00:00
dependabot-preview[bot]
3116cb1445
Bump dompurify from 2.2.0 to 2.2.2
...
Bumps [dompurify](https://github.com/cure53/DOMPurify ) from 2.2.0 to 2.2.2.
- [Release notes](https://github.com/cure53/DOMPurify/releases )
- [Commits](https://github.com/cure53/DOMPurify/compare/2.2.0...2.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-14 16:12:21 +00:00
John Molakvoæ
08bde8e411
Merge pull request #24126 from nextcloud/dependabot/npm_and_yarn/core-js-3.7.0
...
Bump core-js from 3.6.5 to 3.7.0
2020-11-14 16:55:02 +01:00
dependabot-preview[bot]
ffeace3e1d
Bump core-js from 3.6.5 to 3.7.0
...
Bumps [core-js](https://github.com/zloirock/core-js ) from 3.6.5 to 3.7.0.
- [Release notes](https://github.com/zloirock/core-js/releases )
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zloirock/core-js/compare/v3.6.5...v3.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-14 14:51:32 +00:00
dependabot-preview[bot]
a0c93cc8e6
Merge pull request #24127 from nextcloud/dependabot/npm_and_yarn/nextcloud-vue-collections-0.9.0
2020-11-14 14:27:02 +00:00
dependabot-preview[bot]
104b4fa2af
Bump nextcloud-vue-collections from 0.8.1 to 0.9.0
...
Bumps [nextcloud-vue-collections](https://github.com/juliushaertl/nextcloud-vue-collections ) from 0.8.1 to 0.9.0.
- [Release notes](https://github.com/juliushaertl/nextcloud-vue-collections/releases )
- [Commits](https://github.com/juliushaertl/nextcloud-vue-collections/compare/v0.8.1...v0.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-14 13:28:18 +00:00
dependabot-preview[bot]
ac5d73db96
Merge pull request #24122 from nextcloud/dependabot/npm_and_yarn/nextcloud/dialogs-3.1.1
2020-11-14 12:16:38 +00:00
dependabot-preview[bot]
9e17df8ced
Bump @nextcloud/dialogs from 3.0.0 to 3.1.1
...
Bumps [@nextcloud/dialogs](https://github.com/nextcloud/nextcloud-dialogs ) from 3.0.0 to 3.1.1.
- [Release notes](https://github.com/nextcloud/nextcloud-dialogs/releases )
- [Changelog](https://github.com/nextcloud/nextcloud-dialogs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/nextcloud/nextcloud-dialogs/compare/v3.0.0...v3.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-14 11:34:58 +00:00
dependabot-preview[bot]
815173b87c
Merge pull request #24119 from nextcloud/dependabot/npm_and_yarn/nextcloud/vue-3.2.0
2020-11-14 11:15:23 +00:00
dependabot-preview[bot]
299874dcd9
Bump @nextcloud/vue from 3.1.0 to 3.2.0
...
Bumps [@nextcloud/vue](https://github.com/nextcloud/nextcloud-vue ) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/nextcloud/nextcloud-vue/releases )
- [Commits](https://github.com/nextcloud/nextcloud-vue/compare/v3.1.0...v3.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-14 10:35:24 +00:00
John Molakvoæ
973482c834
Merge pull request #24118 from nextcloud/dependabot/npm_and_yarn/babel-loader-8.2.1
...
Bump babel-loader from 8.1.0 to 8.2.1
2020-11-14 10:22:21 +01:00
John Molakvoæ
4d17b6ae37
Merge pull request #24123 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.4.0
...
Bump webpack-merge from 5.2.0 to 5.4.0
2020-11-14 10:20:31 +01:00
dependabot-preview[bot]
0d05693f39
Merge pull request #24125 from nextcloud/dependabot/npm_and_yarn/eslint-plugin-standard-4.1.0
2020-11-14 09:20:21 +00:00
dependabot-preview[bot]
3503c94f33
Merge pull request #24120 from nextcloud/dependabot/npm_and_yarn/sass-loader-10.1.0
2020-11-14 09:19:57 +00:00
Roeland Jago Douma
c78fbbdb55
Merge pull request #24130 from nextcloud-pr-bot/automated/noid/psalm-baseline-update
...
[Automated] Update psalm-baseline.xml
2020-11-14 09:50:04 +01:00
Nextcloud-PR-Bot
aa967d798c
Update psalm baseline
...
Signed-off-by: GitHub <noreply@github.com>
2020-11-14 04:21:44 +00:00
dependabot-preview[bot]
12783cfa29
Bump eslint-plugin-standard from 4.0.2 to 4.1.0
...
Bumps [eslint-plugin-standard](https://github.com/standard/eslint-plugin-standard ) from 4.0.2 to 4.1.0.
- [Release notes](https://github.com/standard/eslint-plugin-standard/releases )
- [Commits](https://github.com/standard/eslint-plugin-standard/compare/v4.0.2...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-14 02:22:09 +00:00
dependabot-preview[bot]
c72888c0bb
Bump webpack-merge from 5.2.0 to 5.4.0
...
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge ) from 5.2.0 to 5.4.0.
- [Release notes](https://github.com/survivejs/webpack-merge/releases )
- [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.2.0...v5.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-14 02:20:47 +00:00
Nextcloud bot
569c615383
[tx-robot] updated from transifex
2020-11-14 02:19:36 +00:00
dependabot-preview[bot]
502da39f11
Bump sass-loader from 10.0.5 to 10.1.0
...
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader ) from 10.0.5 to 10.1.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases )
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v10.0.5...v10.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-14 02:18:43 +00:00
dependabot-preview[bot]
2674cabf38
Bump babel-loader from 8.1.0 to 8.2.1
...
Bumps [babel-loader](https://github.com/babel/babel-loader ) from 8.1.0 to 8.2.1.
- [Release notes](https://github.com/babel/babel-loader/releases )
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel-loader/compare/v8.1.0...v8.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-14 02:16:48 +00:00
Christoph Wurst
cd270d49c0
Merge pull request #24096 from nextcloud/fix/contacts-interaction-card-resource-to-string
...
Convert the card resource to a string if necessary
2020-11-13 19:15:31 +01:00
Vincent Petry
2143f2bb82
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-13 17:06:37 +01:00
kesselb
fd76bf18ea
Merge pull request #24085 from nextcloud/fix/register-add-missing-primary-keys
...
Register new command db:add-missing-primary-keys
2020-11-13 15:39:03 +01:00
Greta
a4223b017e
Merge pull request #24023 from nextcloud/dependachristoph/npm_and_yarn/jquery-3.1.0
...
Bump jquery from 2.2.4 to 3.1.0
2020-11-13 14:42:46 +01:00
Julien Veyssier
2e91ccc6be
Merge pull request #23588 from nextcloud/enh/23558/override-dashboard-default-background
...
Override default dashboard background with theming one
2020-11-13 12:34:41 +01:00
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
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