Commit graph

53352 commits

Author SHA1 Message Date
Nextcloud bot
8ae8f2e76d
[tx-robot] updated from transifex 2020-12-01 02:20:14 +00:00
Morris Jobke
eccdb970e5
Merge pull request #24458 from nextcloud/backport/24451/stable18
[stable18] external storages: save group ids not display names in configuration
2020-11-30 17:22:24 +01:00
Arthur Schiwon
fd711afe20 save group ids not display names in configuration
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-30 14:54:37 +00:00
Morris Jobke
74630c466d
Merge pull request #24445 from nextcloud/backport/24357/stable18
[stable18] Make sure we add new line between vcf groups exports
2020-11-30 10:31:56 +01:00
Morris Jobke
b050c1f7cc
Merge pull request #24437 from nextcloud/backport/21963/stable18
[stable18] Respect default share permissions
2020-11-30 10:08:38 +01:00
John Molakvoæ (skjnldsv)
0efcd9940a Make sure we add new line between vcf groups exports
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-11-30 08:14:05 +00:00
Nextcloud bot
851c3f156c
[tx-robot] updated from transifex 2020-11-30 02:20:11 +00:00
Roeland Jago Douma
b9ae79189e Respect default share permissions
Else we'll always create new shares with the max permissions.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-29 20:47:16 +00:00
Nextcloud bot
af3faed87f
[tx-robot] updated from transifex 2020-11-29 02:19:36 +00:00
Nextcloud bot
388afc020d
[tx-robot] updated from transifex 2020-11-28 02:18:49 +00:00
Nextcloud bot
6abada1c4c
[tx-robot] updated from transifex 2020-11-26 02:19:13 +00:00
Roeland Jago Douma
993b7b5e96
Merge pull request #24369 from nextcloud/backport/24363/stable18
[stable18] Catch storage not available in versions expire command
2020-11-25 16:17:45 +01:00
Roeland Jago Douma
71b176d5e0
Merge pull request #24371 from nextcloud/backport/21844/stable18
[stable18] Avoid substr() error when strpos returns false
2020-11-25 14:42:37 +01:00
lui87kw
3952be00ec Extra white space to follow other ifs
Signed-off-by: lui87kw <lukas.ifflaender@uni-wuerzburg.de>
2020-11-25 11:55:21 +00:00
bladewing
0057f85ad7 Avoid substr() error when strpos returns false
"Exception: substr() expects parameter 3 to be int, bool given" can occur on Line 378 $mimePart = substr($icon, 0, strpos($icon, '-'));
This happens, when '-' is not found and strpos returns false instead of an int.
When this occurs, e.g., Activity hangs.

