c8e9694a69
Fix setting images through occ for theming
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-19 22:18:55 +00:00
f65a89dd07
use file name instead of path in 'not allowed to share' message
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-19 21:44:42 +00:00
22bf656e02
allow selecting multiple columns with SELECT DISTINCT
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-19 21:41:13 +00:00
7ccf700432
Fix #23357
...
Signed-off-by: medcloud <42641918+medcloud@users.noreply.github.com>
2020-11-19 20:38:54 +00:00
8021bacbdc
Merge pull request #24181 from nextcloud/backport/24102/stable20
...
[stable20] Check quota of subdirectories when uploading to them
2020-11-19 10:40:11 +01:00
2c5a1fd636
Merge pull request #24196 from nextcloud/backport/24098/stable20
...
[stable20] circleId too short in some request
2020-11-19 10:09:45 +01:00
d0417e0d1f
Merge pull request #24212 from nextcloud/backport/24207/stable20
...
[stable20] missing level in ScopedPsrLogger
2020-11-19 09:50:32 +01:00
8c398453ac
missing level
...
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2020-11-19 07:40:38 +00:00
6a4ced077e
[tx-robot] updated from transifex
2020-11-19 02:20:21 +00:00
96f99a40f5
Merge pull request #24172 from nextcloud/version/20.0.2/final
...
20.0.2
2020-11-18 20:35:11 +01:00
d4ea5fd63f
circleId too short in some request
...
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2020-11-18 07:57:22 +00:00
c03db79569
[tx-robot] updated from transifex
2020-11-18 02:18:47 +00:00
cc42b5e502
Merge pull request #24183 from nextcloud/revert-24178-backport/24098/stable20
...
Revert "[stable20] circleId too short in some request"
2020-11-17 21:53:22 +01:00
8c7030e0bd
Bump bundles
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-17 19:47:56 +01:00
892bb8cae5
Check for target folder available quota when uploading
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-17 15:33:54 +01:00
b134107316
Fetch quota with files propfind
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-17 15:33:54 +01:00
1941f1b1a8
Revert "[stable20] circleId too short in some request"
2020-11-17 14:20:02 +01:00
f06f9a91b3
Merge pull request #24178 from nextcloud/backport/24098/stable20
...
[stable20] circleId too short in some request
2020-11-17 13:31:57 +01:00
6db68e9ba3
circleId too short in some request
...
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2020-11-17 10:28:24 +00:00
35c29b46ea
20.0.2
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-17 09:38:45 +01:00
51d8134e50
[tx-robot] updated from transifex
2020-11-17 02:18:36 +00:00
f1da86e7a1
Merge pull request #24091 from nextcloud/version/20.0.2/rc2
...
20.0.2 RC2
2020-11-16 20:55:05 +01:00
cdbb2b3e4b
Merge pull request #24159 from nextcloud/backport/24069/stable20
...
[stable20] Fix default internal expiration date
2020-11-16 17:46:37 +01:00
34a143b05f
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:17:01 +00:00
bf844567a5
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:17:00 +00:00
1464ace788
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:16:59 +00:00
182e28bfbc
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:16:57 +00:00
709abd4fc7
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:16:56 +00:00
731cce4542
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:16:55 +00:00
115a988cd2
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:16:53 +00:00
eaa43d22e2
Fix unit test method name
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:16:52 +00:00
4e418100bf
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:16:51 +00:00
20c72ac03e
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:16:49 +00:00
22357a72e5
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:16:48 +00:00
b75c171ee2
Remove wrong and misleading comment
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:16:47 +00:00
d6ba3b2f7c
Remove extra spaces
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:16:45 +00:00
76bbbca220
Fix typo in variable name
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:16:44 +00:00
446c90879f
Fix typos in method names
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:16:42 +00:00
b14ec966c1
Merge pull request #24156 from nextcloud/backport/24112/stable20
...
[stable20] Set up FS before querying storage info in settings
2020-11-16 14:14:43 +01:00
f4d92d2e3a
Merge pull request #24153 from nextcloud/dependencies/dompurify
2020-11-16 13:12:40 +01:00
bca0633e2b
Merge pull request #24147 from nextcloud/backport/24146/stable20
...
[stable20] Don't throw on SHOW VERSION query
2020-11-16 12:08:56 +01:00
32758894a4
Set up FS before querying storage info in settings
...
The personal info section of the personal settings is querying the
storage quota information. For this it requires the FS to be setup which
is not always guaranteed.
This fixes an issue where refreshing the settings page would cause it to
fail after Redis caches are full. It is likely that when Redis cache is
populated, some code path is initializing the FS, so it works so far.
But when the cache is populated, that code path is skipped so the FS is
not guaranteed to be setup...
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-11-16 11:06:35 +00:00
889d162ab7
Bump bundles
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-16 11:36:35 +01:00
ccc845b1c4
Bump dompurify to 2.2.2
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-16 11:30:59 +01:00
7a821da1bc
Merge pull request #24079 from nextcloud/backport/24053/stable20
...
[stable20] Make is_user_defined nullable so we can store false on oracle
2020-11-16 11:23:17 +01:00
18f5ad1a34
Merge pull request #24114 from nextcloud/backport/24096/stable20
...
[stable20] Convert the card resource to a string if necessary
2020-11-16 10:15:18 +01:00
f10327b245
Don't throw on SHOW VERSION query
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16 08:59:47 +00:00
9b694e59f5
Bump versions
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16 08:54:30 +01:00
d334dd1455
Merge pull request #24106 from nextcloud/backport/24085/stable20
...
[stable20] Register new command db:add-missing-primary-keys
2020-11-16 08:50:01 +01:00
9abc65c573
[tx-robot] updated from transifex
2020-11-16 02:19:33 +00:00
Julius Härtl
Robin Appelman
medcloud
Roeland Jago Douma
Maxence Lange
Nextcloud bot
Christoph Wurst
Roeland Jago Douma
Daniel Calviño Sánchez
John Molakvoæ
Vincent Petry
Joas Schilling
Joas Schilling