mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
56,307 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

56307 Commits

Author SHA1 Message Date
essys 8d44a1006a Update ScanLegacyFormat.php 
Fixed a small typo on line 99.
 2020-11-20 19:42:37 +00: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
Roeland Jago Douma 06286f8c0e Harden EncryptionLegacyCipher a bit 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-11-20 13:18:25 +00:00
Roeland Jago Douma 322b0ab2b3
Merge pull request #24239 from nextcloud/backport/24203/stable20 
[stable20] Use regex when searching on single file shares
 2020-11-20 10:15:04 +01:00
Roeland Jago Douma 3839c8449a
Merge pull request #24231 from nextcloud/backport/23757/stable20 
[stable20] use file name instead of path in 'not allowed to share' message
 2020-11-20 10:04:54 +01:00
Roeland Jago Douma 10086b3f43
Merge pull request #24232 from nextcloud/backport/24211/stable20 
[stable20] Fix setting images through occ for theming
 2020-11-20 10:04:30 +01:00
Roeland Jago Douma 37df208bd7 Limit shared cache search if it is just a file 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-11-20 07:27:47 +00:00
Nextcloud bot 78b62b6b65
[tx-robot] updated from transifex 2020-11-20 02:20:19 +00:00
Julius Härtl 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
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
Roeland Jago Douma 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
Roeland Jago Douma 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
Roeland Jago Douma d0417e0d1f
Merge pull request #24212 from nextcloud/backport/24207/stable20 
[stable20] missing level in ScopedPsrLogger
 2020-11-19 09:50:32 +01:00
Maxence Lange 8c398453ac missing level 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2020-11-19 07:40:38 +00:00
Nextcloud bot 6a4ced077e
[tx-robot] updated from transifex 2020-11-19 02:20:21 +00:00
Roeland Jago Douma 96f99a40f5
Merge pull request #24172 from nextcloud/version/20.0.2/final 
20.0.2
 2020-11-18 20:35:11 +01:00
Maxence Lange d4ea5fd63f circleId too short in some request 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2020-11-18 07:57:22 +00:00
Nextcloud bot c03db79569
[tx-robot] updated from transifex 2020-11-18 02:18:47 +00:00
Roeland Jago Douma 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
Julius Härtl 8c7030e0bd
Bump bundles 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-11-17 19:47:56 +01:00
Julius Härtl 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
Julius Härtl b134107316
Fetch quota with files propfind 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-11-17 15:33:54 +01:00
Christoph Wurst 1941f1b1a8
Revert "[stable20] circleId too short in some request" 2020-11-17 14:20:02 +01:00
Christoph Wurst 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
Maxence Lange 6db68e9ba3 circleId too short in some request 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2020-11-17 10:28:24 +00:00
Roeland Jago Douma 35c29b46ea
20.0.2 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-11-17 09:38:45 +01:00
Nextcloud bot 51d8134e50
[tx-robot] updated from transifex 2020-11-17 02:18:36 +00:00
Roeland Jago Douma f1da86e7a1
Merge pull request #24091 from nextcloud/version/20.0.2/rc2 
20.0.2 RC2
 2020-11-16 20:55:05 +01:00
Daniel Calviño Sánchez cdbb2b3e4b
Merge pull request #24159 from nextcloud/backport/24069/stable20 
[stable20] Fix default internal expiration date
 2020-11-16 17:46:37 +01:00
Daniel Calviño Sánchez 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
Daniel Calviño Sánchez 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
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 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
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
Roeland Jago Douma 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
John Molakvoæ f4d92d2e3a
Merge pull request #24153 from nextcloud/dependencies/dompurify 2020-11-16 13:12:40 +01:00
Roeland Jago Douma 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