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
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
Morris Jobke
6a5b921284
Merge pull request #23950 from nextcloud/backport/23928/stable20
...
[stable20] Fix repair mimetype step to not leave stray cursors
2020-11-10 13:46:15 +01:00
Morris Jobke
cecf579e81
Update psalm-baseline.xml to accept new errors
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-10 13:43:51 +01:00
Joas Schilling
5f3d62600e
Fix repair mimetype step to not leave stray cursors
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 10:27:09 +01:00
Morris Jobke
73c2ad293b
Merge pull request #23998 from nextcloud/backport/23937/stable20
...
[stable20] Use query builder instead of OC_DB in OC\Files\*
2020-11-10 10:26:04 +01:00
Morris Jobke
bf6aa03eb3
Merge pull request #23995 from nextcloud/backport/23741/stable20
...
[stable20] Unlock when promoting to exclusive lock fails
2020-11-10 10:16:34 +01:00
Roeland Jago Douma
8edc29bfef
Merge pull request #23955 from nextcloud/backport/23938/stable20
...
[stable20] Replace some usages of OC_DB in OC\Share\* with query builder
2020-11-10 08:59:54 +01: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
Roeland Jago Douma
c1e43efa35
Merge pull request #24001 from nextcloud/backport/23889/stable20
...
[stable20] Shortcut to avoid file system setup when generating the logo URL
2020-11-09 19:55:38 +01:00
Roeland Jago Douma
0d52ba6239
Merge pull request #24004 from nextcloud/backport/23999/stable20
...
[stable20] Remove old legacy scripts references
2020-11-09 19:38:21 +01:00
John Molakvoæ
559acf83ed
Removed config.js
2020-11-09 16:01:06 +00:00
John Molakvoæ
750455399d
Remove old legacy search script
2020-11-09 16:01:05 +00:00
Morris Jobke
1a26b63246
Merge pull request #23996 from nextcloud/backport/23982/stable20
...
[stable20] Make sure root storage is valid before checking its size
2020-11-09 15:37:24 +01: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
Joas Schilling
adcc942553
Use query builder instead of OC_DB in OC\Files\*
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-09 11:01:09 +00:00
John Molakvoæ (skjnldsv)
0c4297cee9
Make sure root storage is valid before checking its size
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-11-09 10:05:54 +00:00
Ashod Nakashian
7298d037b2
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>
2020-11-09 10:03:15 +00: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
Morris Jobke
f28c436fd5
Check in failing psalm checks
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-09 10:21:05 +01:00
Morris Jobke
40c4d24e31
Merge pull request #23975 from nextcloud/backport/23923/stable20
...
[stable20] Fix greatest/least order for oracle
2020-11-09 10:17:11 +01:00
Daniel Kesselberg
a01da78f1d
Add explicit typecast for $value.
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-11-09 10:13:36 +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
b3dfa9290d
Update parameters
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-07 15:57:47 +00:00
Joas Schilling
2e3cffc53b
Make sure Oracle always casts everything in the best way
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-07 15:57:46 +00:00
Joas Schilling
c71cc6824e
Use Query builder function
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-07 15:57:45 +00:00
Joas Schilling
d111e88d4c
Fix order of GREATEST for Oracle
...
As per https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions060.htm
Oracle uses the first value to cast the rest or the values.
So when the first value is a plain int, instead of doing the math,
it will cast the expression to int and continue with a potential 0.
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-07 15:57:44 +00:00
Roeland Jago Douma
71de05f775
Merge pull request #23951 from nextcloud/backport/23922/stable20
...
[stable20] Improve query type detection
2020-11-07 10:49:06 +01: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
Roeland Jago Douma
bac92bb814
Merge pull request #23954 from nextcloud/backport/23943/stable20
...
[stable20] Fix iLike() falsely turning escaped % and _ into wildcards
2020-11-07 09:18:23 +01:00
Roeland Jago Douma
a5c6abc93a
Merge pull request #23948 from nextcloud/backport/23940/stable20
...
[stable20] Skip already loaded apps in loadApps
2020-11-07 07:59:52 +01:00
Nextcloud bot
c9f3f2563f
[tx-robot] updated from transifex
2020-11-07 02:19:08 +00:00
Joas Schilling
73a09a4f54
Replace some usages of OC_DB in OC\Share\* with query builder
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 21:43:46 +00:00
Joas Schilling
3a7e2fbff1
Fix iLike() falsely turning escaped % and _ into wildcards
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 21:29:48 +00:00
Morris Jobke
f8b550dab7
Merge pull request #23935 from nextcloud/backport/23921/stable20
...
[stable20] Fix casting of integer and boolean on Oracle
2020-11-06 22:24:31 +01:00
Joas Schilling
3ffd31353c
Improve query type detection
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 21:20:44 +00:00
Morris Jobke
a2c9915ca4
Merge pull request #23924 from nextcloud/backport/23920/stable20
...
[stable20] Bearer must be in the start of the auth header
2020-11-06 22:10:01 +01:00
Roeland Jago Douma
ef5cee12d1
Skip already loaded apps in loadApps
...
Otherwise you might end up calling a lot of functions unneeded.
And while the individual calls are cheap if you multiply them by 20k
they still get somewhat expensive.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-06 21:01:12 +00:00
Joas Schilling
990bb07002
Cast bool things to numbers as that is how they are stored in the database
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 13:36:57 +01:00
Joas Schilling
2b0b57d304
Fix casting to integer on Oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 10:42:15 +00:00
Roeland Jago Douma
93211e7ded
Merge pull request #23917 from nextcloud/backport/23887/stable20
...
[stable20] Do not emit UserCreatedEvent twice
2020-11-06 10:55:41 +01:00
Roeland Jago Douma
c9bf32b454
Bearer must be in the start of the auth header
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-06 08:21:30 +00:00
Nextcloud bot
43a80714a7
[tx-robot] updated from transifex
2020-11-06 02:19:21 +00:00