summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24172 from nextcloud/version/20.0.2/finalv20.0.2Roeland Jago Douma2020-11-181-2/+2
|\
| * 20.0.2Roeland Jago Douma2020-11-171-2/+2
* | [tx-robot] updated from transifexNextcloud bot2020-11-1820-4/+350
* | Merge pull request #24183 from nextcloud/revert-24178-backport/24098/stable20Roeland Jago Douma2020-11-171-4/+3
|\ \
| * | Revert "[stable20] circleId too short in some request"Christoph Wurst2020-11-171-4/+3
|/ /
* | Merge pull request #24178 from nextcloud/backport/24098/stable20Christoph Wurst2020-11-171-3/+4
|\ \ | |/ |/|
| * circleId too short in some requestMaxence Lange2020-11-171-3/+4
|/
* [tx-robot] updated from transifexNextcloud bot2020-11-1760-266/+74
* Merge pull request #24091 from nextcloud/version/20.0.2/rc2v20.0.2RC2Roeland Jago Douma2020-11-161-1/+1
|\
| * 20.0.2 RC2Roeland Jago Douma2020-11-131-2/+2
* | Merge pull request #24159 from nextcloud/backport/24069/stable20Daniel Calviño Sánchez2020-11-168-177/+627
|\ \
| * | 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
* | | Merge pull request #24156 from nextcloud/backport/24112/stable20Roeland Jago Douma2020-11-162-0/+6
|\ \ \ | |/ / |/| |
| * | Set up FS before querying storage info in settingsVincent Petry2020-11-162-0/+6
* | | Merge pull request #24153 from nextcloud/dependencies/dompurifyJohn Molakvoæ2020-11-1610-11/+14
|\ \ \
| * | | Bump bundlesJulius Härtl2020-11-168-7/+10
| * | | Bump dompurify to 2.2.2Julius Härtl2020-11-162-4/+4
| |/ /
* | | Merge pull request #24147 from nextcloud/backport/24146/stable20Roeland Jago Douma2020-11-161-1/+2
|\ \ \ | |/ / |/| |
| * | Don't throw on SHOW VERSION queryJoas Schilling2020-11-161-1/+2
* | | Merge pull request #24079 from nextcloud/backport/24053/stable20Joas Schilling2020-11-1610-4/+131
|\ \ \
| * | | Bump versionsJoas Schilling2020-11-162-2/+2
| * | | Dump autoloaderMorris Jobke2020-11-122-0/+2
| * | | Also make direct_edit.accessed nullableJoas Schilling2020-11-122-1/+62
| * | | Make is_user_defined nullable so we can store false on oracleJoas Schilling2020-11-124-1/+65
* | | | Merge pull request #24114 from nextcloud/backport/24096/stable20John Molakvoæ2020-11-161-1/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Convert the card resource to a string if necessaryChristoph Wurst2020-11-131-1/+6
| | |/ | |/|
* | | Merge pull request #24106 from nextcloud/backport/24085/stable20Joas Schilling2020-11-161-0/+1
|\ \ \
| * | | Register new command db:add-missing-primary-keysMichaIng2020-11-131-0/+1
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2020-11-1612-2/+46
* | | [tx-robot] updated from transifexNextcloud bot2020-11-154-4/+4
* | | [tx-robot] updated from transifexNextcloud bot2020-11-1446-78/+190
|/ /
* | Merge pull request #24081 from nextcloud/backport/24066/stable20Roeland Jago Douma2020-11-133-4/+4
|\ \
| * | Fix default internal expiration date enforceJohn Molakvoæ (skjnldsv)2020-11-133-4/+4
| |/
* / [tx-robot] updated from transifexNextcloud bot2020-11-1318-14/+52
|/
* Merge pull request #23989 from nextcloud/version/20.0.2/rc1v20.0.2RC1Roeland Jago Douma2020-11-121-2/+2
|\
| * 20.0.2 RC1Roeland Jago Douma2020-11-121-2/+2
|/