From 842d68c1295cfd76f2db4d537b440ec603d0925b Mon Sep 17 00:00:00 2001 From: Matt Rider Date: Thu, 7 Mar 2019 20:59:13 -0300 Subject: [PATCH 1/7] Update ReportModal to work with back end --- components/ReportModal.vue | 9 +- cypress/integration/05.ReportContent.feature | 2 +- cypress/integration/common/report.js | 31 +- locales/en.json | 2 +- package.json | 7 +- yarn.lock | 636 ++++++++++++++++++- 6 files changed, 635 insertions(+), 52 deletions(-) diff --git a/components/ReportModal.vue b/components/ReportModal.vue index 1ae23fd94..a195d1674 100644 --- a/components/ReportModal.vue +++ b/components/ReportModal.vue @@ -90,24 +90,19 @@ export default { this.$store.commit('modal/SET_OPEN', {}) }, report() { - console.log('') this.loading = true this.disabled = true this.$apollo .mutate({ mutation: gql` - mutation($id: ID!, $type: ResourceEnum!, $description: String) { - report( - resource: { id: $id, type: $type } - description: $description - ) { + mutation($id: ID!, $description: String) { + report(id: $id, description: $description) { id } } `, variables: { id: this.data.id, - type: this.data.context, description: '-' } }) diff --git a/cypress/integration/05.ReportContent.feature b/cypress/integration/05.ReportContent.feature index 76ebb4fcd..92271cbcb 100644 --- a/cypress/integration/05.ReportContent.feature +++ b/cypress/integration/05.ReportContent.feature @@ -15,7 +15,7 @@ Feature: Report and Moderate Scenario Outline: Report a post from various pages Given I am logged in with a "user" role When I see David Irving's post on the - And I click on "Report Contribution" from the triple dot menu of the post + And I click on "Report Post" from the triple dot menu of the post And I confirm the reporting dialog because it is a criminal act under German law: """ Do you really want to report the contribution "The Truth about the Holocaust"? diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js index db264ddde..985a62af1 100644 --- a/cypress/integration/common/report.js +++ b/cypress/integration/common/report.js @@ -39,18 +39,15 @@ Given('I am logged in with a {string} role', role => { }) }) -When( - 'I click on "Report Contribution" from the triple dot menu of the post', - () => { - cy.contains('.ds-card', davidIrvingPostTitle) - .find('.content-menu-trigger') - .click() +When('I click on "Report Post" from the triple dot menu of the post', () => { + cy.contains('.ds-card', davidIrvingPostTitle) + .find('.content-menu-trigger') + .click() - cy.get('.popover .ds-menu-item-link') - .contains('Report Contribution') - .click() - } -) + cy.get('.popover .ds-menu-item-link') + .contains('Report Post') + .click() +}) When( 'I click on "Report User" from the triple dot menu in the user info box', @@ -122,16 +119,16 @@ When(/^I confirm the reporting dialog .*:$/, message => { Given('somebody reported the following posts:', table => { table.hashes().forEach(({ id }) => { - const reporter = { - email: `reporter${id}@example.org`, + const submitter = { + email: `submitter${id}@example.org`, password: '1234' } cy.factory() - .create('User', reporter) - .authenticateAs(reporter) + .create('User', submitter) + .authenticateAs(submitter) .create('Report', { - description: "I don't like this post", - resource: { id, type: 'contribution' } + id, + description: "Offensive content" }) }) }) diff --git a/locales/en.json b/locales/en.json index cfe634675..78b7ab433 100644 --- a/locales/en.json +++ b/locales/en.json @@ -144,7 +144,7 @@ "message": "Do you really want to report the user \"{name}\"?" }, "contribution": { - "title": "Report Contribution", + "title": "Report Post", "type": "Contribution", "message": "Do you really want to report the contribution \"{name}\"?" }, diff --git a/package.json b/package.json index 8cc7620fa..b699f88b3 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ } }, "dependencies": { + "@human-connection/styleguide": "~0.5.2", "@nuxtjs/apollo": "4.0.0-rc4", "@nuxtjs/axios": "~5.4.1", "@nuxtjs/dotenv": "~1.3.0", @@ -43,6 +44,7 @@ "apollo-client": "~2.5.1", "cookie-universal-nuxt": "~2.0.14", "cross-env": "~5.2.0", + "cypress": "^3.1.5", "date-fns": "2.0.0-alpha.27", "express": "~4.16.4", "graphql": "~14.1.1", @@ -51,12 +53,11 @@ "nuxt": "~2.4.5", "nuxt-env": "~0.1.0", "portal-vue": "~1.5.1", - "@human-connection/styleguide": "~0.5.2", - "v-tooltip": "~2.0.0-rc.33", - "vue-count-to": "~1.0.13", "string-hash": "^1.1.3", "tiptap": "^1.13.0", "tiptap-extensions": "^1.13.0", + "v-tooltip": "~2.0.0-rc.33", + "vue-count-to": "~1.0.13", "vue-izitoast": "1.1.2", "vue-sweetalert-icons": "~3.2.0", "vuex-i18n": "~1.11.0" diff --git a/yarn.lock b/yarn.lock index 81e60045b..8c8cc48dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -876,6 +876,24 @@ fs-extra "7.0.0" watchify "3.11.0" +"@cypress/listr-verbose-renderer@0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#a77492f4b11dcc7c446a34b3e28721afd33c642a" + integrity sha1-p3SS9LEdzHxEajSz4ochr9M8ZCo= + dependencies: + chalk "^1.1.3" + cli-cursor "^1.0.2" + date-fns "^1.27.2" + figures "^1.7.0" + +"@cypress/xvfb@1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.2.3.tgz#6319afdcdcff7d1505daeeaa84484d0596189860" + integrity sha512-yYrK+/bgL3hwoRHMZG4r5fyLniCy1pXex5fimtewAY6vE/jsVs8Q37UsEO03tFlcmiLnQ3rBNMaZBYTi/+C1cw== + dependencies: + debug "^3.1.0" + lodash.once "^4.1.1" + "@human-connection/styleguide@~0.5.2": version "0.5.2" resolved "https://registry.yarnpkg.com/@human-connection/styleguide/-/styleguide-0.5.2.tgz#a7d05b612562cfbe4377032bdf32df4a8f0e3f45" @@ -1218,6 +1236,16 @@ dependencies: "@types/node" "*" +"@types/blob-util@1.3.3": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@types/blob-util/-/blob-util-1.3.3.tgz#adba644ae34f88e1dd9a5864c66ad651caaf628a" + integrity sha512-4ahcL/QDnpjWA2Qs16ZMQif7HjGP2cw3AGjHabybjw7Vm1EKu+cfQN1D78BaZbS1WJNa1opSMF5HNMztx7lR0w== + +"@types/bluebird@3.5.18": + version "3.5.18" + resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.18.tgz#6a60435d4663e290f3709898a4f75014f279c4d6" + integrity sha512-OTPWHmsyW18BhrnG5x8F7PzeZ2nFxmHGb42bZn79P9hl+GI5cMzyPgQTwNjbem0lJhoru/8vtjAFCUOu3+gE2w== + "@types/body-parser@*", "@types/body-parser@1.17.0": version "1.17.0" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c" @@ -1226,6 +1254,24 @@ "@types/connect" "*" "@types/node" "*" +"@types/chai-jquery@1.1.35": + version "1.1.35" + resolved "https://registry.yarnpkg.com/@types/chai-jquery/-/chai-jquery-1.1.35.tgz#9a8f0a39ec0851b2768a8f8c764158c2a2568d04" + integrity sha512-7aIt9QMRdxuagLLI48dPz96YJdhu64p6FCa6n4qkGN5DQLHnrIjZpD9bXCvV2G0NwgZ1FAmfP214dxc5zNCfgQ== + dependencies: + "@types/chai" "*" + "@types/jquery" "*" + +"@types/chai@*": + version "4.1.7" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.7.tgz#1b8e33b61a8c09cbe1f85133071baa0dbf9fa71a" + integrity sha512-2Y8uPt0/jwjhQ6EiluT0XCri1Dbplr0ZxfFXUz+ye13gaqE8u5gL5ppao1JrUYr9cIip5S6MvQzBS7Kke7U9VA== + +"@types/chai@4.0.8": + version "4.0.8" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.0.8.tgz#d27600e9ba2f371e08695d90a0fe0408d89c7be7" + integrity sha512-m812CONwdZn/dMzkIJEY0yAs4apyTkTORgfB2UsMOxgkUbC205AHnm4T8I0I5gPg9MHrFc1dJ35iS75c0CJkjg== + "@types/connect@*": version "3.4.32" resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28" @@ -1267,6 +1313,23 @@ "@types/express-serve-static-core" "*" "@types/serve-static" "*" +"@types/jquery@*": + version "3.3.29" + resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.29.tgz#680a2219ce3c9250483722fccf5570d1e2d08abd" + integrity sha512-FhJvBninYD36v3k6c+bVk1DSZwh7B5Dpb/Pyk3HKVsiohn0nhbefZZ+3JXbWQhFyt0MxSl2jRDdGQPHeOHFXrQ== + dependencies: + "@types/sizzle" "*" + +"@types/jquery@3.3.6": + version "3.3.6" + resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.6.tgz#5932ead926307ca21e5b36808257f7c926b06565" + integrity sha512-403D4wN95Mtzt2EoQHARf5oe/jEPhzBOBNrunk+ydQGW8WmkQ/E8rViRAEB1qEt/vssfGfNVD6ujP4FVeegrLg== + +"@types/lodash@4.14.87": + version "4.14.87" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.87.tgz#55f92183b048c2c64402afe472f8333f4e319a6b" + integrity sha512-AqRC+aEF4N0LuNHtcjKtvF9OTfqZI0iaBoe3dA6m/W+/YZJBZjBmW/QIZ8fBeXC6cnytSY9tBoFBqZ9uSCeVsw== + "@types/long@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.0.tgz#719551d2352d301ac8b81db732acb6bdc28dbdef" @@ -1277,6 +1340,16 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d" integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw== +"@types/minimatch@3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" + integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== + +"@types/mocha@2.2.44": + version "2.2.44" + resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.44.tgz#1d4a798e53f35212fd5ad4d04050620171cd5b5e" + integrity sha512-k2tWTQU8G4+iSMvqKi0Q9IIsWAp/n8xzdZS4Q4YVIltApoMA00wFBFdlJnmoaK1/z7B0Cy0yPe6GgXteSmdUNw== + "@types/node@*": version "11.9.4" resolved "https://registry.yarnpkg.com/@types/node/-/node-11.9.4.tgz#ceb0048a546db453f6248f2d1d95e937a6f00a14" @@ -1310,6 +1383,29 @@ "@types/express-serve-static-core" "*" "@types/mime" "*" +"@types/sinon-chai@3.2.2": + version "3.2.2" + resolved "https://registry.yarnpkg.com/@types/sinon-chai/-/sinon-chai-3.2.2.tgz#5cfdbda70bae30f79a9423334af9e490e4cce793" + integrity sha512-5zSs2AslzyPZdOsbm2NRtuSNAI2aTWzNKOHa/GRecKo7a5efYD7qGcPxMZXQDayVXT2Vnd5waXxBvV31eCZqiA== + dependencies: + "@types/chai" "*" + "@types/sinon" "*" + +"@types/sinon@*": + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.0.9.tgz#981593ea396a4fb1b69e3d8ba04de0a420fd4b16" + integrity sha512-PS102Fj4BAa9B8C0qLp677UiW9sdI+9ZhsD6GdPbcNKNdymyKKRJ1Bsc5Uk5pQV7jTtLozTQdxzgnQx+aH8Pvg== + +"@types/sinon@7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.0.0.tgz#84e707e157ec17d3e4c2a137f41fc3f416c0551e" + integrity sha512-kcYoPw0uKioFVC/oOqafk2yizSceIQXCYnkYts9vJIwQklFRsMubTObTDrjQamUyBRd47332s85074cd/hCwxg== + +"@types/sizzle@*": + version "2.3.2" + resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47" + integrity sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg== + "@types/strip-bom@^3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@types/strip-bom/-/strip-bom-3.0.0.tgz#14a8ec3956c2e81edb7520790aecf21c290aebd2" @@ -1686,6 +1782,16 @@ ajv-keywords@^3.1.0: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d" integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw== +ajv@^5.1.0: + version "5.5.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" + integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU= + dependencies: + co "^4.6.0" + fast-deep-equal "^1.0.0" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.3.0" + ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1: version "6.9.1" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1" @@ -1725,6 +1831,11 @@ ansi-colors@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813" integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw== +ansi-escapes@^1.0.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" + integrity sha1-06ioOzGapneTZisT52HHkRQiMG4= + ansi-escapes@^3.0.0, ansi-escapes@^3.1.0, ansi-escapes@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" @@ -2181,6 +2292,13 @@ async-retry@^1.2.1: dependencies: retry "0.12.0" +async@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/async/-/async-2.4.0.tgz#4990200f18ea5b837c2cc4f8c031a6985c385611" + integrity sha1-SZAgDxjqW4N8LMT4wDGmmFw4VhE= + dependencies: + lodash "^4.14.0" + async@^2.1.4, async@^2.3.0, async@^2.5.0, async@^2.6.1: version "2.6.2" resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381" @@ -2215,7 +2333,7 @@ aws-sign2@~0.7.0: resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= -aws4@^1.8.0: +aws4@^1.6.0, aws4@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== @@ -2335,7 +2453,7 @@ babel-preset-jest@^24.1.0: "@babel/plugin-syntax-object-rest-spread" "^7.0.0" babel-plugin-jest-hoist "^24.1.0" -babel-runtime@^6.11.6, babel-runtime@^6.22.0, babel-runtime@^6.26.0: +babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= @@ -2461,6 +2579,11 @@ block-stream@*: dependencies: inherits "~2.0.0" +bluebird@3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c" + integrity sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw= + bluebird@3.5.2: version "3.5.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a" @@ -2768,6 +2891,11 @@ bser@^2.0.0: dependencies: node-int64 "^0.4.0" +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + buffer-equal-constant-time@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" @@ -2868,6 +2996,13 @@ cached-path-relative@^1.0.0: resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz#a13df4196d26776220cc3356eb147a52dba2c6db" integrity sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg== +cachedir@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-1.3.0.tgz#5e01928bf2d95b5edd94b0942188246740e0dbc4" + integrity sha512-O1ji32oyON9laVPJL1IZ5bmwd2cB46VfpxkDequezH+15FDzzVddEyrGEeX4WusDSqKxdyFdDQDEG1yo1GoWkg== + dependencies: + os-homedir "^1.0.1" + caller-callsite@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" @@ -2972,7 +3107,16 @@ chai@^4.1.2: pathval "^1.1.0" type-detect "^4.0.5" -chalk@^1.1.1, chalk@^1.1.3: +chalk@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" + integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= @@ -3002,6 +3146,11 @@ check-error@^1.0.2: resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= +check-more-types@2.24.0: + version "2.24.0" + resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600" + integrity sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA= + check-types@^7.3.0: version "7.4.0" resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4" @@ -3066,7 +3215,7 @@ chrome-trace-event@^1.0.0: dependencies: tslib "^1.9.0" -ci-info@^1.5.0, ci-info@^1.6.0: +ci-info@^1.0.0, ci-info@^1.5.0, ci-info@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A== @@ -3121,6 +3270,13 @@ cli-boxes@^2.0.0: resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.0.0.tgz#de5eb5ce7462833133e85f5710fabb38377e9333" integrity sha512-P46J1Wf3BVD0E5plybtf6g/NtHYAUlOIt7w3ou/Ova/p7dJPdukPV4yp+BF8dpmnnk45XlMzn+x9kfzyucKzrg== +cli-cursor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" + integrity sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc= + dependencies: + restore-cursor "^1.0.1" + cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" @@ -3128,6 +3284,11 @@ cli-cursor@^2.1.0: dependencies: restore-cursor "^2.0.0" +cli-spinners@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c" + integrity sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw= + cli-spinners@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a" @@ -3150,6 +3311,14 @@ cli-table@^0.3.1: dependencies: colors "1.0.3" +cli-truncate@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574" + integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ= + dependencies: + slice-ansi "0.0.4" + string-width "^1.0.1" + cli-width@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" @@ -3288,13 +3457,18 @@ combine-source-map@^0.8.0, combine-source-map@~0.8.0: lodash.memoize "~3.0.3" source-map "~0.5.3" -combined-stream@^1.0.6, combined-stream@~1.0.6: +combined-stream@^1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828" integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w== dependencies: delayed-stream "~1.0.0" +commander@2.11.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" + integrity sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ== + commander@2.17.x, commander@~2.17.1: version "2.17.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" @@ -3305,6 +3479,13 @@ commander@^2.18.0, commander@^2.19.0, commander@^2.9.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== +common-tags@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.4.0.tgz#1187be4f3d4cf0c0427d43f74eef1f73501614c0" + integrity sha1-EYe+Tz1M8MBCfUP3Tu8fc1AWFMA= + dependencies: + babel-runtime "^6.18.0" + commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -3345,6 +3526,15 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= +concat-stream@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" + integrity sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc= + dependencies: + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + concat-stream@^1.5.0, concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" @@ -3938,6 +4128,52 @@ cypress-cucumber-preprocessor@~1.11.0: glob "^7.1.2" through "^2.3.8" +cypress@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.1.5.tgz#5227b2ce9306c47236d29e703bad9055d7218042" + integrity sha512-jzYGKJqU1CHoNocPndinf/vbG28SeU+hg+4qhousT/HDBMJxYgjecXOmSgBX/ga9/TakhqSrIrSP2r6gW/OLtg== + dependencies: + "@cypress/listr-verbose-renderer" "0.4.1" + "@cypress/xvfb" "1.2.3" + "@types/blob-util" "1.3.3" + "@types/bluebird" "3.5.18" + "@types/chai" "4.0.8" + "@types/chai-jquery" "1.1.35" + "@types/jquery" "3.3.6" + "@types/lodash" "4.14.87" + "@types/minimatch" "3.0.3" + "@types/mocha" "2.2.44" + "@types/sinon" "7.0.0" + "@types/sinon-chai" "3.2.2" + bluebird "3.5.0" + cachedir "1.3.0" + chalk "2.4.1" + check-more-types "2.24.0" + commander "2.11.0" + common-tags "1.4.0" + debug "3.1.0" + execa "0.10.0" + executable "4.1.1" + extract-zip "1.6.6" + fs-extra "4.0.1" + getos "3.1.0" + glob "7.1.2" + is-ci "1.0.10" + is-installed-globally "0.1.0" + lazy-ass "1.6.0" + listr "0.12.0" + lodash "4.17.11" + log-symbols "2.2.0" + minimist "1.2.0" + moment "2.22.2" + ramda "0.24.1" + request "2.87.0" + request-progress "0.3.1" + supports-color "5.1.0" + tmp "0.0.31" + url "0.11.0" + yauzl "2.8.0" + d@1: version "1.0.0" resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" @@ -3966,6 +4202,11 @@ date-fns@2.0.0-alpha.27: resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-alpha.27.tgz#5ecd4204ef0e7064264039570f6e8afbc014481c" integrity sha512-cqfVLS+346P/Mpj2RpDrBv0P4p2zZhWWvfY5fuWrXNR/K38HaAGEkeOwb47hIpQP9Jr/TIxjZ2/sNMQwdXuGMg== +date-fns@^1.27.2: + version "1.30.1" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c" + integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw== + date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" @@ -3983,6 +4224,13 @@ debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8: dependencies: ms "2.0.0" +debug@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + debug@4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.0.1.tgz#f9bb36d439b8d1f0dd52d8fb6b46e4ebb8c1cd5b" @@ -4357,6 +4605,11 @@ electron-to-chromium@^1.3.103: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9" integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g== +elegant-spinner@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" + integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= + elliptic@^6.0.0: version "6.4.1" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a" @@ -4720,6 +4973,19 @@ exec-sh@^0.2.0: dependencies: merge "^1.2.0" +execa@0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50" + integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw== + dependencies: + cross-spawn "^6.0.0" + get-stream "^3.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + execa@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" @@ -4746,6 +5012,18 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +executable@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c" + integrity sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg== + dependencies: + pify "^2.2.0" + +exit-hook@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" + integrity sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g= + exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" @@ -4840,7 +5118,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@~3.0.2: +extend@~3.0.1, extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== @@ -4898,6 +5176,16 @@ extract-from-css@^0.4.4: dependencies: css "^2.1.0" +extract-zip@1.6.6: + version "1.6.6" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c" + integrity sha1-EpDt6NINCHK0Kf0/NRyhKOxe+Fw= + dependencies: + concat-stream "1.6.0" + debug "2.6.9" + mkdirp "0.5.0" + yauzl "2.4.1" + extsprintf@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" @@ -4908,6 +5196,11 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= +fast-deep-equal@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" + integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ= + fast-deep-equal@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" @@ -4947,6 +5240,13 @@ fb-watchman@^2.0.0: dependencies: bser "^2.0.0" +fd-slicer@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" + integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU= + dependencies: + pend "~1.2.0" + figgy-pudding@^3.5.1: version "3.5.1" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" @@ -4959,6 +5259,14 @@ figures@2.0.0, figures@^2.0.0: dependencies: escape-string-regexp "^1.0.5" +figures@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" + integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= + dependencies: + escape-string-regexp "^1.0.5" + object-assign "^4.1.0" + file-entry-cache@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" @@ -5143,7 +5451,7 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= -form-data@~2.3.2: +form-data@~2.3.1, form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== @@ -5187,6 +5495,15 @@ fs-capacitor@^2.0.0: resolved "https://registry.yarnpkg.com/fs-capacitor/-/fs-capacitor-2.0.0.tgz#6cbafaa39313eebf9c49ecff8795aadc08337fc5" integrity sha512-CIJZpxbVWhO+qyODeCR55Q+6vj0p2oL8DAWd/DZi3Ev+25PimUoScw07K0fPgluaH3lFoqNvwW13BDYfHWFQJw== +fs-extra@4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.1.tgz#7fc0c6c8957f983f57f306a24e5b9ddd8d0dd880" + integrity sha1-f8DGyJV/mD9X8waiTlud3Y0N2IA= + dependencies: + graceful-fs "^4.1.2" + jsonfile "^3.0.0" + universalify "^0.1.0" + fs-extra@7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6" @@ -5318,6 +5635,13 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= +getos@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/getos/-/getos-3.1.0.tgz#db3aa4df15a3295557ce5e81aa9e3e5cdfaa6567" + integrity sha512-i9vrxtDu5DlLVFcrbqUqGWYlZN/zZ4pGMICCAcZoYsX3JA54nYp8r5EThw5K+m2q3wszkx4Th746JstspB0H4Q== + dependencies: + async "2.4.0" + getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" @@ -5361,6 +5685,18 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" +glob@7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" + integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1: version "7.1.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" @@ -5505,6 +5841,14 @@ har-schema@^2.0.0: resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= +har-validator@~5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd" + integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0= + dependencies: + ajv "^5.1.0" + har-schema "^2.0.0" + har-validator@~5.1.0: version "5.1.3" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" @@ -5539,6 +5883,11 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" +has-flag@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" + integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -5909,7 +6258,7 @@ indent-string@^2.1.0: dependencies: repeating "^2.0.0" -indent-string@^3.1.0: +indent-string@^3.0.0, indent-string@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= @@ -6062,6 +6411,13 @@ is-callable@^1.1.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== +is-ci@1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e" + integrity sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4= + dependencies: + ci-info "^1.0.0" + is-ci@^1.0.10: version "1.2.1" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" @@ -6214,7 +6570,7 @@ is-glob@^4.0.0: dependencies: is-extglob "^2.1.1" -is-installed-globally@^0.1.0: +is-installed-globally@0.1.0, is-installed-globally@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA= @@ -6925,6 +7281,11 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== +json-schema-traverse@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" + integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A= + json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -6971,6 +7332,13 @@ json5@^2.1.0: dependencies: minimist "^1.2.0" +jsonfile@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" + integrity sha1-pezG9l9T9mLEQVx2daAzHQmS7GY= + optionalDependencies: + graceful-fs "^4.1.6" + jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -7106,6 +7474,11 @@ launch-editor@^2.2.1: chalk "^2.3.0" shell-quote "^1.6.1" +lazy-ass@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513" + integrity sha1-eZllXoZGwX8In90YfRUNMyTVRRM= + lcid@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" @@ -7145,6 +7518,57 @@ linkify-it@~2.1.0: dependencies: uc.micro "^1.0.1" +listr-silent-renderer@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e" + integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4= + +listr-update-renderer@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz#ca80e1779b4e70266807e8eed1ad6abe398550f9" + integrity sha1-yoDhd5tOcCZoB+ju0a1qvjmFUPk= + dependencies: + chalk "^1.1.3" + cli-truncate "^0.2.1" + elegant-spinner "^1.0.1" + figures "^1.7.0" + indent-string "^3.0.0" + log-symbols "^1.0.2" + log-update "^1.0.2" + strip-ansi "^3.0.1" + +listr-verbose-renderer@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#8206f4cf6d52ddc5827e5fd14989e0e965933a35" + integrity sha1-ggb0z21S3cWCfl/RSYng6WWTOjU= + dependencies: + chalk "^1.1.3" + cli-cursor "^1.0.2" + date-fns "^1.27.2" + figures "^1.7.0" + +listr@0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/listr/-/listr-0.12.0.tgz#6bce2c0f5603fa49580ea17cd6a00cc0e5fa451a" + integrity sha1-a84sD1YD+klYDqF81qAMwOX6RRo= + dependencies: + chalk "^1.1.3" + cli-truncate "^0.2.1" + figures "^1.7.0" + indent-string "^2.1.0" + is-promise "^2.1.0" + is-stream "^1.1.0" + listr-silent-renderer "^1.1.1" + listr-update-renderer "^0.2.0" + listr-verbose-renderer "^0.4.0" + log-symbols "^1.0.2" + log-update "^1.0.2" + ora "^0.2.3" + p-map "^1.1.1" + rxjs "^5.0.0-beta.11" + stream-to-observable "^0.1.0" + strip-ansi "^3.0.1" + load-json-file@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" @@ -7276,7 +7700,7 @@ lodash.mergewith@^4.6.0: resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ== -lodash.once@^4.0.0: +lodash.once@^4.0.0, lodash.once@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= @@ -7316,18 +7740,33 @@ lodash.uniqueid@^4.0.1: resolved "https://registry.yarnpkg.com/lodash.uniqueid/-/lodash.uniqueid-4.0.1.tgz#3268f26a7c88e4f4b1758d679271814e31fa5b26" integrity sha1-MmjyanyI5PSxdY1nknGBTjH6WyY= -lodash@4.x, lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: +lodash@4.17.11, lodash@4.x, lodash@^4.0.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== -log-symbols@^2.2.0: +log-symbols@2.2.0, log-symbols@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg== dependencies: chalk "^2.0.1" +log-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" + integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg= + dependencies: + chalk "^1.0.0" + +log-update@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1" + integrity sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE= + dependencies: + ansi-escapes "^1.0.0" + cli-cursor "^1.0.2" + long@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" @@ -7565,7 +8004,7 @@ miller-rabin@^4.0.0: resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad" integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg== -mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19: +mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19: version "2.1.22" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd" integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog== @@ -7609,16 +8048,16 @@ minimist@0.0.8: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= +minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= + minimist@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de" integrity sha1-md9lelJXTCHJBXSX33QnkLK0wN4= -minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= - minimist@~0.0.1: version "0.0.10" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" @@ -7671,6 +8110,13 @@ mixin-object@^2.0.1: for-in "^0.1.3" is-extendable "^0.1.1" +mkdirp@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12" + integrity sha1-HXMHam35hs2TROFecfzAWkyavxI= + dependencies: + minimist "0.0.8" + mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" @@ -7699,6 +8145,11 @@ module-deps@^6.0.0: through2 "^2.0.0" xtend "^4.0.0" +moment@2.22.2: + version "2.22.2" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66" + integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y= + move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" @@ -8098,6 +8549,11 @@ nwsapi@^2.0.7: resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.0.tgz#781065940aed90d9bb01ca5d0ce0fcf81c32712f" integrity sha512-ZG3bLAvdHmhIjaQ/Db1qvBxsGvFMLIRpQszyqbg31VJ53UP++uZX1/gf3Ut96pdwN9AuDwlMqIYLm0UPCdUeHg== +oauth-sign@~0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" + integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM= + oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" @@ -8191,6 +8647,11 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" +onetime@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" + integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k= + onetime@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" @@ -8245,6 +8706,16 @@ optionator@^0.8.1, optionator@^0.8.2: type-check "~0.3.2" wordwrap "~1.0.0" +ora@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4" + integrity sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q= + dependencies: + chalk "^1.1.1" + cli-cursor "^1.0.2" + cli-spinners "^0.1.2" + object-assign "^4.0.1" + ora@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/ora/-/ora-3.1.0.tgz#dbedd8c03b5d017fb67083e87ee52f5ec89823ed" @@ -8267,7 +8738,7 @@ os-browserify@^0.3.0, os-browserify@~0.3.0: resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= -os-homedir@^1.0.0: +os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= @@ -8288,7 +8759,7 @@ os-locale@^3.0.0: lcid "^2.0.0" mem "^4.0.0" -os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: +os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= @@ -8344,6 +8815,11 @@ p-locate@^3.0.0: dependencies: p-limit "^2.0.0" +p-map@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" + integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA== + p-reduce@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa" @@ -8554,12 +9030,17 @@ pbkdf2@^3.0.3: safe-buffer "^5.0.1" sha.js "^2.4.8" +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -pify@^2.0.0, pify@^2.3.0: +pify@^2.0.0, pify@^2.2.0, pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= @@ -9574,7 +10055,7 @@ q@^1.1.2: resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= -qs@6.5.2, qs@~6.5.2: +qs@6.5.2, qs@~6.5.1, qs@~6.5.2: version "6.5.2" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== @@ -9589,6 +10070,11 @@ querystring@0.2.0, querystring@^0.2.0: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= +ramda@0.24.1: + version "0.24.1" + resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.24.1.tgz#c3b7755197f35b8dc3502228262c4c91ddb6b857" + integrity sha1-w7d1UZfzW43DUCIoJixMkd22uFc= + randomatic@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed" @@ -9898,6 +10384,13 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" +request-progress@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-0.3.1.tgz#0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a" + integrity sha1-ByHBBdipasayzossia4tXs/Pazo= + dependencies: + throttleit "~0.0.2" + request-promise-core@1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346" @@ -9914,6 +10407,32 @@ request-promise-native@^1.0.5: stealthy-require "^1.1.1" tough-cookie "^2.3.3" +request@2.87.0: + version "2.87.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e" + integrity sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.6.0" + caseless "~0.12.0" + combined-stream "~1.0.5" + extend "~3.0.1" + forever-agent "~0.6.1" + form-data "~2.3.1" + har-validator "~5.0.3" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.17" + oauth-sign "~0.8.2" + performance-now "^2.1.0" + qs "~6.5.1" + safe-buffer "^5.1.1" + tough-cookie "~2.3.3" + tunnel-agent "^0.6.0" + uuid "^3.1.0" + request@^2.87.0, request@^2.88.0: version "2.88.0" resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" @@ -9994,6 +10513,14 @@ resolve@^1.1.4, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.2.0, resolve@^1.3.2, dependencies: path-parse "^1.0.6" +restore-cursor@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" + integrity sha1-NGYfRohjJ/7SmRR5FSJS35LapUE= + dependencies: + exit-hook "^1.0.0" + onetime "^1.0.0" + restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" @@ -10061,6 +10588,13 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" +rxjs@^5.0.0-beta.11: + version "5.5.12" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.12.tgz#6fa61b8a77c3d793dbaf270bee2f43f652d741cc" + integrity sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw== + dependencies: + symbol-observable "1.0.1" + rxjs@^6.4.0: version "6.4.0" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504" @@ -10348,6 +10882,11 @@ slash@^2.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== +slice-ansi@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35" + integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU= + slice-ansi@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" @@ -10644,6 +11183,11 @@ stream-splicer@^2.0.0: inherits "^2.0.1" readable-stream "^2.0.2" +stream-to-observable@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.1.0.tgz#45bf1d9f2d7dc09bed81f1c307c430e68b84cffe" + integrity sha1-Rb8dny19wJvtgfHDB8Qw5ouEz/4= + streamsearch@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" @@ -10809,6 +11353,13 @@ subscriptions-transport-ws@^0.9.11, subscriptions-transport-ws@^0.9.15: symbol-observable "^1.0.4" ws "^5.2.0" +supports-color@5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5" + integrity sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ== + dependencies: + has-flag "^2.0.0" + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -10862,6 +11413,11 @@ svgo@^1.0.0, svgo@^1.1.1: unquote "~1.1.1" util.promisify "~1.0.0" +symbol-observable@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" + integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ= + symbol-observable@^1.0.2, symbol-observable@^1.0.4: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" @@ -10999,6 +11555,11 @@ throttle-debounce@^2.0.0: resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.1.0.tgz#257e648f0a56bd9e54fe0f132c4ab8611df4e1d5" integrity sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg== +throttleit@~0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-0.0.2.tgz#cfedf88e60c00dd9697b61fdd2a8343a9b680eaf" + integrity sha1-z+34jmDADdlpe2H90qg0OptoDq8= + through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -11100,6 +11661,13 @@ title-case@^2.1.1: no-case "^2.2.0" upper-case "^1.0.3" +tmp@0.0.31: + version "0.0.31" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7" + integrity sha1-jzirlDjhcxXl29izZX6L+yd65Kc= + dependencies: + os-tmpdir "~1.0.1" + tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -11184,6 +11752,13 @@ tough-cookie@^2.3.3, tough-cookie@^2.3.4: psl "^1.1.28" punycode "^2.1.1" +tough-cookie@~2.3.3: + version "2.3.4" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" + integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA== + dependencies: + punycode "^1.4.1" + tough-cookie@~2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" @@ -11490,7 +12065,7 @@ url-parse-lax@^1.0.0: dependencies: prepend-http "^1.0.1" -url@^0.11.0, url@~0.11.0: +url@0.11.0, url@^0.11.0, url@~0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= @@ -12209,6 +12784,21 @@ yargs@~1.2.6: dependencies: minimist "^0.1.0" +yauzl@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005" + integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU= + dependencies: + fd-slicer "~1.0.1" + +yauzl@2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.8.0.tgz#79450aff22b2a9c5a41ef54e02db907ccfbf9ee2" + integrity sha1-eUUK/yKyqcWkHvVOAtuQfM+/nuI= + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.0.1" + yn@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a" From ba369d82fea17cfc91883b7947db30b10df84f5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 8 Mar 2019 01:26:57 +0100 Subject: [PATCH 2/7] Fix translations, lint and some tests --- components/ReportModal.vue | 7 ++++++- cypress/integration/common/report.js | 2 +- graphql/ModerationListQuery.js | 4 ++-- locales/de.json | 2 +- locales/en.json | 2 +- pages/moderation/index.vue | 30 ++++++++++++++-------------- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/components/ReportModal.vue b/components/ReportModal.vue index a195d1674..5e374e346 100644 --- a/components/ReportModal.vue +++ b/components/ReportModal.vue @@ -19,7 +19,7 @@ -

+

@@ -101,7 +101,7 @@ export default { return { type: ' ', name: ' ', - reporter: this.$t('moderation.reports.reporter') + submitter: this.$t('moderation.reports.submitter') // actions: ' ' } } From 47eaf7dea062e6f927d0ddef2e367a12154a8f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Mon, 4 Mar 2019 19:31:01 +0100 Subject: [PATCH 3/7] Fix cypress test with more specific matcher --- cypress/integration/03.TagsAndCategories.feature | 4 ++-- cypress/integration/common/steps.js | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cypress/integration/03.TagsAndCategories.feature b/cypress/integration/03.TagsAndCategories.feature index 8f27a36cf..f8bce831b 100644 --- a/cypress/integration/03.TagsAndCategories.feature +++ b/cypress/integration/03.TagsAndCategories.feature @@ -20,7 +20,7 @@ Feature: Tags and Categories Scenario: See an overview of categories When I navigate to the administration dashboard - And I click on "Categories" + And I click on the menu item "Categories" Then I can see a list of categories ordered by post count: | Icon | Name | Posts | | | Just For Fun | 2 | @@ -29,7 +29,7 @@ Feature: Tags and Categories Scenario: See an overview of tags When I navigate to the administration dashboard - And I click on "Tags" + And I click on the menu item "Tags" Then I can see a list of tags ordered by user count: | # | Name | Users | Posts | | 1 | Democracy | 2 | 3 | diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js index c17c2729b..72a7225ff 100644 --- a/cypress/integration/common/steps.js +++ b/cypress/integration/common/steps.js @@ -146,6 +146,10 @@ When(`I click on {string}`, linkOrButton => { cy.contains(linkOrButton).click() }) +When(`I click on the menu item {string}`, linkOrButton => { + cy.contains('.ds-menu-item', linkOrButton).click() +}) + When('I press {string}', label => { cy.contains(label).click() }) From a3e46333296676c80c7c7eba013408604b945034 Mon Sep 17 00:00:00 2001 From: Victor <48393202+victorrms2@users.noreply.github.com> Date: Sat, 9 Mar 2019 17:47:34 -0300 Subject: [PATCH 4/7] Small changes on translation mistakes - Portuguese The translation of "post" is "postagem", and not "pastagem". Pastagem means where the cow eats grass. The "admin" was as "Administrator", while the correct word is "Administrador". I'm not sure about what "Shouts" are, but I don't really know if the word "Gritos" is the properly for this thing. In portuguese, when you say "Grito", the literal translation of "Shouts" you think of a person screaming, and I don't think that's was the intention. If somebody could explain me what a "Shout" means in this code I could help in a more accurate translation. --- locales/pt.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/locales/pt.json b/locales/pt.json index ffdbd80b0..e98a0655a 100644 --- a/locales/pt.json +++ b/locales/pt.json @@ -40,11 +40,11 @@ } }, "admin": { - "name": "Administrator", + "name": "Administrador", "dashboard": { "name": "Painel de controle", "users": "Usuários", - "posts": "Pastagens", + "posts": "Postagens", "comments": "Comentários", "notifications": "Notificações", "organizations": "Organizações", @@ -68,12 +68,12 @@ "categories": { "name": "Categorias", "categoryName": "Nome", - "postCount": "Pastagens" + "postCount": "Postagens" }, "tags": { "name": "Etiquetas", "tagCountUnique": "Usuários", - "tagCount": "Pastagens" + "tagCount": "Postagens" }, "settings": { "name": "Configurações" @@ -106,9 +106,9 @@ "category": "Categoria ::: Categorias", "organization": "Organização ::: Organizações", "project": "Projeto ::: Projetos", - "tag": "Tag ::: Tags", + "tag": "Etiqueta ::: Etiquetas", "name": "Nome", - "loadMore": "carregar mais", - "loading": "carregando" + "loadMore": "Carregar mais", + "loading": "Carregando" } -} \ No newline at end of file +} From 6f558db8aabf8dab0ecafc252dd32516b7d0c6e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 9 Mar 2019 22:02:43 +0100 Subject: [PATCH 5/7] Upload/Download translations from lokalise.co @appinteractive @mattwr18 @Tirokk I did the following steps: 1. Upload current translations for `en` and `de` to lokalise.co * this did not update or create any keys, instead all keys were skipped (apparently already there) 2. Download the translations on lokalise with the following settings: * ICU message with numeric pluralization * Don't escape forward slashes * Indent with 2 spaces --- locales/de.json | 112 ++++++++++++++++++++++++------------------------ locales/en.json | 112 ++++++++++++++++++++++++------------------------ locales/es.json | 4 +- locales/fr.json | 59 ++++++++++++++++++++++++- locales/it.json | 37 ++++++++++------ locales/nl.json | 47 +++++++++++++++++++- locales/pl.json | 80 ++++++++++++++++++++++++++++++++-- locales/pt.json | 25 ++++++++++- 8 files changed, 344 insertions(+), 132 deletions(-) diff --git a/locales/de.json b/locales/de.json index 7a06b767e..c1a0e6b2c 100644 --- a/locales/de.json +++ b/locales/de.json @@ -1,13 +1,4 @@ { - "actions": { - "loading": "lade", - "loadMore": "mehr laden", - "create": "Erstellen", - "save": "Speichern", - "edit": "Bearbeiten", - "delete": "Löschen", - "cancel": "Abbrechen" - }, "login": { "copy": "Wenn Du bereits ein Konto bei Human Connection hast, melde Dich bitte hier an.", "login": "Einloggen", @@ -17,13 +8,6 @@ "moreInfo": "Was ist Human Connection?", "hello": "Hallo" }, - "followButton": { - "follow": "Folgen", - "following": "Folge Ich" - }, - "shoutButton": { - "shouted": "empfohlen" - }, "profile": { "name": "Mein Profil", "memberSince": "Mitglied seit", @@ -100,6 +84,48 @@ "name": "Einstellungen" } }, + "post": { + "name": "Beitrag", + "moreInfo": { + "name": "Mehr Info" + }, + "takeAction": { + "name": "Aktiv werden" + } + }, + "quotes": { + "african": { + "quote": "Viele kleine Leute an vielen kleinen Orten, die viele kleine Dinge tun, werden das Antlitz dieser Welt verändern.", + "author": "Afrikanisches Sprichwort" + } + }, + "common": { + "post": "Beitrag ::: Beiträge", + "comment": "Kommentar ::: Kommentare", + "letsTalk": "Miteinander reden", + "versus": "Versus", + "moreInfo": "Mehr Info", + "takeAction": "Aktiv werden", + "shout": "Empfehlung ::: Empfehlungen", + "user": "Benutzer ::: Benutzer", + "category": "Kategorie ::: Kategorien", + "organization": "Organisation ::: Organisationen", + "project": "Projekt ::: Projekte", + "tag": "Tag ::: Tags", + "name": "Name", + "loadMore": "mehr laden", + "loading": "wird geladen", + "reportContent": "Melden" + }, + "actions": { + "loading": "lade", + "loadMore": "mehr laden", + "create": "Erstellen", + "save": "Speichern", + "edit": "Bearbeiten", + "delete": "Löschen", + "cancel": "Abbrechen" + }, "moderation": { "name": "Moderation", "reports": { @@ -108,14 +134,6 @@ "reporter": "gemeldet von" } }, - "contribution": { - "edit": "Beitrag bearbeiten", - "delete": "Beitrag löschen" - }, - "comment": { - "edit": "Kommentar bearbeiten", - "delete": "Kommentar löschen" - }, "disable": { "user": { "title": "Nutzer sperren", @@ -133,15 +151,6 @@ "message": "Bist du sicher, dass du den Kommentar \"{name}\" deaktivieren möchtest?" } }, - "post": { - "name": "Beitrag", - "moreInfo": { - "name": "Mehr Info" - }, - "takeAction": { - "name": "Aktiv werden" - } - }, "report": { "submit": "Meldung senden", "cancel": "Abbrechen", @@ -161,28 +170,19 @@ "message": "Bist du sicher, dass du den Kommentar von \"{name}\" melden möchtest?" } }, - "quotes": { - "african": { - "quote": "Viele kleine Leute, an vielen kleinen Orten, die viele kleine Dinge tun, werden das Antlitz dieser Welt verändern.", - "author": "Afrikanisches Sprichwort" - } + "contribution": { + "edit": "Beitrag bearbeiten", + "delete": "Beitrag löschen" }, - "common": { - "reportContent": "Melden", - "post": "Beitrag ::: Beiträge", - "comment": "Kommentar ::: Kommentare", - "letsTalk": "Miteinander reden", - "versus": "Versus", - "moreInfo": "Mehr Info", - "takeAction": "Aktiv werden", - "shout": "Empfehlung ::: Empfehlungen", - "user": "Benutzer ::: Benutzer", - "category": "Kategorie ::: Kategorien", - "organization": "Organisation ::: Organisationen", - "project": "Projekt ::: Projekte", - "tag": "Tag ::: Tags", - "name": "Name", - "loadMore": "mehr laden", - "loading": "wird geladen" + "comment": { + "edit": "Kommentar bearbeiten", + "delete": "Kommentar löschen" + }, + "followButton": { + "follow": "Folgen", + "following": "Folge Ich" + }, + "shoutButton": { + "shouted": "empfohlen" } -} +} \ No newline at end of file diff --git a/locales/en.json b/locales/en.json index c49fd1318..c68d6e225 100644 --- a/locales/en.json +++ b/locales/en.json @@ -1,13 +1,4 @@ { - "actions": { - "loading": "loading", - "loadMore": "load more", - "create": "Create", - "save": "Save", - "edit": "Edit", - "delete": "Delete", - "cancel": "Cancel" - }, "login": { "copy": "If you already have a human-connection account, login here.", "login": "Login", @@ -17,13 +8,6 @@ "moreInfo": "What is Human Connection?", "hello": "Hello" }, - "followButton": { - "follow": "Follow", - "following": "Following" - }, - "shoutButton": { - "shouted": "shouted" - }, "profile": { "name": "My Profile", "memberSince": "Member since", @@ -100,6 +84,48 @@ "name": "Settings" } }, + "post": { + "name": "Post", + "moreInfo": { + "name": "More info" + }, + "takeAction": { + "name": "Take action" + } + }, + "quotes": { + "african": { + "quote": "Many small people in many small places do many small things, that can alter the face of the world.", + "author": "African proverb" + } + }, + "common": { + "post": "Post ::: Posts", + "comment": "Comment ::: Comments", + "letsTalk": "Let`s Talk", + "versus": "Versus", + "moreInfo": "More Info", + "takeAction": "Take Action", + "shout": "Shout ::: Shouts", + "user": "User ::: Users", + "category": "Category ::: Categories", + "organization": "Organization ::: Organizations", + "project": "Project ::: Projects", + "tag": "Tag ::: Tags", + "name": "Name", + "loadMore": "load more", + "loading": "loading", + "reportContent": "Report" + }, + "actions": { + "loading": "loading", + "loadMore": "load more", + "create": "Create", + "save": "Save", + "edit": "Edit", + "delete": "Delete", + "cancel": "Cancel" + }, "moderation": { "name": "Moderation", "reports": { @@ -108,14 +134,6 @@ "reporter": "reported by" } }, - "contribution": { - "edit": "Edit Contribution", - "delete": "Delete Contribution" - }, - "comment": { - "edit": "Edit Comment", - "delete": "Delete Comment" - }, "disable": { "user": { "title": "Disable User", @@ -133,15 +151,6 @@ "message": "Do you really want to disable the comment from \"{name}\"?" } }, - "post": { - "name": "Post", - "moreInfo": { - "name": "More info" - }, - "takeAction": { - "name": "Take action" - } - }, "report": { "submit": "Send Report", "cancel": "Cancel", @@ -161,28 +170,19 @@ "message": "Do you really want to report the comment from \"{name}\"?" } }, - "quotes": { - "african": { - "quote": "Many small people in many small places do many small things, that can alter the face of the world.", - "author": "African proverb" - } + "contribution": { + "edit": "Edit Contribution", + "delete": "Delete Contribution" }, - "common": { - "reportContent": "Report", - "post": "Post ::: Posts", - "comment": "Comment ::: Comments", - "letsTalk": "Let`s Talk", - "versus": "Versus", - "moreInfo": "More Info", - "takeAction": "Take Action", - "shout": "Shout ::: Shouts", - "user": "User ::: Users", - "category": "Category ::: Categories", - "organization": "Organization ::: Organizations", - "project": "Project ::: Projects", - "tag": "Tag ::: Tags", - "name": "Name", - "loadMore": "load more", - "loading": "loading" + "comment": { + "edit": "Edit Comment", + "delete": "Delete Comment" + }, + "followButton": { + "follow": "Follow", + "following": "Following" + }, + "shoutButton": { + "shouted": "shouted" } -} +} \ No newline at end of file diff --git a/locales/es.json b/locales/es.json index 0ea3e440e..ba46f9ec1 100644 --- a/locales/es.json +++ b/locales/es.json @@ -13,7 +13,9 @@ "memberSince": "Miembro desde", "follow": "Seguir", "followers": "Seguidores", - "following": "Siguiendo" + "following": "Siguiendo", + "shouted": "Gritar", + "commented": "Comentado" }, "settings": { "name": "Configuración", diff --git a/locales/fr.json b/locales/fr.json index 1b8ca42b1..01c2614ac 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -3,7 +3,7 @@ "copy": "Si vous avez déjà un compte human-connection, connectez-vous ici.", "login": "Connexion", "logout": "Déconnexion", - "email": "Votre Message électronique", + "email": "Votre courriel", "password": "Votre mot de passe", "moreInfo": "Qu'est-ce que Human Connection?", "hello": "Bonjour" @@ -109,6 +109,61 @@ "tag": "Tag ::: Tags", "name": "Nom", "loadMore": "charger plus", - "loading": "chargement" + "loading": "chargement", + "reportContent": "Signaler" + }, + "moderation": { + "reports": { + "empty": "Félicitations, rien à modérer.", + "name": "Signalisations", + "reporter": "signalé par" + } + }, + "disable": { + "user": { + "title": "Désactiver l'utilisateur", + "type": "Utilisateur", + "message": "Souhaitez-vous vraiment désactiver l'utilisateur \" {name} \"?" + }, + "contribution": { + "title": "Désactiver l'apport", + "type": "apport", + "message": "Souhaitez-vous vraiment signaler l'entrée\" {name} \"?" + }, + "comment": { + "title": "Désactiver le commentaire", + "type": "Commentaire", + "message": "Souhaitez-vous vraiment désactiver le commentaire de \"{nom}\" ?" + } + }, + "report": { + "submit": "Envoyer le rapport", + "cancel": "Annuler", + "user": { + "title": "Signaler l'utilisateur", + "type": "Utilisateur", + "message": "Souhaitez-vous vraiment signaler l'utilisateur \" {name} \"?" + }, + "contribution": { + "title": "Signaler l'entrée", + "type": "Apport", + "message": "Souhaitez-vous vraiment signaler l'entrée\" {name} \"?" + }, + "comment": { + "title": "Signaler un commentaire", + "type": "Commentaire", + "message": "Souhaitez-vous vraiment signaler l'utilisateur \" {name} \"?" + } + }, + "actions": { + "cancel": "Annuler" + }, + "contribution": { + "edit": "Rédiger l'apport", + "delete": "Supprimer l'entrée" + }, + "comment": { + "edit": "Rédiger un commentaire", + "delete": "Supprimer le commentaire" } } \ No newline at end of file diff --git a/locales/it.json b/locales/it.json index d8c4fe35f..0225babad 100644 --- a/locales/it.json +++ b/locales/it.json @@ -1,6 +1,6 @@ { "login": { - "copy": "Se hai già un account di Human Connection, accedi qui.", + "copy": "Se sei gia registrato su Human Connection, accedi qui.", "login": "Accesso", "logout": "Logout", "email": "La tua email", @@ -12,13 +12,18 @@ "name": "Il mio profilo", "memberSince": "Membro dal", "follow": "Seguire", - "followers": "Seguaci", - "following": "Seguendo" + "followers": "Seguenti", + "following": "Seguendo", + "shouted": "Gridato", + "commented": "Commentato" }, "settings": { "name": "Impostazioni", "data": { - "name": "I tuoi dati" + "name": "I tuoi dati", + "labelName": "Nome", + "labelCity": "La tua città o regione", + "labelBio": "Su di te" }, "security": { "name": "Sicurezza" @@ -27,7 +32,7 @@ "name": "Inviti" }, "download": { - "name": "Scaricare i dati" + "name": "Scaricamento dati" }, "delete": { "name": "Elimina Account" @@ -51,7 +56,7 @@ "projects": "Progetti", "invites": "Inviti", "follows": "Segue", - "shouts": "Grida" + "shouts": "Gridi" }, "organizations": { "name": "Organizzazioni" @@ -90,25 +95,33 @@ }, "quotes": { "african": { - "quote": "Molte piccole persone in molti piccoli luoghi fanno molte piccole cose, che possono alterare la faccia del mondo.", + "quote": "Molte piccole persone in molti piccoli luoghi fanno molte piccole cose, che possono cambiare la faccia del mondo.", "author": "Proverbio africano" } }, "common": { "post": "Messaggio ::: Messaggi", "comment": "Commento ::: Commenti", - "letsTalk": "Parliamo", - "versus": "Contro", + "letsTalk": "Discutiamo", + "versus": "Verso", "moreInfo": "Ulteriori informazioni", "takeAction": "Agire", - "shout": "Grida ::: Grida", + "shout": "Grido ::: Gridi", "user": "Utente ::: Utenti", "category": "Categoria ::: Categorie", "organization": "Organizzazione ::: Organizzazioni", "project": "Progetto ::: Progetti", "tag": "Tag ::: Tag", "name": "Nome", - "loadMore": "caricare di più", - "loading": "caricamento" + "loadMore": "Caricare di più", + "loading": "Caricamento in corso" + }, + "actions": { + "loading": "Caricamento in corso", + "loadMore": "Carica di più", + "create": "Crea", + "save": "Salva", + "edit": "Modifica", + "delete": "Cancella" } } \ No newline at end of file diff --git a/locales/nl.json b/locales/nl.json index 593c7a91b..6c52877a4 100644 --- a/locales/nl.json +++ b/locales/nl.json @@ -109,6 +109,51 @@ "tag": "Tag ::: Tags", "name": "Naam", "loadMore": "meer laden", - "loading": "inlading" + "loading": "inlading", + "reportContent": "Melden" + }, + "disable": { + "comment": { + "title": "Commentaar uitschakelen", + "type": "Melding", + "message": "Wilt u de reactie van \" {name} \" echt uitschakelen ?" + } + }, + "report": { + "submit": "Verzenden", + "cancel": "Annuleren", + "user": { + "title": "Gebruiker melden", + "type": "Gebruiker", + "message": "Wilt u echt het commentaar van \"{name}\" melden?" + }, + "contribution": { + "title": "Bijdrage melden", + "type": "Bijdrage", + "message": "Wilt u echt het commentaar van \"{name}\" melden?" + }, + "comment": { + "title": "Reactie melden", + "type": "Melding", + "message": "Wilt u echt het commentaar van \"{name}\" melden?" + } + }, + "actions": { + "cancel": "Annuleren" + }, + "contribution": { + "edit": "Bijdrage bewerken", + "delete": "Bijdrage verwijderen" + }, + "comment": { + "edit": "Commentaar bewerken", + "delete": "Commentaar verwijderen" + }, + "followButton": { + "follow": "Volgen", + "following": "Volgt" + }, + "shoutButton": { + "shouted": "uitgeroepen" } } \ No newline at end of file diff --git a/locales/pl.json b/locales/pl.json index f3f4b3c76..c80984eee 100644 --- a/locales/pl.json +++ b/locales/pl.json @@ -13,12 +13,17 @@ "memberSince": "Członek od", "follow": "Obserwuj", "followers": "Obserwujący", - "following": "Obserwowani" + "following": "Obserwowani", + "shouted": "Krzyknij", + "commented": "Skomentuj" }, "settings": { "name": "Ustawienia", "data": { - "name": "Twoje dane" + "name": "Twoje dane", + "labelName": "Twoje dane", + "labelCity": "Twoje miasto lub region", + "labelBio": "O Tobie" }, "security": { "name": "Bezpieczeństwo" @@ -109,6 +114,75 @@ "tag": "Tag ::: Tagi", "name": "imię", "loadMore": "załaduj więcej", - "loading": "ładowanie" + "loading": "ładowanie", + "reportContent": "Raport" + }, + "actions": { + "loading": "ładowanie", + "loadMore": "załaduj więcej", + "create": "Stwórz", + "save": "Zapisz", + "edit": "Edytuj", + "delete": "Usuń", + "cancel": "Anuluj" + }, + "moderation": { + "name": "Moderacja", + "reports": { + "empty": "Gratulacje, moderacja nie jest potrzebna", + "name": "Raporty", + "reporter": "zgłoszone przez" + } + }, + "disable": { + "user": { + "title": "Ukryj użytkownika", + "type": "Użytkownik", + "message": "Czy na pewno chcesz wyłączyć użytkownika \" {name} \"?" + }, + "contribution": { + "title": "Ukryj wpis", + "type": "Wpis / Post", + "message": "Czy na pewno chcesz ukryć wpis \" tytuł} \"?" + }, + "comment": { + "title": "Ukryj wpis", + "type": "Komentarz", + "message": "Czy na pewno chcesz ukryć komentarz użytkownika\"(Imie/Avatar\"?" + } + }, + "report": { + "submit": "Wyślij raport", + "cancel": "Anuluj", + "user": { + "title": "Zgłoś użytkownika", + "type": "Użytkownik", + "message": "Czy na pewno chcesz zgłosić użytkownika \" {Imie} \"?" + }, + "contribution": { + "title": "Zgłoś wpis", + "type": "Wpis / Post", + "message": "Czy na pewno chcesz zgłosić ten wpis użytkownika \" {Imie} \"?" + }, + "comment": { + "title": "Zgłoś komentarz", + "type": "Komentarz", + "message": "Czy na pewno chcesz zgłosić komentarz użytkownika\"(Imie/Avatar\"?" + } + }, + "contribution": { + "edit": "Edytuj wpis", + "delete": "Usuń wpis" + }, + "comment": { + "edit": "Edytuj komentarz", + "delete": "Usuń komentarz" + }, + "followButton": { + "follow": "Obserwuj ", + "following": "Obserwowani " + }, + "shoutButton": { + "shouted": "krzyczeć" } } \ No newline at end of file diff --git a/locales/pt.json b/locales/pt.json index ffdbd80b0..166dad338 100644 --- a/locales/pt.json +++ b/locales/pt.json @@ -109,6 +109,29 @@ "tag": "Tag ::: Tags", "name": "Nome", "loadMore": "carregar mais", - "loading": "carregando" + "loading": "carregando", + "reportContent": "Denunciar" + }, + "report": { + "contribution": { + "title": "Denunciar Contribuição", + "type": "Contribuição" + }, + "comment": { + "title": "Denunciar Comentário", + "type": "Comentário", + "message": "Realmente quer denunciar o comentário de \"{nome}\"?" + } + }, + "actions": { + "cancel": "Cancelar" + }, + "contribution": { + "edit": "Editar Contribuição", + "delete": "Apagar Contribuição" + }, + "comment": { + "edit": "Editar Comentário", + "delete": "Apagar Comentário" } } \ No newline at end of file From bcedf11c69990263f14994742f4b997c784f1301 Mon Sep 17 00:00:00 2001 From: lokalise-bot Date: Tue, 12 Mar 2019 10:43:00 +0100 Subject: [PATCH 6/7] Lokalise: update of locales/pl.json --- locales/pl.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/pl.json b/locales/pl.json index c80984eee..0f2147996 100644 --- a/locales/pl.json +++ b/locales/pl.json @@ -56,7 +56,7 @@ "projects": "Projekty", "invites": "Zaproszenia", "follows": "Obserwowań", - "shouts": " okrzyk" + "shouts": "Okrzyk" }, "organizations": { "name": "Organizacje" @@ -179,8 +179,8 @@ "delete": "Usuń komentarz" }, "followButton": { - "follow": "Obserwuj ", - "following": "Obserwowani " + "follow": "Obserwuj", + "following": "Obserwowani" }, "shoutButton": { "shouted": "krzyczeć" From d1be013c3cf0f9e2ee38e75f30a640bf1ff01ede Mon Sep 17 00:00:00 2001 From: lokalise-bot Date: Tue, 12 Mar 2019 10:43:01 +0100 Subject: [PATCH 7/7] Lokalise: update of locales/pt.json --- locales/pt.json | 91 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 71 insertions(+), 20 deletions(-) diff --git a/locales/pt.json b/locales/pt.json index 3cba4201a..4151f49c7 100644 --- a/locales/pt.json +++ b/locales/pt.json @@ -1,7 +1,7 @@ { "login": { - "copy": "Se você já tem uma conta no Human Connection, faça o login aqui.", - "login": "Login", + "copy": "Se você já tem uma conta no Human Connection, entre aqui.", + "login": "Entrar", "logout": "Sair", "email": "Seu email", "password": "Sua senha", @@ -13,12 +13,17 @@ "memberSince": "Membro desde", "follow": "Seguir", "followers": "Seguidores", - "following": "Seguindo" + "following": "Seguindo", + "shouted": "Aclamou", + "commented": "Comentou" }, "settings": { "name": "Configurações", "data": { - "name": "Seus Dados" + "name": "Seus dados", + "labelName": "Seu nome", + "labelCity": "Sua cidade ou estado", + "labelBio": "Sobre você" }, "security": { "name": "Segurança" @@ -30,7 +35,7 @@ "name": "Baixar dados" }, "delete": { - "name": "Deletar conta" + "name": "Apagar conta" }, "organizations": { "name": "Minhas Organizações" @@ -40,7 +45,7 @@ } }, "admin": { - "name": "Administrador", + "name": "Administração", "dashboard": { "name": "Painel de controle", "users": "Usuários", @@ -50,8 +55,8 @@ "organizations": "Organizações", "projects": "Projetos", "invites": "Convites", - "follows": "Seguidores", - "shouts": "Gritos" + "follows": "Segue", + "shouts": "Aclamações" }, "organizations": { "name": "Organizações" @@ -90,18 +95,18 @@ }, "quotes": { "african": { - "quote": "Pequenos grupos de pessoas, em pequenos locais podem fazer várias coisas pequenas, mas que podem alterar o mundo ao nosso redor.", - "author": "Provérbio Africano" + "quote": "Muitas pessoas pequenas, em muitos lugares pequenos, fazem muitas coisas pequenas, que podem mudar a face do mundo.", + "author": "Provérbio africano" } }, "common": { - "post": "Post ::: Postagens", + "post": "Postagem ::: Postagens", "comment": "Comentário ::: Comentários", - "letsTalk": "Vamos falar", - "versus": "Versus", + "letsTalk": "Vamos Conversar", + "versus": "Contra", "moreInfo": "Mais informações", "takeAction": "Tomar uma ação", - "shout": "Grito ::: Gritos", + "shout": "Aclamação ::: Aclamações", "user": "Usuário ::: Usuários", "category": "Categoria ::: Categorias", "organization": "Organização ::: Organizações", @@ -112,20 +117,59 @@ "loading": "Carregando", "reportContent": "Denunciar" }, + "actions": { + "loading": "Carregando", + "loadMore": "Carregar mais", + "create": "Criar", + "save": "Salvar", + "edit": "Editar", + "delete": "Apagar", + "cancel": "Cancelar" + }, + "moderation": { + "name": "Moderação", + "reports": { + "empty": "Parabéns, nada a moderar.", + "name": "Denúncias", + "reporter": "Denunciado por" + } + }, + "disable": { + "user": { + "title": "Desativar usuário", + "type": "Usuário", + "message": "Você realmente deseja desativar o usuário \" {name} \"?" + }, + "contribution": { + "title": "Desativar Contribuição", + "type": "Contribuição", + "message": "Você realmente deseja desativar a contribuição \" {name} \"?" + }, + "comment": { + "title": "Desativar comentário", + "type": "Comentário", + "message": "Você realmente deseja desativar o comentário de \" {name} \"?" + } + }, "report": { + "submit": "Enviar denúncia", + "cancel": "Cancelar", + "user": { + "title": "Denunciar usuário", + "type": "Usuário", + "message": "Você realmente deseja denunciar o usuário \" {name} \"?" + }, "contribution": { "title": "Denunciar Contribuição", - "type": "Contribuição" + "type": "Contribuição", + "message": "Você realmente deseja denunciar a contribuição \" {name} \"?" }, "comment": { "title": "Denunciar Comentário", "type": "Comentário", - "message": "Realmente quer denunciar o comentário de \"{nome}\"?" + "message": "Você realmente deseja denunciar o comentário de \"{name}\"?" } }, - "actions": { - "cancel": "Cancelar" - }, "contribution": { "edit": "Editar Contribuição", "delete": "Apagar Contribuição" @@ -133,5 +177,12 @@ "comment": { "edit": "Editar Comentário", "delete": "Apagar Comentário" + }, + "followButton": { + "follow": "Seguir", + "following": "Seguindo" + }, + "shoutButton": { + "shouted": "Aclamou" } -} +} \ No newline at end of file