Signed-off-by: lui87kw <lukas.ifflaender@uni-wuerzburg.de>
2020-11-25 11:55:20 +00:00
Christoph Wurst
19678d182f
Catch storage not available in versions expire command
External storage with session credentials is not accessible without a
user session, hence background jobs and CLI commands can't work with
them. The previously unhandled exception causes logged errors in the
nextcloud log. This patch catches the specific exception and logs it as
warnings. So for a production instance the error won't spam their logs
for this non-recoverable and technically unsolvable error if the minimum
log level is set to the default of 3 (error).

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-25 11:51:22 +01:00
Nextcloud bot
e84701086a
[tx-robot] updated from transifex 2020-11-25 02:19:21 +00:00
blizzz
e67df70f69
Merge pull request #24335 from nextcloud/backport/24315/stable18
[stable18] avoid empty null default with value that will be inserted anyways
2020-11-24 23:44:04 +01:00
Roeland Jago Douma
2f945aa182
Merge pull request #24332 from nextcloud/bugfix/stable18/fix-contactsmenu-position
[stable18] Fix contacts menu position in sharing sidebar
2020-11-24 19:35:30 +01:00
Roeland Jago Douma
2ea0f5f694
Merge pull request #24344 from nextcloud/backport/stable18/24103
[stable18] Only check path for being accessible when the storage is a object home
2020-11-24 19:34:55 +01:00
Arthur Schiwon
48608db9be
avoid empty null default with value that will be inserted anyways
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-24 17:40:14 +01:00
Julius Härtl
ccd28f2e64
Only check path for being accessible when the storage is a object home
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-24 15:37:48 +01:00
Julius Härtl
285edac447
Bump bundles
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-24 11:23:11 +01:00
Julius Härtl
df1f4a0a01
Fix contacts menu position and show uid as a tooltip
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-24 11:18:11 +01:00
Julius Härtl
99ac0db0c7
Bump nextcloud-vue to 0.13.1
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-24 11:17:55 +01:00
Nextcloud bot
adcb73d8f6
[tx-robot] updated from transifex 2020-11-24 02:19:21 +00:00
Nextcloud bot
0e01898cbc
[tx-robot] updated from transifex 2020-11-22 02:18:55 +00:00
Nextcloud bot
1e2057a53b
[tx-robot] updated from transifex 2020-11-21 02:19:43 +00:00
Morris Jobke
29adbf8ff9
Merge pull request #24261 from nextcloud/backport/24257/stable18
[stable18] Simple typo in comments
2020-11-20 21:29:47 +01:00
Carlos Ferreira
cf7fe02b43 Simple typo in comments 2020-11-20 19:50:55 +00:00
Nextcloud bot
30e24698d7
[tx-robot] updated from transifex 2020-11-20 02:20:34 +00:00
Nextcloud bot
eb8959debd
[tx-robot] updated from transifex 2020-11-19 02:20:37 +00:00
Roeland Jago Douma
148e875f8e
Merge pull request #24170 from nextcloud/version/18.0.11/final
18.0.11
2020-11-18 19:44:15 +01:00
Nextcloud bot
c485af2549
[tx-robot] updated from transifex 2020-11-18 02:19:04 +00:00
Roeland Jago Douma
21971367f4
18.0.11
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-17 09:40:15 +01:00
Nextcloud bot
a4a2318d1e
[tx-robot] updated from transifex 2020-11-17 02:18:52 +00:00
Roeland Jago Douma
253f10518b
Merge pull request #24093 from nextcloud/version/18.0.11/rc2
18.0.11 RC2
2020-11-16 19:36:42 +01:00
Roeland Jago Douma
5aca22f825
Merge pull request #24078 from nextcloud/backport/23168/stable18
[stable18] add mount point to quota warning message
2020-11-16 19:29:10 +01:00
Roeland Jago Douma
93b9cab7b2
Merge pull request #24161 from nextcloud/backport/24069/stable18-fix-default-internal-expiration-date
[stable18] Fix default internal expiration date
2020-11-16 19:17:33 +01:00
Julius Härtl
396a50fb24
Merge pull request #24077 from nextcloud/backport/23741/stable18 2020-11-16 17:06:12 +01:00
Daniel Calviño Sánchez
47ca9e3997 Add integration tests for creating shares with default expiration dates
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 15:37:12 +01:00
Daniel Calviño Sánchez
aadd0ab2c5 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 15:37:12 +01:00
Daniel Calviño Sánchez
68f67d9c9e 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 15:37:12 +01:00
Daniel Calviño Sánchez
bae712b68e 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 15:37:12 +01:00
Daniel Calviño Sánchez
713e87909a 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 15:37:12 +01:00
Daniel Calviño Sánchez
c138d2d251 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 15:37:12 +01:00
Daniel Calviño Sánchez
2f8f06fe37 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 15:37:12 +01:00
Daniel Calviño Sánchez
6cf3c294a1 Fix unit test method name
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 15:37:12 +01:00
Daniel Calviño Sánchez
eae5fa876c 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 15:37:12 +01:00
Daniel Calviño Sánchez
f4f39fc157 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 15:37:12 +01:00