b1e9752169
Revert "Do not read certificate bundle from data dir by default"
...
This reverts commit 18b0d753f2
2020-12-04 13:37:10 +01:00
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
a8780debd3
Add notification for user limit
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-12-02 17:24:44 +00:00
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
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
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
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
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
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
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
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
dabed84bd4
Fix unique key in test table
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:52 +01:00
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
3ec48cd59f
Easier debugging and spell fix
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:50 +01:00
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
a35b0956f1
Add github action for oci8
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-12 12:57:50 +01:00
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
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
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
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
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
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
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
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
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
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
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
eba5eb8876
Disable unreliable app-files-sharing.feature:108
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-22 10:22:53 +00:00
78d233276f
Disable unreliable app-files.feature:108
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-22 10:20:38 +00:00
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
a7ff7c47ab
Fix code style
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-12 18:08:36 +00:00
06895ef8cc
Fix typo 'shared'
2020-10-12 18:08:36 +00:00
d68d62f052
Make sure getUsersFavoritingObject can be run without a user
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-07 11:10:38 +00:00
e0bc29d907
Allow configuring the activity update interval of token
...
On some systems with a lot of users this creates a lot of extra DB
writes.
Being able to increase this interval helps there.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-06 08:04:12 +00:00
ac3a32f305
Set status is also there now
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-02 09:26:53 +00:00
c25063dc07
Don't break when the IP is empty
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-10 14:20:27 +02:00
cd563023db
Merge pull request #22657 from nextcloud/bugfix/noid/quota-trash-creation
...
Check if quota should be applied to path when creating directories
2020-09-09 17:37:28 +02:00
e6fca0a519
Fix code style
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-09-09 17:36:58 +02:00
Morris Jobke
Roeland Jago Douma
Arthur Schiwon
Robin Appelman
medcloud
Daniel Calviño Sánchez
Joas Schilling
Julius Härtl
Robin Windey