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
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
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
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
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
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
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
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
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
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
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
a1d79b2b2b
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 01:35:10 +01:00
Morris Jobke
f771205f5f
Remove unused and deprecated methods from files_external MountConfig
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-10 22:38:10 +01:00
Daniel Calviño Sánchez
9218dfb975
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-10 22:30:37 +01:00
Joas Schilling
264d54b388
Fix CS
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 15:43:34 +01:00
Joas Schilling
d5df033ede
Create primary keys on all tables and add a command to create the afterwards
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 15:36:27 +01:00
Joas Schilling
31e243be74
Fix public calendars as they are stored with null on oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 15:35:16 +01:00
Joas Schilling
ecbb066dec
Make sure columns with an empty default are nullable for Oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 15:35:16 +01:00
Joas Schilling
609c8a9cf8
Fix "Invalid fetch style: 12" on Oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 15:35:14 +01:00
Joas Schilling
39131519b2
Make the test pass on repeating calls
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 15:34:35 +01:00
Morris Jobke
f23c2162ad
Merge pull request #23993 from nextcloud/bugfix/noid/close-cursors
...
Don't leave cursors open
2020-11-10 15:15:03 +01:00
eleith
10aa22dd45
Merge pull request #23070 from eleith/complex-recurrance-imports
...
handle vcalander documents with multiple VEVENTS not in order
2020-11-10 05:20:56 -08:00
Nextcloud bot
98d1a3f34c
[tx-robot] updated from transifex
2020-11-10 02:18:44 +00:00
Morris Jobke
92ddaeaf4c
Merge pull request #23981 from nextcloud/fix/sharing/undefined-in-search
...
Fix js search in undefined ocs response
2020-11-09 19:41:56 +01:00
Morris Jobke
5076a019e2
Merge pull request #23889 from nextcloud/fix/noid/shortcut-to-avoid-filesystem-setup
...
Shortcut to avoid file system setup when generating the logo URL
2020-11-09 14:11:15 +01:00
John Molakvoæ (skjnldsv)
53e56b4d56
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 12:30:43 +01:00
Joas Schilling
8027dcbc6f
Don't leave cursors open when tests fail
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-09 12:28:17 +01:00
Morris Jobke
46002a46a6
Merge pull request #23933 from nextcloud/bugfix/noid/user-ldap-ocdb
...
Use query builder instead of OC_DB in user_ldap
2020-11-09 10:07:25 +01:00
Morris Jobke
c7ff0c71b4
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 10:01:34 +01:00
John Molakvoæ
05d3326664
Merge pull request #23574 from nextcloud/fix/23569
...
Fix link share label placeholder not showing
2020-11-09 09:14:21 +01:00
Joas Schilling
3f370f3732
Test requires the DB
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-09 08:40:00 +01:00
Nextcloud bot
f5be2c722a
[tx-robot] updated from transifex
2020-11-09 02:18:51 +00:00
Nextcloud bot
2b2af705f7
[tx-robot] updated from transifex
2020-11-08 02:18:22 +00:00
Gary Kim
25d260838b
Fix link share label placeholder not showing
...
Signed-off-by: Gary Kim <gary@garykim.dev>
2020-11-07 20:27:29 -05:00
Richard Steinmetz
f1c242c71d
Use png icons in caldav reminder emails
...
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2020-11-07 14:09:22 +01:00
dependabot-preview[bot]
e063824f17
Bump node-sass from 4.14.1 to 5.0.0
...
Bumps [node-sass](https://github.com/sass/node-sass ) from 4.14.1 to 5.0.0.
- [Release notes](https://github.com/sass/node-sass/releases )
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/node-sass/compare/v4.14.1...v5.0.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-07 11:25:57 +00:00
John Molakvoæ
e90e499c8b
Merge pull request #23936 from nextcloud/bugfix/noid/trashbin-ocdb
...
Use query builder instead of OC_DB in trashbin
2020-11-07 10:19:23 +01:00
Nextcloud bot
1d203b0fb9
[tx-robot] updated from transifex
2020-11-07 02:18:58 +00:00
Morris Jobke
1a30e4d28f
Merge pull request #23821 from nextcloud/td/enh/no_fs_setup_by_default
...
Do not setup the default FS on normal routes
2020-11-06 23:03:09 +01:00
Joas Schilling
e52925c5fb
Use query builder instead of OC_DB in trashbin
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 22:33:59 +01:00