summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24044 from nextcloud/backport/24042/stable20Morris Jobke2020-11-1110-3/+347
|\
| * Add integration tests for default share permissionsDaniel Calviño Sánchez2020-11-112-0/+35
| * Add acceptance tests for reshares by link when resharing is disabledDaniel Calviño Sánchez2020-11-112-0/+111
| * Add acceptance tests for reshares when resharing is disabledDaniel Calviño Sánchez2020-11-113-0/+194
| * Disable share input for a received share if resharing is not allowedDaniel Calviño Sánchez2020-11-113-3/+6
| * Do not show "Can reshare" in the menu if resharing is not allowedDaniel Calviño Sánchez2020-11-113-2/+3
* | Merge pull request #24033 from nextcloud/backport/23993/stable20Joas Schilling2020-11-1136-91/+376
|\ \ | |/ |/|
| * Don't leave cursors open when tests failJoas Schilling2020-11-1036-91/+376
* | [tx-robot] updated from transifexNextcloud bot2020-11-1116-380/+198
|/
* Merge pull request #23950 from nextcloud/backport/23928/stable20Morris Jobke2020-11-104-54/+51
|\
| * Update psalm-baseline.xml to accept new errorsMorris Jobke2020-11-101-0/+7
| * Fix repair mimetype step to not leave stray cursorsJoas Schilling2020-11-103-54/+44
|/
* Merge pull request #23998 from nextcloud/backport/23937/stable20Morris Jobke2020-11-103-26/+52
|\
| * Use query builder instead of OC_DB in OC\Files\*Joas Schilling2020-11-093-26/+52
* | Merge pull request #23995 from nextcloud/backport/23741/stable20Morris Jobke2020-11-101-1/+7
|\ \
| * | Unlock when promoting to exclusive lock failsAshod Nakashian2020-11-091-1/+7
| |/
* | Merge pull request #23955 from nextcloud/backport/23938/stable20Roeland Jago Douma2020-11-102-29/+39
|\ \
| * | Replace some usages of OC_DB in OC\Share\* with query builderJoas Schilling2020-11-062-29/+39
* | | Merge pull request #24012 from nextcloud/backport/23981/stable20John Molakvoæ2020-11-103-5/+5
|\ \ \
| * | | Fix js search in undefined ocs responseJohn Molakvoæ (skjnldsv)2020-11-093-5/+5
* | | | [tx-robot] updated from transifexNextcloud bot2020-11-1014-20/+70
* | | | Merge pull request #24001 from nextcloud/backport/23889/stable20Roeland Jago Douma2020-11-092-11/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Shortcut to avoid file system setup when generating the logo URLMorris Jobke2020-11-092-11/+14
* | | | Merge pull request #24004 from nextcloud/backport/23999/stable20Roeland Jago Douma2020-11-092-2/+0
|\ \ \ \
| * | | | Removed config.jsJohn Molakvoæ2020-11-091-1/+0
| * | | | Remove old legacy search scriptJohn Molakvoæ2020-11-091-1/+0
|/ / / /
* | | | Merge pull request #23996 from nextcloud/backport/23982/stable20Morris Jobke2020-11-091-1/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Make sure root storage is valid before checking its sizeJohn Molakvoæ (skjnldsv)2020-11-091-1/+4
| | |/ | |/|
* | | Merge pull request #23992 from nextcloud/backport/23574/stable20Morris Jobke2020-11-093-4/+5
|\ \ \ | |/ / |/| |
| * | Fix link share label placeholder not showingGary Kim2020-11-093-4/+5
* | | Merge pull request #23971 from nextcloud/backport/23936/stable20Morris Jobke2020-11-094-23/+64
|\ \ \
| * | | Check in failing psalm checksMorris Jobke2020-11-091-0/+6
| * | | Add explicit typecast for $value.Daniel Kesselberg2020-11-092-2/+2
| * | | Use query builder instead of OC_DB in trashbinJoas Schilling2020-11-071-21/+56
* | | | Merge pull request #23975 from nextcloud/backport/23923/stable20Morris Jobke2020-11-095-10/+77
|\ \ \ \ | |_|/ / |/| | |
| * | | Update parametersJoas Schilling2020-11-074-8/+32
| * | | Make sure Oracle always casts everything in the best wayJoas Schilling2020-11-071-0/+43
| * | | Use Query builder functionJoas Schilling2020-11-071-1/+1
| * | | Fix order of GREATEST for OracleJoas Schilling2020-11-071-3/+3
* | | | [tx-robot] updated from transifexNextcloud bot2020-11-0928-38/+140
* | | | [tx-robot] updated from transifexNextcloud bot2020-11-0854-66/+766
|/ / /
* | | Merge pull request #23951 from nextcloud/backport/23922/stable20Roeland Jago Douma2020-11-071-6/+9
|\ \ \ | |/ / |/| |
| * | Improve query type detectionJoas Schilling2020-11-061-6/+9
* | | Merge pull request #23954 from nextcloud/backport/23943/stable20Roeland Jago Douma2020-11-071-3/+1
|\ \ \
| * | | Fix iLike() falsely turning escaped % and _ into wildcardsJoas Schilling2020-11-061-3/+1
| | |/ | |/|
* | | Merge pull request #23948 from nextcloud/backport/23940/stable20Roeland Jago Douma2020-11-071-3/+3
|\ \ \
| * | | Skip already loaded apps in loadAppsRoeland Jago Douma2020-11-061-3/+3
* | | | [tx-robot] updated from transifexNextcloud bot2020-11-076-2/+6
| |/ / |/| |
* | | Merge pull request #23935 from nextcloud/backport/23921/stable20Morris Jobke2020-11-061-0/+4
|\ \ \ | |_|/ |/| |
| * | Cast bool things to numbers as that is how they are stored in the databaseJoas Schilling2020-11-061-1/+1