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
e6dbc714de
Merge pull request #24052 from nextcloud/backport/23915/stable19
...
[stable19] Use png icons in caldav reminder emails
2020-11-11 21:27:45 +01:00
edcbab5c5c
Merge pull request #24057 from nextcloud/fix/stabl19/fix-php-cs-fixer
...
[stable19] Fix php-cs-fixer on stable19 by updating to a new minor version
2020-11-11 18:04:56 +01:00
a1fff88b64
Apply code style fixes
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-11 16:43:41 +01:00
e200c6f14b
Fix php-cs-fixer on stable19 by updating to a new minor version
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-11 16:22:21 +01:00
742ac0f4fe
Merge pull request #24045 from nextcloud/backport/24042/stable19
...
[stable19] Fix sharing tab state not matching resharing admin settings
2020-11-11 15:54:14 +01:00
a6e3bf6a59
Use png icons in caldav reminder emails
...
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2020-11-11 12:38:24 +00:00
3af171d634
Add integration tests for default share permissions
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-11 13:30:04 +01:00
505e1b279f
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 13:30:04 +01:00
a05bcfc4ca
Add acceptance tests for reshares when resharing is disabled
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-11 13:29:55 +01:00
3d9597619a
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 10:45:30 +01:00
02ac90b2c1
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 10:38:11 +01:00
d5dfaf42a8
Fix iLike() falsely turning escaped % and _ into wildcards
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-11 09:27:28 +00:00
b1efe1896b
[tx-robot] updated from transifex
2020-11-11 02:20:31 +00:00
ceedb95a6b
Merge pull request #23202 from nextcloud/backport/23182/stable19
...
[stable19] Fix the user email issue while creating a user
2020-11-10 08:51:35 +01:00
4cd66463dc
Merge pull request #24013 from nextcloud/backport/23981/stable19
...
[stable19] Fix js search in undefined ocs response
2020-11-10 07:00:07 +01:00
bdb59bf073
[tx-robot] updated from transifex
2020-11-10 02:19:04 +00:00
a923cdaf51
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:02:13 +00:00
7b8ca9526b
Merge pull request #24005 from nextcloud/backport/23999/stable19
...
[stable19] Remove old legacy scripts references
2020-11-09 19:37:55 +01:00
Daniel Calviño Sánchez
J0WI
Roeland Jago Douma
Julius Härtl
Joas Schilling
Nextcloud bot
Christoph Wurst
Roeland Jago Douma
John Molakvoæ (skjnldsv)
Ashod Nakashian
Robin Appelman
Morris Jobke
Richard Steinmetz
Christoph Wurst
John Molakvoæ