upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20
53304 commits 1042 branches 1221 tags 8.4 GiB
Commit graph

53304 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Daniel Calviño Sánchez
aaeaed072f 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 15:37:12 +01:00
Daniel Calviño Sánchez
47897090ec Remove wrong and misleading comment 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-11-16 15:37:12 +01:00
Daniel Calviño Sánchez
66eb1233a7 Remove extra spaces 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-11-16 15:37:12 +01:00
Daniel Calviño Sánchez
e9dfa135a1 Fix typo in variable 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
f59238444a Fix typos in method names 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-11-16 15:37:12 +01:00
Christoph Wurst
1d0a70e416 Use the shorter phpunit syntax for mocked return values in ManagerTest 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-11-16 15:35:02 +01:00
Roeland Jago Douma
d7f6fa4b8d
Merge pull request #24154 from nextcloud/dependencies/stable18/dompurify 
[stable18] Bump dompurify to 2.2.2
 2020-11-16 12:48:42 +01:00
Roeland Jago Douma
5ef00e4de5
Merge pull request #24149 from nextcloud/backport/24146/stable18 
[stable18] Don't throw on SHOW VERSION query
 2020-11-16 12:10:14 +01:00
Julius Härtl
fcfea74b29
Bump bundles 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-11-16 11:39:34 +01:00
Julius Härtl
341c45b160
Bump dompurify to 2.2.2 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-11-16 11:37:42 +01:00
Joas Schilling
353947a7db Don't throw on SHOW VERSION query 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-16 09:05:44 +00:00
Nextcloud bot
81e42fb956
[tx-robot] updated from transifex 2020-11-16 02:19:49 +00:00
Nextcloud bot
ef532e09fb
[tx-robot] updated from transifex 2020-11-15 02:19:26 +00:00
Nextcloud bot
e8fbff407e
[tx-robot] updated from transifex 2020-11-14 02:20:06 +00:00
John Molakvoæ
d242e497f4
Merge pull request #24082 from nextcloud/backport/24066/stable18 
[stable18] Fix default internal expiration date enforce
 2020-11-13 07:16:40 +01:00
Nextcloud bot
86cbef4ee7
[tx-robot] updated from transifex 2020-11-13 02:19:52 +00:00
John Molakvoæ (skjnldsv)
8975f8461f 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-12 21:52:08 +00:00
Roeland Jago Douma
3e3de886e4
Merge pull request #23991 from nextcloud/version/18.0.11/rc1 
18.0.11 RC1
 2020-11-12 20:23:51 +01:00
Roeland Jago Douma
dafd09d30b
Merge pull request #23953 from nextcloud/backport/23922/stable18 
[stable18] Improve query type detection
 2020-11-12 14:16:27 +01:00
Joas Schilling
92d8d339e3
Improve query type detection 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-12 12:51:20 +01:00
Nextcloud bot
8ab36c4cf6
[tx-robot] updated from transifex 2020-11-12 02:19:50 +00:00
Roeland Jago Douma
13f6dcfbf8
Merge pull request #24047 from nextcloud/backport/23943/stable18 
[stable18] Fix iLike() falsely turning escaped % and _ into wildcards
 2020-11-11 21:53:28 +01:00
Roeland Jago Douma
414cd3bc5d
Merge pull request #24051 from nextcloud/backport/23915/stable18 
[stable18] Use png icons in caldav reminder emails
 2020-11-11 21:27:50 +01:00
Morris Jobke
59d07be21c
Merge pull request #24046 from nextcloud/backport/24042/stable18 
[stable18] Fix sharing tab state not matching resharing admin settings
 2020-11-11 15:45:24 +01:00
blizzz
318fcde5fa
Merge pull request #23761 from nextcloud/backport/23752/stable18 
[stable18] inform the user when flow config data exceeds thresholds
 2020-11-11 14:00:27 +01:00
Richard Steinmetz
ddd835744e Use png icons in caldav reminder emails 
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
 2020-11-11 12:38:24 +00:00
Daniel Calviño Sánchez
02fcb5e17a Add integration tests for default share permissions 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-11-11 13:27:47 +01:00
Daniel Calviño Sánchez
8ebe5a140d 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:27:47 +01:00
Daniel Calviño Sánchez
44d1d158de Add acceptance tests for reshares when resharing is disabled 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-11-11 13:27:47 +01:00
Daniel Calviño Sánchez
2b1ab7f5cf 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 12:23:05 +01:00
Daniel Calviño Sánchez
a9f98c9b47 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 12:21:52 +01:00
Joas Schilling
ddc94e44b7 Fix iLike() falsely turning escaped % and _ into wildcards 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-11 09:27:27 +00:00
Nextcloud bot
9650ec1a6e
[tx-robot] updated from transifex 2020-11-11 02:20:39 +00:00
John Molakvoæ
f1f575897a
Merge pull request #24020 from nextcloud/backport/23981/stable18 
[stable18] Fix js search in undefined ocs response
 2020-11-10 09:08:37 +01:00
John Molakvoæ (skjnldsv)
300d482c01
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-10 08:07:27 +01:00
Nextcloud bot
9ded5fbb89
[tx-robot] updated from transifex 2020-11-10 02:19:12 +00:00
Roeland Jago Douma
1b66f56c07
Merge pull request #24006 from nextcloud/backport/23999/stable18 
[stable18] Remove old legacy scripts references
 2020-11-09 19:38:01 +01:00
Arthur Schiwon
793a52dd14
inform the user when flow config data exceeds thresholds 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-11-09 18:15:02 +01:00
John Molakvoæ
a827eba0f2
Removed config.js 2020-11-09 17:13:33 +01:00
Morris Jobke
c6abcfbbfa
Merge pull request #23635 from nextcloud/backport/23374/stable18 
[stable18] Only retry fetching app store data once every 5 minutes in case it fails
 2020-11-09 16:08:31 +01:00
Morris Jobke
a4cfac8e61
Merge pull request #23204 from nextcloud/backport/23182/stable18 
[stable18] Fix the user email issue while creating a user
 2020-11-09 15:53:13 +01:00
Julius Härtl
338498f967
Only retry fetching app store data once every 5 minutes in case it fails 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-11-09 11:47:22 +01:00
Roeland Jago Douma
c7f3e2753e
18.0.11 RC1 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-11-09 09:10:32 +01:00