Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-18Merge pull request #24170 from nextcloud/version/18.0.11/finalv18.0.11Roeland Jago Douma
18.0.11
2020-11-18[tx-robot] updated from transifexNextcloud bot
2020-11-1718.0.11Roeland Jago Douma
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-17[tx-robot] updated from transifexNextcloud bot
2020-11-16Merge pull request #24093 from nextcloud/version/18.0.11/rc2v18.0.11RC2Roeland Jago Douma
18.0.11 RC2
2020-11-16Merge pull request #24078 from nextcloud/backport/23168/stable18Roeland Jago Douma
[stable18] add mount point to quota warning message
2020-11-16Merge pull request #24161 from ↵Roeland Jago Douma
nextcloud/backport/24069/stable18-fix-default-internal-expiration-date [stable18] Fix default internal expiration date
2020-11-16Merge pull request #24077 from nextcloud/backport/23741/stable18Julius Härtl
2020-11-16Add integration tests for creating shares with default expiration datesDaniel Calviño Sánchez
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16Reset app configs by deleting the values instead of setting the defaultsDaniel Calviño Sánchez
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-16Add unit tests for "validateExpirationDateInternal"Daniel Calviño Sánchez
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-16Fix default internal expiration dateDaniel Calviño Sánchez
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-16Add explicit time to test date for clarityDaniel Calviño Sánchez
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-16Add unit test for expiration date with date and with defaultDaniel Calviño Sánchez
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-16Fix unit test for expiration date without date but with defaultDaniel Calviño Sánchez
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-16Fix unit test method nameDaniel Calviño Sánchez
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16Fix unit test for verifying enforced valid expiration date.Daniel Calviño Sánchez
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-16Fix unit test for verifying enforced expire date too far in the futureDaniel Calviño Sánchez
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-16Add unit tests to enforce a relaxed default share expiration dateDaniel Calviño Sánchez
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16Remove wrong and misleading commentDaniel Calviño Sánchez
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16Remove extra spacesDaniel Calviño Sánchez
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16Fix typo in variable nameDaniel Calviño Sánchez
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16Fix typos in method namesDaniel Calviño Sánchez
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16Use the shorter phpunit syntax for mocked return values in ManagerTestChristoph Wurst
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-16Merge pull request #24154 from nextcloud/dependencies/stable18/dompurifyRoeland Jago Douma
[stable18] Bump dompurify to 2.2.2
2020-11-16Merge pull request #24149 from nextcloud/backport/24146/stable18Roeland Jago Douma
[stable18] Don't throw on SHOW VERSION query
2020-11-16Bump bundlesJulius Härtl
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-16Bump dompurify to 2.2.2Julius Härtl
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-16Don't throw on SHOW VERSION queryJoas Schilling
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16[tx-robot] updated from transifexNextcloud bot
2020-11-15[tx-robot] updated from transifexNextcloud bot
2020-11-14[tx-robot] updated from transifexNextcloud bot
2020-11-1318.0.11 RC2Roeland Jago Douma
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-13Merge pull request #24082 from nextcloud/backport/24066/stable18John Molakvoæ
[stable18] Fix default internal expiration date enforce
2020-11-13[tx-robot] updated from transifexNextcloud bot
2020-11-13Fix default internal expiration date enforceJohn Molakvoæ (skjnldsv)
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-12Only use index of mount point when it is thereJoas Schilling
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12Fix unit testsRoeland Jago Douma
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-12add mount point to quota warning messageRobin Appelman
makes it more clear to the user what the quota applies to Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-12Merge pull request #23991 from nextcloud/version/18.0.11/rc1v18.0.11RC1Roeland Jago Douma
18.0.11 RC1
2020-11-12Unlock when promoting to exclusive lock failsAshod Nakashian
In certain cases changeLock to EXCLUSIVE fails and throws LockedException. This leaves the file locked as SHARED in file_put_contents, which prevents retrying (because on second call file_put_contents takes another SHARED lock on the same file, and changeLock doesn't allow more than a single SHARED lock to promote to EXCLUSIVE). To avoid this case, we catch the LockedException and unlock before re-throwing. Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2020-11-12Merge pull request #23953 from nextcloud/backport/23922/stable18Roeland Jago Douma
[stable18] Improve query type detection
2020-11-12Improve query type detectionJoas Schilling
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12[tx-robot] updated from transifexNextcloud bot
2020-11-11Merge pull request #24047 from nextcloud/backport/23943/stable18Roeland Jago Douma
[stable18] Fix iLike() falsely turning escaped % and _ into wildcards
2020-11-11Merge pull request #24051 from nextcloud/backport/23915/stable18Roeland Jago Douma
[stable18] Use png icons in caldav reminder emails
2020-11-11Merge pull request #24046 from nextcloud/backport/24042/stable18Morris Jobke
[stable18] Fix sharing tab state not matching resharing admin settings
2020-11-11Merge pull request #23761 from nextcloud/backport/23752/stable18blizzz
[stable18] inform the user when flow config data exceeds thresholds
2020-11-11Use png icons in caldav reminder emailsRichard Steinmetz
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2020-11-11Add integration tests for default share permissionsDaniel Calviño Sánchez
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-05 04:39:22 +0300