summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-12-1018-22/+134
* Merge pull request #18299 from nextcloud/bugfix/noid/filecache_bigint_mountsRoeland Jago Douma2019-12-092-0/+2
|\
| * Convert various columns in oc_mounts to bigintGeorg Ehrke2019-12-092-0/+2
* | Merge pull request #18184 from nextcloud/bugfix/noid/is-trusted-domainRoeland Jago Douma2019-12-093-4/+21
|\ \
| * | Move overwritehost check to isTrustedDomainJulius Härtl2019-12-073-4/+21
* | | Merge pull request #18300 from nextcloud/bug/18295/recovery-initializationRoeland Jago Douma2019-12-093-6/+0
|\ \ \
| * | | Fix Argument 3 passed to OCA\Encryption\Recovery::__construct() must be an in...Daniel Kesselberg2019-12-093-6/+0
* | | | Merge pull request #18256 from nextcloud/files-aditional-scripts-new-eventsRoeland Jago Douma2019-12-094-5/+9
|\ \ \ \
| * | | | use OCP\EventDispatcher\GenericEvent in more placesRobin Appelman2019-12-093-4/+8
| * | | | use OCP\EventDispatcher\GenericEvent for loading additional scripts in the fi...Robin Appelman2019-12-051-1/+1
* | | | | Merge pull request #18231 from nextcloud/fix/shared_version_restoreRoeland Jago Douma2019-12-093-15/+64
|\ \ \ \ \
| * | | | | update testsRobin Appelman2019-12-051-4/+56
| * | | | | Fix restoring shared versionsRoeland Jago Douma2019-12-052-11/+8
| |/ / / /
* | | | | Merge pull request #18263 from nextcloud/fix/search/limit_to_home_limitRoeland Jago Douma2019-12-091-0/+4
|\ \ \ \ \
| * | | | | Fix search limit to homeRoeland Jago Douma2019-12-091-0/+4
|/ / / / /
* | | | | Merge pull request #18287 from nextcloud/enh/add-mimetype-kdbxRoeland Jago Douma2019-12-091-0/+1
|\ \ \ \ \
| * | | | | Add mimetype for keepass database.Daniel Kesselberg2019-12-081-0/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #18281 from nextcloud/dependabot/npm_and_yarn/nextcloud-vu...Roeland Jago Douma2019-12-0912-148/+555
|\ \ \ \ \
| * | | | | Bump nextcloud-vue-collections from 0.6.0 to 0.7.1dependabot-preview[bot]2019-12-0812-148/+555
| |/ / / /
* | | | | Merge pull request #18288 from nextcloud/bug/18277/catch-json-errorsRoeland Jago Douma2019-12-093-19/+39
|\ \ \ \ \
| * | | | | Move custom definition logic into methodDaniel Kesselberg2019-12-092-24/+18
| * | | | | Ensure that we don't merge broken json.Daniel Kesselberg2019-12-093-14/+40
| | |_|/ / | |/| | |
* | | | | Merge pull request #18294 from nextcloud/fix/18020/get_share_for_recipientRoeland Jago Douma2019-12-091-2/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fetch the share for the recipientRoeland Jago Douma2019-12-091-2/+6
* | | | | Merge pull request #18292 from nextcloud/fix/ldap-application-routes-instanceRoeland Jago Douma2019-12-091-2/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix LDAP application class instance created directlyChristoph Wurst2019-12-091-2/+3
|/ / / /
* | | | Merge pull request #17325 from nextcloud/enh/decouple-register-resource-providerChristoph Wurst2019-12-0911-31/+304
|\ \ \ \
| * | | | Decouple resource provider registrationDaniel Kesselberg2019-12-0711-31/+304
| | |/ / | |/| |
* | | | Merge pull request #18278 from nextcloud/dependabot/npm_and_yarn/babel/preset...Roeland Jago Douma2019-12-092-90/+71
|\ \ \ \
| * | | | Bump @babel/preset-env from 7.7.4 to 7.7.6dependabot-preview[bot]2019-12-092-90/+71
* | | | | Merge pull request #18289 from nextcloud/bug/18203/dont-log-exception-on-conn...Roeland Jago Douma2019-12-091-2/+2
|\ \ \ \ \
| * | | | | Don't log the stack trace for ConnectExceptionDaniel Kesselberg2019-12-081-2/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #18264 from nextcloud/enh/actions/fixRoeland Jago Douma2019-12-091-0/+13
|\ \ \ \ \
| * | | | | Move away from fixupbotRoeland Jago Douma2019-12-061-0/+13
| | |_|/ / | |/| | |
* | | | | Merge pull request #18282 from nextcloud/dependabot/npm_and_yarn/eslint-loade...Roeland Jago Douma2019-12-092-9/+21
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Bump eslint-loader from 3.0.2 to 3.0.3dependabot-preview[bot]2019-12-082-9/+21
| | |/ / | |/| |
* | | | Merge pull request #18280 from nextcloud/dependabot/npm_and_yarn/babel/core-7...Roeland Jago Douma2019-12-092-11/+11
|\ \ \ \
| * | | | Bump @babel/core from 7.7.4 to 7.7.5dependabot-preview[bot]2019-12-082-11/+11
| |/ / /
* | | | Merge pull request #18290 from nextcloud/debt/tests-enable-disable-apps-conta...Roeland Jago Douma2019-12-092-8/+12
|\ \ \ \
| * | | | Fix: Using assertContains() with string haystacks is deprecated and will not ...Daniel Kesselberg2019-12-082-8/+12
| |/ / /
* | | | [tx-robot] updated from transifexNextcloud bot2019-12-0934-38/+250
* | | | Bump css-loader from 3.2.0 to 3.2.1 (#18279)John Molakvoæ2019-12-084-13/+45
|\ \ \ \
| * | | | Bump css-loader from 3.2.0 to 3.2.1dependabot-preview[bot]2019-12-084-13/+45
| |/ / /
* / / / [tx-robot] updated from transifexNextcloud bot2019-12-0818-96/+190
|/ / /
* | | Fix size of header menus (#16057)John Molakvoæ2019-12-071-9/+4
|\ \ \
| * | | Move to proper scroll container and add more space to heightJulius Härtl2019-10-041-12/+4
| * | | Fix horizontal scrollbar in user menuJan-Christoph Borchardt2019-10-041-1/+1
| * | | Fix size of header menusJulius Härtl2019-10-041-0/+3
* | | | [tx-robot] updated from transifexNextcloud bot2019-12-0750-122/+276
* | | | rejig right to left join for sqlite's satisfaction (#18254)John Molakvoæ2019-12-061-3/+3
|\ \ \ \ | |_|/ / |/| | |