666ad85b63
Merge pull request #24171 from nextcloud/version/19.0.5/final
...
19.0.5
2020-11-18 20:15:47 +01:00
b19fb24178
[tx-robot] updated from transifex
2020-11-18 02:18:55 +00:00
29f8e6df44
Merge pull request #24184 from nextcloud/revert-24177-backport/24098/stable19
...
Revert "[stable19] circleId too short in some request"
2020-11-17 21:53:27 +01:00
751aa3f6b7
Revert "[stable19] circleId too short in some request"
2020-11-17 14:21:06 +01:00
8a710c8837
Merge pull request #24177 from nextcloud/backport/24098/stable19
...
[stable19] circleId too short in some request
2020-11-17 13:32:20 +01:00
abb05a5b1f
circleId too short in some request
...
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2020-11-17 10:25:43 +00:00
b57234acce
19.0.5
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-17 09:39:27 +01:00
ec4a226342
[tx-robot] updated from transifex
2020-11-17 02:18:44 +00:00
55e15f0221
Merge pull request #24092 from nextcloud/version/19.0.5/RC2
...
19.0.5 RC2
2020-11-16 19:43:50 +01:00
47ee460f86
Merge pull request #24160 from nextcloud/backport/24069/stable19
...
[stable19] Fix default internal expiration date
2020-11-16 19:17:46 +01:00
8de8bd2326
Merge pull request #24076 from nextcloud/backport/23741/stable19
...
[stable19] Unlock when promoting to exclusive lock fails
2020-11-16 17:07:05 +01:00
fd3db61cff
Merge pull request #24111 from J0WI/backport/23239/stable19
...
[stable19] Fix password visibility toggles
2020-11-16 16:03:33 +01:00
4e094b71b6
Add integration tests for creating shares with default expiration dates
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:20:19 +00:00
8832d15069
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 13:20:16 +00:00
a50132e4e1
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 13:20:13 +00:00
dd70a20da0
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 13:20:11 +00:00
ca133ea2cc
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-16 13:20:08 +00:00
16b1b655cf
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-16 13:20:05 +00:00
1aed476937
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-16 13:20:02 +00:00
2e0352182b
Fix unit test method name
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:19:59 +00:00
e13c5ece4f
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-16 13:19:56 +00:00
42782ceeba
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-16 13:19:53 +00:00
94648f1ecd
Add unit tests to enforce a relaxed default share expiration date
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:19:51 +00:00
24f067bdaf
Remove wrong and misleading comment
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:19:48 +00:00
9e84664f21
Remove extra spaces
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:19:45 +00:00
53e73dc46f
Fix typo in variable name
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:19:42 +00:00
bd431e2e59
Fix typos in method names
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:19:39 +00:00
f819df132c
Fix password visibility toggles
...
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-16 12:36:40 +00:00
67f58b9c5f
Merge pull request #24155 from nextcloud/dependencies/stable19/dompurify
...
[stable19] Bump dompurify to 2.2.2
2020-11-16 12:50:51 +01:00
7057e05ff2
Merge pull request #24080 from nextcloud/backport/24066/stable19
...
[stable19] Fix default internal expiration date enforce
2020-11-16 12:22:02 +01:00
20b3025022
Merge pull request #24115 from nextcloud/backport/24096/stable19
...
[stable19] Convert the card resource to a string if necessary
2020-11-16 12:15:15 +01:00
cf04049aa6
Merge pull request #24148 from nextcloud/backport/24146/stable19
...
[stable19] Don't throw on SHOW VERSION query
2020-11-16 12:10:01 +01:00
d7a89e746c
Bump bundles
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-16 11:41:24 +01:00
9e2bc48512
Bump dompurify to 2.2.2
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-16 11:38:22 +01:00
eecac68459
Don't throw on SHOW VERSION query
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16 09:02:52 +00:00
587a2d4ad1
[tx-robot] updated from transifex
2020-11-16 02:19:41 +00:00
86913cb486
[tx-robot] updated from transifex
2020-11-15 02:19:19 +00:00
fa9b2278fa
[tx-robot] updated from transifex
2020-11-14 02:19:57 +00:00
a4f6ceb862
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 18:21:22 +00:00
240e4f4050
19.0.5 RC2
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-13 08:42:46 +01:00
e132c0560b
Fix default internal expiration date enforce
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-13 07:32:01 +00:00
1953fccdc2
[tx-robot] updated from transifex
2020-11-13 02:19:44 +00:00
da7f445179
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-12 19:07:35 +00:00
9c59778ee1
Merge pull request #23990 from nextcloud/version/19.0.5/RC1
...
19.0.5 RC1
2020-11-12 15:54:34 +01:00
38b060628b
Merge pull request #23168 from nextcloud/backport/22913/stable19
...
[stable19] add mount point to quota warning message
2020-11-12 15:22:07 +01:00
b9db1cede3
Only use index of mount point when it is there
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 14:44:43 +01:00
565ae7d493
Fix unit tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-12 14:43:17 +01:00
f70abf4939
add mount point to quota warning message
...
makes it more clear to the user what the quota applies to
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-12 14:39:12 +01:00
4baf1868be
[tx-robot] updated from transifex
2020-11-12 02:19:43 +00:00
0f5ac14f43
Merge pull request #24048 from nextcloud/backport/23943/stable19
...
[stable19] Fix iLike() falsely turning escaped % and _ into wildcards
2020-11-11 21:53:24 +01:00
Roeland Jago Douma
Nextcloud bot
Christoph Wurst
Maxence Lange
Roeland Jago Douma
Julius Härtl
Daniel Calviño Sánchez
J0WI
Joas Schilling
Christoph Wurst
John Molakvoæ (skjnldsv)
Ashod Nakashian
Robin Appelman