bcb6a71548
Merge pull request #24044 from nextcloud/backport/24042/stable20
...
[stable20] Fix sharing tab state not matching resharing admin settings
2020-11-11 13:45:46 +01:00
b82b3b0140
Use png icons in caldav reminder emails
...
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2020-11-11 12:38:21 +00:00
487c603f95
Add integration tests for default share permissions
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-11 11:51:28 +01:00
f58174fdd8
Add acceptance tests for reshares by link when resharing is disabled
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-11 11:51:28 +01:00
7d7169fdbe
Add acceptance tests for reshares when resharing is disabled
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-11 11:51:28 +01:00
bafab8af2d
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 11:51:26 +01:00
c034dff408
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-11 11:51:18 +01:00
60ca39bb53
Merge pull request #24033 from nextcloud/backport/23993/stable20
...
[stable20] Don't leave cursors open
2020-11-11 10:56:53 +01:00
3d3cebc321
[tx-robot] updated from transifex
2020-11-11 02:20:23 +00:00
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
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
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
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
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
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
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
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
34fae53598
[tx-robot] updated from transifex
2020-11-10 02:18:56 +00:00
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
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
0d52ba6239
Merge pull request #24004 from nextcloud/backport/23999/stable20
...
[stable20] Remove old legacy scripts references
2020-11-09 19:38:21 +01:00
559acf83ed
Removed config.js
2020-11-09 16:01:06 +00:00
750455399d
Remove old legacy search script
2020-11-09 16:01:05 +00:00
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
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
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
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
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
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
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
f28c436fd5
Check in failing psalm checks
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-09 10:21:05 +01:00
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
a01da78f1d
Add explicit typecast for $value.
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-11-09 10:13:36 +01:00
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
0624ca3527
[tx-robot] updated from transifex
2020-11-09 02:19:02 +00:00
d34145f942
[tx-robot] updated from transifex
2020-11-08 02:18:33 +00:00
b3dfa9290d
Update parameters
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-07 15:57:47 +00:00
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
c71cc6824e
Use Query builder function
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-07 15:57:45 +00:00
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
71de05f775
Merge pull request #23951 from nextcloud/backport/23922/stable20
...
[stable20] Improve query type detection
2020-11-07 10:49:06 +01:00
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
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
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
c9f3f2563f
[tx-robot] updated from transifex
2020-11-07 02:19:08 +00:00
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
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
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
3ffd31353c
Improve query type detection
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 21:20:44 +00:00
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
Morris Jobke
Richard Steinmetz
Daniel Calviño Sánchez
Joas Schilling
Nextcloud bot
Joas Schilling
Roeland Jago Douma
John Molakvoæ
John Molakvoæ (skjnldsv)
Ashod Nakashian
Daniel Kesselberg
Gary Kim