Morris Jobke
fb0067a777
Merge pull request #24592 from nextcloud/backport/23912/stable20
...
[stable20] use in objectstore copy
2021-01-07 13:28:10 +01:00
Julius Härtl
8d9fa73371
Properly handle result when copying with failure and throw in tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-01-05 16:57:51 +01:00
Julius Härtl
865e4ab0ec
Fix writeStream mocking
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-01-05 14:51:40 +00:00
Julius Härtl
3666754be7
Show unique displayname context in the sharing input
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-01-05 10:05:52 +01:00
Roeland Jago Douma
24fe3ee439
Merge pull request #24653 from nextcloud/backport/23044/stable20
...
[stable20] Handle owncloud migration to latest release
2020-12-14 15:35:00 +01:00
Julius Härtl
7ce95a4fcb
Readd repair steps that are relevant when migrating from ownCloud
...
This reverts commit d9b1492e03
.
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-14 11:12:52 +01:00
Julius Härtl
ace90466d6
Add temporary test for migrating int to string
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-14 11:10:59 +01:00
Robin Appelman
694032c54c
use in objectstore copy
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-12-07 16:07:21 +00:00
Morris Jobke
b1e9752169
Revert "Do not read certificate bundle from data dir by default"
...
This reverts commit 18b0d753f2
.
2020-12-04 13:37:10 +01:00
Roeland Jago Douma
428f0ec151
Fix vsprint parameter
...
%2\$; is not valid. On php7 this is just ignored but on php8 it gives an
error. %2\$s; works.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-03 08:20:04 +00:00
Morris Jobke
a8780debd3
Add notification for user limit
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 17:24:44 +00:00
Morris Jobke
d2fd49c461
Allow subscription to indicate that a userlimit is reached
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 17:24:42 +00:00
Roeland Jago Douma
3fb850940f
Set frame-ancestors to none if none are filled
...
frame-ancestors doesn't fall back to default-src. So when we apply a
very restricted CSP we should make sure to set it to 'none' and not
leave it empty.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-01 22:23:13 +01:00
Arthur Schiwon
c9814c716a
set the display name of federated sharees from addressbook
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-24 22:52:31 +01:00
Morris Jobke
e0e3334fc2
Merge pull request #24230 from nextcloud/backport/24007/stable20
...
[stable20] allow selecting multiple columns with SELECT DISTINCT
2020-11-20 14:27:27 +01:00
Morris Jobke
7fa352b28c
Merge pull request #24228 from nextcloud/backport/24135/stable20
...
[stable20] Fix nextcloud logo in email notifications misalignment
2020-11-20 14:23:00 +01:00
Robin Appelman
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
Robin Appelman
22bf656e02
allow selecting multiple columns with SELECT DISTINCT
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-19 21:41:13 +00:00
medcloud
7ccf700432
Fix #23357
...
Signed-off-by: medcloud <42641918+medcloud@users.noreply.github.com>
2020-11-19 20:38:54 +00:00
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
d6ba3b2f7c
Remove extra spaces
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:16:45 +00:00
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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
Joas Schilling
dabed84bd4
Fix unique key in test table
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:52 +01:00
Joas Schilling
e3b3ff6d43
Skip the insertIfNotExists() tests on Oracle because it doesn't work with clob
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:51 +01:00
Joas Schilling
3ec48cd59f
Easier debugging and spell fix
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:50 +01:00
Joas Schilling
f58ffadb34
Use a different column for the primary key as we can not insert it on oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:50 +01:00
Julius Härtl
a35b0956f1
Add github action for oci8
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-12 12:57:50 +01:00
Morris Jobke
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
Daniel Calviño Sánchez
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
Daniel Calviño Sánchez
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
Joas Schilling
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
Joas Schilling
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
Joas Schilling
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
Joas Schilling
3f5d275e6d
Also run for .sh and .json (when not package or package-lock)
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-30 12:12:39 +00:00
Joas Schilling
0a7fef6272
Also run all tests when drone config is modified
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-30 12:12:39 +00:00
Joas Schilling
53c18b8c26
Only run phpunit when php, xml or test files are modified
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-30 12:12:38 +00:00
Julius Härtl
367a7bd87e
Only retry fetching app store data once every 5 minutes in case it fails
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-22 14:14:49 +00:00
Morris Jobke
820881168d
Merge pull request #23621 from nextcloud/backport/23613/stable20
...
[stable20] Disable unreliable app-files.feature:108
2020-10-22 15:58:35 +02:00
Morris Jobke
eba5eb8876
Disable unreliable app-files-sharing.feature:108
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-22 10:22:53 +00:00
Morris Jobke
78d233276f
Disable unreliable app-files.feature:108
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-22 10:20:38 +00:00
Morris Jobke
e95a1420f1
Clear cached app config while waiting for the SCSSCache to finish processing the file
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-16 15:46:59 +02:00