summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | rejig right to left join for sqlite's satisfactionArthur Schiwon2019-12-061-3/+3
|/ / / / / /
* | | | | | Merge pull request #18262 from nextcloud/bugfix/noid/workflow-eventnames-fall...Roeland Jago Douma2019-12-062-3/+3
|\ \ \ \ \ \
| * | | | | | Make sure event names is always an arrayJulius Härtl2019-12-062-3/+3
|/ / / / / /
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-12-0688-6/+288
* | | | | | Merge pull request #18242 from nextcloud/directEditingEditorWithIdRoeland Jago Douma2019-12-051-0/+1
|\ \ \ \ \ \
| * | | | | | add id to editor of direct editingtobiasKaminsky2019-12-051-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #18216 from nextcloud/fix/license-scriptRoeland Jago Douma2019-12-052476-3706/+7283
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Update license headersChristoph Wurst2019-12-052476-3691/+7242
| * | | | | Update license script appsChristoph Wurst2019-12-051-15/+41
|/ / / / /
* | | | | Merge pull request #18250 from nextcloud/fix/gallery/photos/shippedRoeland Jago Douma2019-12-051-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix shipped.jsonRoeland Jago Douma2019-12-051-1/+1
|/ / / /