summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24170 from nextcloud/version/18.0.11/finalv18.0.11Roeland Jago Douma2020-11-181-2/+2
|\
| * 18.0.11Roeland Jago Douma2020-11-171-2/+2
* | [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 RC2Roeland Jago Douma2020-11-131-2/+2
* | Merge pull request #24078 from nextcloud/backport/23168/stable18Roeland Jago Douma2020-11-164-8/+25
|\ \
| * | Only use index of mount point when it is thereJoas Schilling2020-11-121-1/+5
| * | Fix unit testsRoeland Jago Douma2020-11-121-0/+6
| * | add mount point to quota warning messageRobin Appelman2020-11-123-8/+15
* | | Merge pull request #24161 from nextcloud/backport/24069/stable18-fix-default-...Roeland Jago Douma2020-11-168-273/+723
|\ \ \
| * | | Add integration tests for creating shares with default expiration datesDaniel Calviño Sánchez2020-11-162-0/+112
| * | | Reset app configs by deleting the values instead of setting the defaultsDaniel Calviño Sánchez2020-11-165-18/+31
| * | | Add unit tests for "validateExpirationDateInternal"Daniel Calviño Sánchez2020-11-161-0/+284
| * | | Fix default internal expiration dateDaniel Calviño Sánchez2020-11-161-3/+3
| * | | Add explicit time to test date for clarityDaniel Calviño Sánchez2020-11-161-3/+5
| * | | Add unit test for expiration date with date and with defaultDaniel Calviño Sánchez2020-11-161-0/+28
| * | | Fix unit test for expiration date without date but with defaultDaniel Calviño Sánchez2020-11-161-7/+5
| * | | Fix unit test method nameDaniel Calviño Sánchez2020-11-161-1/+1
| * | | Fix unit test for verifying enforced valid expiration date.Daniel Calviño Sánchez2020-11-161-0/+1
| * | | Fix unit test for verifying enforced expire date too far in the futureDaniel Calviño Sánchez2020-11-161-8/+5
| * | | Add unit tests to enforce a relaxed default share expiration dateDaniel Calviño Sánchez2020-11-161-0/+21
| * | | Remove wrong and misleading commentDaniel Calviño Sánchez2020-11-161-2/+0
| * | | Remove extra spacesDaniel Calviño Sánchez2020-11-161-10/+6
| * | | Fix typo in variable nameDaniel Calviño Sánchez2020-11-161-129/+129
| * | | Fix typos in method namesDaniel Calviño Sánchez2020-11-161-9/+9
| * | | Use the shorter phpunit syntax for mocked return values in ManagerTestChristoph Wurst2020-11-161-98/+98
* | | | 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
* | | | Merge pull request #24154 from nextcloud/dependencies/stable18/dompurifyRoeland Jago Douma2020-11-1612-35/+46
|\ \ \ \
| * | | | Bump bundlesJulius Härtl2020-11-1610-31/+42
| * | | | Bump dompurify to 2.2.2Julius Härtl2020-11-162-4/+4
* | | | | Merge pull request #24149 from nextcloud/backport/24146/stable18Roeland Jago Douma2020-11-161-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Don't throw on SHOW VERSION queryJoas Schilling2020-11-161-1/+2
|/ / / /
* | | | [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
|\ \ \
| * | | Fix default internal expiration date enforceJohn Molakvoæ (skjnldsv)2020-11-123-6/+6
| | |/ | |/|
* / | [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 RC1Roeland Jago Douma2020-11-091-2/+2
* | Merge pull request #23953 from nextcloud/backport/23922/stable18Roeland Jago Douma2020-11-121-6/+9
|\ \
| * | Improve query type detectionJoas Schilling2020-11-121-6/+9
* | | [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
|\ \ \
| * | | Fix iLike() falsely turning escaped % and _ into wildcardsJoas Schilling2020-11-111-3/+1
* | | | Merge pull request #24051 from nextcloud/backport/23915/stable18Roeland Jago Douma2020-11-116-8/+8
|\ \ \ \
| * | | | Use png icons in caldav reminder emailsRichard Steinmetz2020-11-116-8/+8
| |/ / /
* | | | Merge pull request #24046 from nextcloud/backport/24042/stable18Morris Jobke2020-11-1110-10/+372
|\ \ \ \