summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't leave cursors open when tests failJoas Schilling2020-11-0937-92/+380
* Merge pull request #23937 from nextcloud/bugfix/noid/files-ocdbJohn Molakvoæ2020-11-093-26/+52
|\
| * Use query builder instead of OC_DB in OC\Files\*Joas Schilling2020-11-093-26/+52
* | Merge pull request #23976 from nextcloud/enh/reduce_getAppPath_and_autoload_regMorris Jobke2020-11-091-3/+6
|\ \
| * | Reduce the getAppPath and autoloader callsRoeland Jago Douma2020-11-071-3/+6
* | | Merge pull request #23982 from nextcloud/fix/quota-storage-getsizeMorris 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 #23741 from Ashod/lock-leakMorris Jobke2020-11-091-1/+7
|\ \ \
| * | | Unlock when promoting to exclusive lock failsAshod Nakashian2020-11-071-1/+7
* | | | Merge pull request #23978 from nextcloud/enh/query_servercontainer_firstMorris Jobke2020-11-091-0/+6
|\ \ \ \
| * | | | First query the server containerRoeland Jago Douma2020-11-071-0/+6
| | |/ / | |/| |
* | | | Merge pull request #23933 from nextcloud/bugfix/noid/user-ldap-ocdbMorris Jobke2020-11-0920-58/+60
|\ \ \ \
| * | | | Test requires the DBJoas Schilling2020-11-091-0/+3
| * | | | fix insert valuesArthur Schiwon2020-11-061-2/+2
| * | | | only delete specified configArthur Schiwon2020-11-061-0/+1
| * | | | Correctly place the array typeJoas Schilling2020-11-061-1/+1
| * | | | Use query builder to interact with member managementJoas Schilling2020-11-061-12/+16
| * | | | Use query builder instead of OC_DB in user_ldapJoas Schilling2020-11-0619-46/+40
* | | | | Merge pull request #23574 from nextcloud/fix/23569John Molakvoæ2020-11-093-4/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix link share label placeholder not showingGary Kim2020-11-073-4/+5
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexNextcloud bot2020-11-0928-38/+140
* | | | Merge pull request #23983 from nextcloud-pr-bot/automated/noid/psalm-baseline...Roeland Jago Douma2020-11-081-6/+0
|\ \ \ \
| * | | | Update psalm baselineNextcloud-PR-Bot2020-11-081-6/+0
|/ / / /
* / / / [tx-robot] updated from transifexNextcloud bot2020-11-0854-66/+766
|/ / /
* | | Merge pull request #23923 from nextcloud/bugfix/oci/fix-greatest-order-for-or...Roeland Jago Douma2020-11-075-10/+77
|\ \ \ | |_|/ |/| |
| * | Update parametersJoas Schilling2020-11-074-8/+32
| * | Make sure Oracle always casts everything in the best wayJoas Schilling2020-11-061-0/+43
| * | Use Query builder functionJoas Schilling2020-11-061-1/+1
| * | Fix order of GREATEST for OracleJoas Schilling2020-11-061-3/+3
| |/
* | Merge pull request #23956 from nextcloud/dependabot/npm_and_yarn/node-sass-5.0.0John Molakvoæ2020-11-078-89/+162
|\ \
| * | Bump node-sass from 4.14.1 to 5.0.0dependabot-preview[bot]2020-11-078-89/+162
|/ /
* | Merge pull request #23961 from nextcloud/dependabot/npm_and_yarn/css-vars-pon...dependabot-preview[bot]2020-11-074-6/+6
|\ \
| * | Bump css-vars-ponyfill from 2.3.2 to 2.4.1dependabot-preview[bot]2020-11-074-6/+6
* | | Merge pull request #23957 from nextcloud/dependabot/npm_and_yarn/vue-loader-1...John Molakvoæ2020-11-072-7/+7
|\ \ \
| * | | Bump vue-loader from 15.9.4 to 15.9.5dependabot-preview[bot]2020-11-072-7/+7
* | | | Merge pull request #23960 from nextcloud/dependabot/npm_and_yarn/bootstrap-4.5.3John Molakvoæ2020-11-072-4/+4
|\ \ \ \
| * | | | Bump bootstrap from 4.5.2 to 4.5.3dependabot-preview[bot]2020-11-072-4/+4
| | |/ / | |/| |
* | | | Merge pull request #23962 from nextcloud/dependabot/npm_and_yarn/vue-router-3...John Molakvoæ2020-11-072-4/+4
|\ \ \ \
| * | | | Bump vue-router from 3.4.8 to 3.4.9dependabot-preview[bot]2020-11-072-4/+4
* | | | | Merge pull request #23964 from nextcloud/dependabot/npm_and_yarn/marked-1.2.3John Molakvoæ2020-11-072-4/+4
|\ \ \ \ \
| * | | | | Bump marked from 1.2.0 to 1.2.3dependabot-preview[bot]2020-11-072-4/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #23936 from nextcloud/bugfix/noid/trashbin-ocdbJohn Molakvoæ2020-11-071-21/+56
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Use query builder instead of OC_DB in trashbinJoas Schilling2020-11-061-21/+56
| | |_|/ | |/| |
* | | | Merge pull request #23965 from nextcloud/dependabot/npm_and_yarn/webpack-cli-...dependabot-preview[bot]2020-11-072-26/+30
|\ \ \ \
| * | | | Bump webpack-cli from 4.1.0 to 4.2.0dependabot-preview[bot]2020-11-072-26/+30
| | |/ / | |/| |
* | | | Merge pull request #23934 from nextcloud/enh/avoid_scss_compileJohn Molakvoæ2020-11-072-3/+18
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix tests to return config default valuesMorris Jobke2020-11-071-0/+5
| * | | Avoid SCSS compilation if not neededRoeland Jago Douma2020-11-061-3/+13
| | |/ | |/|
* | | Merge pull request #23966 from nextcloud/dependabot/npm_and_yarn/vue-material...dependabot-preview[bot]2020-11-072-4/+4
|\ \ \
| * | | Bump vue-material-design-icons from 4.9.0 to 4.10.0dependabot-preview[bot]2020-11-072-4/+4
| | |/ | |/|