summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24170 from nextcloud/version/18.0.11/finalv18.0.11Roeland Jago Douma2020-11-181-2/+2
|\ | | | | 18.0.11
| * 18.0.11Roeland 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
|/
* [tx-robot] updated from transifexNextcloud bot2020-11-1760-266/+74
|
* Merge pull request #24093 from nextcloud/version/18.0.11/rc2v18.0.11RC2Roeland Jago Douma2020-11-161-2/+2
|\ | | | | 18.0.11 RC2
| * 18.0.11 RC2Roeland Jago Douma2020-11-131-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #24078 from nextcloud/backport/23168/stable18Roeland Jago Douma2020-11-164-8/+25
|\ \ | | | | | | [stable18] 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>
* | | Merge pull request #24161 from ↵Roeland Jago Douma2020-11-168-273/+723
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/backport/24069/stable18-fix-default-internal-expiration-date [stable18] 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>
| * | | Use the shorter phpunit syntax for mocked return values in ManagerTestChristoph Wurst2020-11-161-98/+98
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #24077 from nextcloud/backport/23741/stable18Julius Härtl2020-11-161-1/+7
|\ \ \ \ | |/ / / |/| | |
| * | | 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 #24154 from nextcloud/dependencies/stable18/dompurifyRoeland Jago Douma2020-11-1612-35/+46
|\ \ \ \ | | | | | | | | | | [stable18] Bump dompurify to 2.2.2
| * | | | Bump bundlesJulius Härtl2020-11-1610-31/+42
| | | | | | | | | | | | | | | | | | | | 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 #24149 from nextcloud/backport/24146/stable18Roeland Jago Douma2020-11-161-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | [stable18] 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
| |_|/ |/| |
* | | Merge pull request #24082 from nextcloud/backport/24066/stable18John Molakvoæ2020-11-133-6/+6
|\ \ \ | | | | | | | | [stable18] Fix default internal expiration date enforce
| * | | Fix default internal expiration date enforceJohn Molakvoæ (skjnldsv)2020-11-123-6/+6
| | |/ | |/| | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
* / | [tx-robot] updated from transifexNextcloud bot2020-11-1318-14/+52
|/ /
* | Merge pull request #23991 from nextcloud/version/18.0.11/rc1v18.0.11RC1Roeland Jago Douma2020-11-121-2/+2
|\ \ | |/ |/| 18.0.11 RC1
| * 18.0.11 RC1Roeland Jago Douma2020-11-091-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #23953 from nextcloud/backport/23922/stable18Roeland Jago Douma2020-11-121-6/+9
|\ \ | | | | | | [stable18] Improve query type detection
| * | Improve query type detectionJoas Schilling2020-11-121-6/+9
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2020-11-1224-388/+28
| | |
* | | Merge pull request #24047 from nextcloud/backport/23943/stable18Roeland Jago Douma2020-11-111-3/+1
|\ \ \ | | | | | | | | [stable18] Fix iLike() falsely turning escaped % and _ into wildcards
| * | | Fix iLike() falsely turning escaped % and _ into wildcardsJoas Schilling2020-11-111-3/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #24051 from nextcloud/backport/23915/stable18Roeland Jago Douma2020-11-116-8/+8
|\ \ \ \ | | | | | | | | | | [stable18] Use png icons in caldav reminder emails
| * | | | Use png icons in caldav reminder emailsRichard Steinmetz2020-11-116-8/+8
| |/ / / | | | | | | | | | | | | Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
* | | | Merge pull request #24046 from nextcloud/backport/24042/stable18Morris Jobke2020-11-1110-10/+372
|\ \ \ \ | | | | | | | | | | [stable18] Fix sharing tab state not matching resharing admin settings
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-07 02:34:17 +0000