aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Deprecate js globalsRoeland Jago Douma2019-10-143-21/+22
* Merge pull request #17530 from nextcloud/dependabot/npm_and_yarn/babel/preset...Roeland Jago Douma2019-10-142-26/+38
|\
| * Bump @babel/preset-env from 7.6.2 to 7.6.3dependabot-preview[bot]2019-10-132-26/+38
* | [tx-robot] updated from transifexNextcloud bot2019-10-1410-16/+40
|/
* Merge pull request #17527 from nextcloud/dependabot/npm_and_yarn/babel/core-7...Roeland Jago Douma2019-10-132-8/+50
|\
| * Bump @babel/core from 7.6.2 to 7.6.4dependabot-preview[bot]2019-10-132-8/+50
* | Merge pull request #17528 from nextcloud/dependabot/npm_and_yarn/nextcloud-vu...Roeland Jago Douma2019-10-1318-366/+586
|\ \
| * | Bump nextcloud-vue from 0.12.4 to 0.12.6dependabot-preview[bot]2019-10-1318-366/+586
|/ /
* | Merge pull request #17529 from nextcloud/dependabot/npm_and_yarn/dompurify-2.0.6Roeland Jago Douma2019-10-1312-62/+62
|\ \
| * | Bump dompurify from 2.0.3 to 2.0.6dependabot-preview[bot]2019-10-1312-62/+62
|/ /
* | Merge pull request #17526 from nextcloud/dependabot/npm_and_yarn/handlebars-4...Roeland Jago Douma2019-10-1310-16/+22
|\ \ | |/ |/|
| * Bump handlebars from 4.4.2 to 4.4.3dependabot-preview[bot]2019-10-1310-16/+22
|/
* Merge pull request #17524 from nextcloud/dependabot/npm_and_yarn/nextcloud/ax...Roeland Jago Douma2019-10-132-10/+10
|\
| * Bump @nextcloud/axios from 0.4.1 to 0.4.2dependabot-preview[bot]2019-10-132-10/+10
* | Merge pull request #17531 from nextcloud/dependabot/npm_and_yarn/webpack-4.41.1Roeland Jago Douma2019-10-1322-28/+28
|\ \
| * | Bump webpack from 4.41.0 to 4.41.1dependabot-preview[bot]2019-10-1322-28/+28
| |/
* | Merge pull request #17523 from nextcloud/dependabot/npm_and_yarn/build/handle...Roeland Jago Douma2019-10-132-11/+11
|\ \
| * | Bump handlebars from 4.4.2 to 4.4.3 in /builddependabot-preview[bot]2019-10-132-11/+11
| |/
* / [tx-robot] updated from transifexNextcloud bot2019-10-138-2/+94
|/
* Merge pull request #17390 from nextcloud/refactor/external-initial-state-implRoeland Jago Douma2019-10-1237-265/+242
|\
| * Use the external initial state implementationChristoph Wurst2019-10-1237-265/+242
|/
* [tx-robot] updated from transifexNextcloud bot2019-10-1218-18/+162
* Merge pull request #17510 from nextcloud/bump/nextcloud/event-busRoeland Jago Douma2019-10-1130-113/+113
|\
| * Bump nextcloud/event-bus to 0.2.1Roeland Jago Douma2019-10-1130-113/+113
|/
* Merge pull request #17505 from nextcloud/design/input-contrastRoeland Jago Douma2019-10-111-1/+7
|\
| * Increase contast between text and placeholder in input fieldsJulius Härtl2019-10-101-1/+7
* | [tx-robot] updated from transifexNextcloud bot2019-10-1140-2/+172
* | Merge pull request #17484 from nextcloud/bugfix/activity-last-timestamp-mergedRoeland Jago Douma2019-10-101-1/+2
|\ \ | |/ |/|
| * Always use the latest timestamp for merged activitiesJulius Härtl2019-10-091-1/+2
* | Merge pull request #17488 from nextcloud/fix/phan-settings-appkesselb2019-10-091-1/+0
|\ \
| * | Remove settings/ from phanDaniel Kesselberg2019-10-091-1/+0
* | | Merge pull request #17276 from nextcloud/storage-id-eqRoeland Jago Douma2019-10-092-2/+10
|\ \ \
| * | | use eq instead of in for loading single storageRobin Appelman2019-09-261-1/+9
| * | | log which storage id can't be insertedRobin Appelman2019-09-261-1/+1
* | | | Merge pull request #17458 from nextcloud/enh/avoid_direct_queryRoeland Jago Douma2019-10-096-19/+24
|\ \ \ \
| * | | | Make renewSessionToken return the new tokenRoeland Jago Douma2019-10-096-19/+24
|/ / / /
* | | | Merge pull request #17480 from nextcloud/enhancement/drone/no-submodule-when-...Roeland Jago Douma2019-10-091-8/+0
|\ \ \ \
| * | | | Remove unwanted submodulesJohn Molakvoæ (skjnldsv)2019-10-091-8/+0
* | | | | [tx-robot] updated from transifexNextcloud bot2019-10-0924-22/+118
| |_|/ / |/| | |
* | | | Merge pull request #17475 from nextcloud/ci/integration/parallel_composerkesselb2019-10-081-15/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Run composer install in parallelRoeland Jago Douma2019-10-081-15/+15
* | | | Merge pull request #17471 from nextcloud/bugfix/15951/public-txt-truncation-sizeRoeland Jago Douma2019-10-081-1/+1
|\ \ \ \
| * | | | Raised public txt file truncation size to 10kbJohannes Koenig2019-10-081-1/+1
* | | | | Merge pull request #17463 from nextcloud/enh/token/cacheRoeland Jago Douma2019-10-081-5/+42
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Cache the public key tokensRoeland Jago Douma2019-10-081-5/+42
| |/ / /
* | | | Merge pull request #17445 from nextcloud/db/add-index-on-schedulingobjectsRoeland Jago Douma2019-10-082-0/+20
|\ \ \ \
| * | | | Check and add index on principaluri for schedulingobjects tableThomas Citharel2019-10-082-0/+20
| |/ / /
* | | | Merge pull request #17462 from gary-kim/fix/noid/check-if-tag-name-emptyRoeland Jago Douma2019-10-081-0/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Show error if tag name is emptyGary Kim2019-10-081-0/+6
|/ / /
* | | Merge pull request #17429 from nextcloud/db/add-index-on-calendar-object-prop...Roeland Jago Douma2019-10-082-0/+21
|\ \ \