summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 19.0.5Roeland Jago Douma2020-11-171-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2020-11-1818-4/+276
| | |
* | | Merge pull request #24184 from nextcloud/revert-24177-backport/24098/stable19Roeland Jago Douma2020-11-171-4/+3
|\ \ \ | |_|/ |/| | Revert "[stable19] circleId too short in some request"
| * | Revert "[stable19] circleId too short in some request"Christoph Wurst2020-11-171-4/+3
|/ /
* | Merge pull request #24177 from nextcloud/backport/24098/stable19Christoph Wurst2020-11-171-3/+4
|\ \ | |/ |/| [stable19] circleId too short in some request
| * circleId too short in some requestMaxence Lange2020-11-171-3/+4
|/ | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* [tx-robot] updated from transifexNextcloud bot2020-11-1760-266/+74
|
* Merge pull request #24092 from nextcloud/version/19.0.5/RC2v19.0.5RC2Roeland Jago Douma2020-11-161-2/+2
|\ | | | | 19.0.5 RC2
| * 19.0.5 RC2Roeland Jago Douma2020-11-131-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #24160 from nextcloud/backport/24069/stable19Roeland Jago Douma2020-11-168-177/+627
|\ \ | | | | | | [stable19] Fix default internal expiration date
| * | Add integration tests for creating shares with default expiration datesDaniel Calviño Sánchez2020-11-162-0/+112
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Reset app configs by deleting the values instead of setting the defaultsDaniel Calviño Sánchez2020-11-165-18/+31
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Add unit tests for "validateExpirationDateInternal"Daniel Calviño Sánchez2020-11-161-0/+284
| | | | | | | | | | | | | | | | | | | | | They were copied and adjusted as needed from the tests for "validateExpirationDate". Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Fix default internal expiration dateDaniel Calviño Sánchez2020-11-161-3/+3
| | | | | | | | | | | | | | | | | | | | | 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>
| * | Add explicit time to test date for clarityDaniel Calviño Sánchez2020-11-161-3/+5
| | | | | | | | | | | | | | | | | | | | | 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>
| * | Add unit test for expiration date with date and with defaultDaniel Calviño Sánchez2020-11-161-0/+28
| | | | | | | | | | | | | | | | | | | | | 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>
| * | Fix unit test for expiration date without date but with defaultDaniel Calviño Sánchez2020-11-161-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Fix unit test method nameDaniel Calviño Sánchez2020-11-161-1/+1
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Fix unit test for verifying enforced valid expiration date.Daniel Calviño Sánchez2020-11-161-0/+1
| | | | | | | | | | | | | | | | | | | | | 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>
| * | Fix unit test for verifying enforced expire date too far in the futureDaniel Calviño Sánchez2020-11-161-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Add unit tests to enforce a relaxed default share expiration dateDaniel Calviño Sánchez2020-11-161-0/+21
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Remove wrong and misleading commentDaniel Calviño Sánchez2020-11-161-2/+0
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Remove extra spacesDaniel Calviño Sánchez2020-11-161-10/+6
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Fix typo in variable nameDaniel Calviño Sánchez2020-11-161-129/+129
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Fix typos in method namesDaniel Calviño Sánchez2020-11-161-9/+9
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #24076 from nextcloud/backport/23741/stable19Julius Härtl2020-11-161-1/+7
|\ \ \ | | | | | | | | [stable19] Unlock when promoting to exclusive lock fails
| * | | Unlock when promoting to exclusive lock failsAshod Nakashian2020-11-121-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #24111 from J0WI/backport/23239/stable19Roeland Jago Douma2020-11-1612-13/+18
|\ \ \ \ | |_|/ / |/| | | [stable19] Fix password visibility toggles
| * | | Fix password visibility togglesJ0WI2020-11-1612-13/+18
|/ / / | | | | | | | | | | | | Signed-off-by: J0WI <J0WI@users.noreply.github.com> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
* | | Merge pull request #24155 from nextcloud/dependencies/stable19/dompurifyRoeland Jago Douma2020-11-1612-13/+16
|\ \ \ | | | | | | | | [stable19] Bump dompurify to 2.2.2
| * | | Bump bundlesJulius Härtl2020-11-1610-9/+12
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Bump dompurify to 2.2.2Julius Härtl2020-11-162-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #24080 from nextcloud/backport/24066/stable19Roeland Jago Douma2020-11-163-4/+4
|\ \ \ \ | | | | | | | | | | [stable19] Fix default internal expiration date enforce
| * | | | Fix default internal expiration date enforceJohn Molakvoæ (skjnldsv)2020-11-133-4/+4
| | |/ / | |/| | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
* | | | Merge pull request #24115 from nextcloud/backport/24096/stable19Roeland Jago Douma2020-11-161-1/+6
|\ \ \ \ | | | | | | | | | | [stable19] Convert the card resource to a string if necessary
| * | | | Convert the card resource to a string if necessaryChristoph Wurst2020-11-131-1/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Apparently the fetched column can be a string or resource. Hence we have to catch the resource type and convert it to a string. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #24148 from nextcloud/backport/24146/stable19Roeland Jago Douma2020-11-161-1/+2
|\ \ \ \ | |_|_|/ |/| | | [stable19] Don't throw on SHOW VERSION query
| * | | Don't throw on SHOW VERSION queryJoas Schilling2020-11-161-1/+2
|/ / / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2020-11-168-2/+40
| | |
* | | [tx-robot] updated from transifexNextcloud bot2020-11-154-4/+4
| | |
* | | [tx-robot] updated from transifexNextcloud bot2020-11-1444-66/+178
|/ /
* / [tx-robot] updated from transifexNextcloud bot2020-11-1318-14/+52
|/
* Merge pull request #23990 from nextcloud/version/19.0.5/RC1v19.0.5RC1Roeland Jago Douma2020-11-121-2/+2
|\ | | | | 19.0.5 RC1
| * 19.0.5 RC1Roeland Jago Douma2020-11-091-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #23168 from nextcloud/backport/22913/stable19Roeland Jago Douma2020-11-124-8/+25
|\ \ | | | | | | [stable19] add mount point to quota warning message
| * | Only use index of mount point when it is thereJoas Schilling2020-11-121-1/+5
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix unit testsRoeland Jago Douma2020-11-121-0/+6
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | add mount point to quota warning messageRobin Appelman2020-11-123-8/+15
|/ / | | | | | | | | | | makes it more clear to the user what the quota applies to Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2020-11-1224-388/+28
| |
* | Merge pull request #24048 from nextcloud/backport/23943/stable19Roeland Jago Douma2020-11-111-3/+1
|\ \ | | | | | | [stable19] Fix iLike() falsely turning escaped % and _ into wildcards
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-23 16:56:36 +0000