From 084bdbb3f4ea53a740d328f1f98e1ad1f4820c23 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Wed, 5 Jun 2019 04:58:05 +0000 Subject: [PATCH 1/9] Bump graphql-shield from 5.3.5 to 5.3.6 in /backend Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.5 to 5.3.6. - [Release notes](https://github.com/maticzav/graphql-shield/releases) - [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.5...v5.3.6) --- backend/package.json | 2 +- backend/yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/package.json b/backend/package.json index edbeabd48..9ffcd649d 100644 --- a/backend/package.json +++ b/backend/package.json @@ -61,7 +61,7 @@ "graphql-custom-directives": "~0.2.14", "graphql-iso-date": "~3.6.1", "graphql-middleware": "~3.0.2", - "graphql-shield": "~5.3.5", + "graphql-shield": "~5.3.6", "graphql-tag": "~2.10.1", "graphql-yoga": "~1.17.4", "helmet": "~3.18.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index d56871d83..1d17b8b93 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1119,10 +1119,10 @@ resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.9.tgz#693e76a52f61a2f1e7fb48c0eef167b95ea4ffd0" integrity sha512-sCZy4SxP9rN2w30Hlmg5dtdRwgYQfYRiLo9usw8X9cxlf+H4FqM1xX7+sNH7NNKVdbXMJWqva7iyy+fxh/V7fA== -"@types/yup@0.26.13": - version "0.26.13" - resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.13.tgz#0aeeba85231a34ddc68c74b3a2c64eeb2ccf68bf" - integrity sha512-sMMtb+c2xxf/FcK0kW36+0uuSWpNwvCBZYI7vpnD9J9Z6OYk09P4TmDkMWV+NWdi9Nzt2tUJjtpnPpkiUklBaw== +"@types/yup@0.26.14": + version "0.26.14" + resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.14.tgz#d31f3b9a04039cca70ebb4db4d6c7fc3f694e80b" + integrity sha512-OcBtVLHvYULVSltpuBdhFiVOKoSsOS58D872HydO93oBf3OdGq5zb+LnqGo18TNNSV2aW8hjIdS6H+wp68zFtQ== "@types/zen-observable@^0.5.3": version "0.5.4" @@ -3789,12 +3789,12 @@ graphql-request@~1.8.2: dependencies: cross-fetch "2.2.2" -graphql-shield@~5.3.5: - version "5.3.5" - resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-5.3.5.tgz#cba409f4c1714e107212cff0a1cb2d934273392b" - integrity sha512-3kmL9x+b85NK2ipH3VGudUgUo1vXy0Z44WXhnGi3b0T0peg53DOSlXBbZOO4PNh1AcULnUjYf+DpDrP8Uc97Gw== +graphql-shield@~5.3.6: + version "5.3.6" + resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-5.3.6.tgz#20061b02f77056c0870a623c530ef28a1bf4fff4" + integrity sha512-ihw/i4X+d1kpj1SVA6iBkVl2DZhPsI+xV08geR2TX3FWhpU7zakk/16yBzDRJTTCUgKsWfgyebrgIBsuhTwMnA== dependencies: - "@types/yup" "0.26.13" + "@types/yup" "0.26.14" lightercollective "^0.3.0" object-hash "^1.3.1" yup "^0.27.0" From af8a54895898e18308b83ff708c80fbacd984aa1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Wed, 5 Jun 2019 04:58:14 +0000 Subject: [PATCH 2/9] Bump apollo-client from 2.6.0 to 2.6.1 in /webapp Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.0 to 2.6.1. - [Release notes](https://github.com/apollographql/apollo-client/releases) - [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md) - [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.0...apollo-client@2.6.1) --- webapp/package.json | 2 +- webapp/yarn.lock | 36 +++++++++++++++++++++--------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 880db60d1..cbe56c92a 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -56,7 +56,7 @@ "@nuxtjs/style-resources": "~0.1.2", "accounting": "~0.4.1", "apollo-cache-inmemory": "~1.5.1", - "apollo-client": "~2.6.0", + "apollo-client": "~2.6.1", "cookie-universal-nuxt": "~2.0.14", "cross-env": "~5.2.0", "date-fns": "2.0.0-alpha.27", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 609e92c73..06d016045 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1878,23 +1878,23 @@ apollo-cache-inmemory@^1.5.1, apollo-cache-inmemory@~1.5.1: ts-invariant "^0.2.1" tslib "^1.9.3" -apollo-cache@1.3.0, apollo-cache@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.0.tgz#de5c907cbd329440c9b0aafcbe8436391b9e6142" - integrity sha512-voPlvSIDA2pY3+7QwtXPs7o5uSNAVjUKwimyHWoiW0MIZtPxawtOV/Y+BL85R227JqcjPic1El+QToVR8l4ytQ== +apollo-cache@1.3.1, apollo-cache@^1.2.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.1.tgz#c015f93a9a7f32b3eeea0c471addd6e854da754c" + integrity sha512-BJ/Mehr3u6XCaHYSmgZ6DM71Fh30OkW6aEr828WjHvs+7i0RUuP51/PM7K6T0jPXtuw7UbArFFPZZsNgXnyyJA== dependencies: - apollo-utilities "^1.3.0" + apollo-utilities "^1.3.1" tslib "^1.9.3" -apollo-client@^2.5.1, apollo-client@~2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.0.tgz#9b66c04cd96d622cd72f92e584e7403c17532831" - integrity sha512-Z6oSD45vyw6maktMABXTaJliWdFJy4ihZGxbRh7rY65RWNz0HSm3IX66shLavdNqd4lpOcVuAufJl+w8u6RhLQ== +apollo-client@^2.5.1, apollo-client@~2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.1.tgz#fcf328618d6ad82b750a988bec113fe6edc8ba94" + integrity sha512-Tb6ZthPZUHlGqeoH1WC8Qg/tLnkk9H5+xj4e5nzOAC6dCOW3pVU9tYXscrWdmZ65UDUg1khvTNjrQgPhdf4aTQ== dependencies: "@types/zen-observable" "^0.8.0" - apollo-cache "1.3.0" + apollo-cache "1.3.1" apollo-link "^1.0.0" - apollo-utilities "1.3.0" + apollo-utilities "1.3.1" symbol-observable "^1.0.2" ts-invariant "^0.4.0" tslib "^1.9.3" @@ -2081,12 +2081,13 @@ apollo-upload-client@^10.0.0: apollo-link-http-common "^0.2.13" extract-files "^5.0.1" -apollo-utilities@1.3.0, apollo-utilities@^1.0.1, apollo-utilities@^1.0.8, apollo-utilities@^1.2.1, apollo-utilities@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.0.tgz#9803724c07ac94ca11dc26397edb58735d2b0211" - integrity sha512-wQjV+FdWcTWmWUFlChG5rS0vHKy5OsXC6XlV9STRstQq6VbXANwHy6DHnTEQAfLXWAbNcPgBu+nBUpR3dFhwrA== +apollo-utilities@1.3.1, apollo-utilities@^1.0.1, apollo-utilities@^1.0.8, apollo-utilities@^1.2.1, apollo-utilities@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.1.tgz#4c45f9b52783c324e2beef822700bdea374f82d1" + integrity sha512-P5cJ75rvhm9hcx9V/xCW0vlHhRd0S2icEcYPoRYNTc5djbynpuO+mQuJ4zMHgjNDpvvDxDfZxXTJ6ZUuJZodiQ== dependencies: fast-json-stable-stringify "^2.0.0" + lodash.isequal "^4.5.0" ts-invariant "^0.4.0" tslib "^1.9.3" @@ -6850,6 +6851,11 @@ lodash.isboolean@^3.0.3: resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= +lodash.isequal@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= + lodash.isinteger@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" From aafcd40fb0976ccb0b768e28c7f42eb35fb127d3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Wed, 5 Jun 2019 04:58:31 +0000 Subject: [PATCH 3/9] Bump apollo-client from 2.5.1 to 2.6.1 in /backend Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.5.1 to 2.6.1. - [Release notes](https://github.com/apollographql/apollo-client/releases) - [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md) - [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.5.1...apollo-client@2.6.1) --- backend/package.json | 2 +- backend/yarn.lock | 72 ++++++++++++++------------------------------ 2 files changed, 24 insertions(+), 50 deletions(-) diff --git a/backend/package.json b/backend/package.json index edbeabd48..d74d51bf2 100644 --- a/backend/package.json +++ b/backend/package.json @@ -44,7 +44,7 @@ "dependencies": { "activitystrea.ms": "~2.1.3", "apollo-cache-inmemory": "~1.6.0", - "apollo-client": "~2.5.1", + "apollo-client": "~2.6.1", "apollo-link-context": "~1.0.14", "apollo-link-http": "~1.5.14", "apollo-server": "~2.6.1", diff --git a/backend/yarn.lock b/backend/yarn.lock index d56871d83..d91348586 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1307,34 +1307,25 @@ apollo-cache-inmemory@~1.6.0: ts-invariant "^0.4.0" tslib "^1.9.3" -apollo-cache@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.2.1.tgz#aae71eb4a11f1f7322adc343f84b1a39b0693644" - integrity sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ== +apollo-cache@1.3.1, apollo-cache@^1.3.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.1.tgz#c015f93a9a7f32b3eeea0c471addd6e854da754c" + integrity sha512-BJ/Mehr3u6XCaHYSmgZ6DM71Fh30OkW6aEr828WjHvs+7i0RUuP51/PM7K6T0jPXtuw7UbArFFPZZsNgXnyyJA== dependencies: - apollo-utilities "^1.2.1" + apollo-utilities "^1.3.1" tslib "^1.9.3" -apollo-cache@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.0.tgz#de5c907cbd329440c9b0aafcbe8436391b9e6142" - integrity sha512-voPlvSIDA2pY3+7QwtXPs7o5uSNAVjUKwimyHWoiW0MIZtPxawtOV/Y+BL85R227JqcjPic1El+QToVR8l4ytQ== - dependencies: - apollo-utilities "^1.3.0" - tslib "^1.9.3" - -apollo-client@~2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.5.1.tgz#36126ed1d32edd79c3713c6684546a3bea80e6d1" - integrity sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA== +apollo-client@~2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.1.tgz#fcf328618d6ad82b750a988bec113fe6edc8ba94" + integrity sha512-Tb6ZthPZUHlGqeoH1WC8Qg/tLnkk9H5+xj4e5nzOAC6dCOW3pVU9tYXscrWdmZ65UDUg1khvTNjrQgPhdf4aTQ== dependencies: "@types/zen-observable" "^0.8.0" - apollo-cache "1.2.1" + apollo-cache "1.3.1" apollo-link "^1.0.0" - apollo-link-dedup "^1.0.0" - apollo-utilities "1.2.1" + apollo-utilities "1.3.1" symbol-observable "^1.0.2" - ts-invariant "^0.2.1" + ts-invariant "^0.4.0" tslib "^1.9.3" zen-observable "^0.8.0" @@ -1398,13 +1389,6 @@ apollo-link-context@~1.0.14: apollo-link "^1.2.11" tslib "^1.9.3" -apollo-link-dedup@^1.0.0: - version "1.0.11" - resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.11.tgz#6f34ea748d2834850329ad03111ef18445232b05" - integrity sha512-RcvkXR0CNbQcsw6LdrPksGa+9YjZ1ghk0k2PKal6rSBCyyqzokcBawXOtoMN8q+0FLR1dGs5GnAQVeucQuY28g== - dependencies: - apollo-link "^1.2.4" - apollo-link-http-common@^0.2.13: version "0.2.13" resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.13.tgz#c688f6baaffdc7b269b2db7ae89dae7c58b5b350" @@ -1423,7 +1407,7 @@ apollo-link-http@~1.5.14: apollo-link-http-common "^0.2.13" tslib "^1.9.3" -apollo-link@^1.0.0, apollo-link@^1.2.11, apollo-link@^1.2.3, apollo-link@^1.2.4: +apollo-link@^1.0.0, apollo-link@^1.2.11, apollo-link@^1.2.3: version "1.2.11" resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz#493293b747ad3237114ccd22e9f559e5e24a194d" integrity sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA== @@ -1575,21 +1559,13 @@ apollo-upload-server@^7.0.0: http-errors "^1.7.0" object-path "^0.11.4" -apollo-utilities@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz#1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c" - integrity sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg== - dependencies: - fast-json-stable-stringify "^2.0.0" - ts-invariant "^0.2.1" - tslib "^1.9.3" - -apollo-utilities@^1.0.1, apollo-utilities@^1.2.1, apollo-utilities@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.0.tgz#9803724c07ac94ca11dc26397edb58735d2b0211" - integrity sha512-wQjV+FdWcTWmWUFlChG5rS0vHKy5OsXC6XlV9STRstQq6VbXANwHy6DHnTEQAfLXWAbNcPgBu+nBUpR3dFhwrA== +apollo-utilities@1.3.1, apollo-utilities@^1.0.1, apollo-utilities@^1.2.1, apollo-utilities@^1.3.0, apollo-utilities@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.1.tgz#4c45f9b52783c324e2beef822700bdea374f82d1" + integrity sha512-P5cJ75rvhm9hcx9V/xCW0vlHhRd0S2icEcYPoRYNTc5djbynpuO+mQuJ4zMHgjNDpvvDxDfZxXTJ6ZUuJZodiQ== dependencies: fast-json-stable-stringify "^2.0.0" + lodash.isequal "^4.5.0" ts-invariant "^0.4.0" tslib "^1.9.3" @@ -5254,6 +5230,11 @@ lodash.isboolean@^3.0.3: resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= +lodash.isequal@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= + lodash.isinteger@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" @@ -7560,13 +7541,6 @@ trunc-text@1.0.1: resolved "https://registry.yarnpkg.com/trunc-text/-/trunc-text-1.0.1.tgz#58f876d8ac59b224b79834bb478b8656e69622b5" integrity sha1-WPh22KxZsiS3mDS7R4uGVuaWIrU= -ts-invariant@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.2.1.tgz#3d587f9d6e3bded97bf9ec17951dd9814d5a9d3f" - integrity sha512-Z/JSxzVmhTo50I+LKagEISFJW3pvPCqsMWLamCTX8Kr3N5aMrnGOqcflbe5hLUzwjvgPfnLzQtHZv0yWQ+FIHg== - dependencies: - tslib "^1.9.3" - ts-invariant@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.2.tgz#89a2ffeb70879b777258df1df1c59383c35209b0" From 5caa6007c129ce39f572c0d84cd2ddb0b279d723 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Wed, 5 Jun 2019 05:00:18 +0000 Subject: [PATCH 4/9] Bump nuxt from 2.8.0 to 2.8.1 in /webapp Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.8.0 to 2.8.1. - [Release notes](https://github.com/nuxt/nuxt.js/releases) - [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md) - [Commits](https://github.com/nuxt/nuxt.js/compare/v2.8.0...v2.8.1) --- webapp/package.json | 2 +- webapp/yarn.lock | 176 ++++++++++++++++++++++---------------------- 2 files changed, 89 insertions(+), 89 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 880db60d1..77d86e077 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -64,7 +64,7 @@ "graphql": "~14.3.1", "jsonwebtoken": "~8.5.1", "linkify-it": "~2.1.0", - "nuxt": "~2.8.0", + "nuxt": "~2.8.1", "nuxt-dropzone": "^1.0.2", "nuxt-env": "~0.1.0", "stack-utils": "^1.0.2", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 609e92c73..276d86e7e 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -889,10 +889,10 @@ "@types/istanbul-reports" "^1.1.1" "@types/yargs" "^12.0.9" -"@nuxt/babel-preset-app@2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.8.0.tgz#ceee59de38868f899a38ad5f754ff41496a6987d" - integrity sha512-bTInLw8ex+DeKU2XO91hHZBGH9cyjE2wr11oD327ZJ4Un5VCUYN9nkDw7l77I/l3FYxY/DveOyQCmUV2UJ1NZA== +"@nuxt/babel-preset-app@2.8.1": + version "2.8.1" + resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.8.1.tgz#4b6b9ec293d66426034b30409ebda8b17e625014" + integrity sha512-5dmzk8nYzRdUG1cx7Y0L0ekYNiJlLkl0uomo4s7PPZUvWq0GhyMGYcxiEelLzaFMUu9XSPeu7oX1LWCj9aS8lw== dependencies: "@babel/core" "^7.4.5" "@babel/plugin-proposal-class-properties" "^7.4.4" @@ -904,15 +904,15 @@ "@vue/babel-preset-jsx" "^1.0.0" core-js "^2.6.5" -"@nuxt/builder@2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@nuxt/builder/-/builder-2.8.0.tgz#f78f702d9f713dacb0e5d3b798e210b4e579398b" - integrity sha512-1iNF4jcjdjkibyOWvFh08VnZjSWvMopjfyUBzcn+i4vJ+R3jX2i4ZAmAnp1TLNAbuMIS50o3+I4bXQGCPZCm4g== +"@nuxt/builder@2.8.1": + version "2.8.1" + resolved "https://registry.yarnpkg.com/@nuxt/builder/-/builder-2.8.1.tgz#56bf2147fb8523e13f9a6036b5acd12560d8cfa5" + integrity sha512-sPzP0uTZvRQ0+vizythI6zYv8qFoQDQKZB7uh4+g9AcM2yLxwco2R0hf4axzyBajyGVrlhZ23nONuSzZ6zdB0w== dependencies: "@nuxt/devalue" "^1.2.3" - "@nuxt/utils" "2.8.0" - "@nuxt/vue-app" "2.8.0" - chokidar "^3.0.0" + "@nuxt/utils" "2.8.1" + "@nuxt/vue-app" "2.8.1" + chokidar "^3.0.1" consola "^2.7.1" fs-extra "^8.0.1" glob "^7.1.4" @@ -924,13 +924,13 @@ serialize-javascript "^1.7.0" upath "^1.1.2" -"@nuxt/cli@2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@nuxt/cli/-/cli-2.8.0.tgz#6664917fb76237ca4741c22d6c3eb64e1f16b7cb" - integrity sha512-FtsTLRzP4IW32CVMGZM3v0qDn9e9PnQjYRol2XdGrrHIOeTl4L4yacKpWtsdyLr9M6P68j9CcrA/4TiezwQavw== +"@nuxt/cli@2.8.1": + version "2.8.1" + resolved "https://registry.yarnpkg.com/@nuxt/cli/-/cli-2.8.1.tgz#398a3d843462aa6da89fa3c324c9cd4d43453493" + integrity sha512-gYySEW2fRHPodB5dh+NyTulltdezWk8csNVvnqskEOdXGj9+0lQ7zCjZk4nXMQAxWkRGG+r5RM2KgfTUzF3f+g== dependencies: - "@nuxt/config" "2.8.0" - "@nuxt/utils" "2.8.0" + "@nuxt/config" "2.8.1" + "@nuxt/utils" "2.8.1" boxen "^4.0.0" chalk "^2.4.2" consola "^2.7.1" @@ -944,25 +944,25 @@ std-env "^2.2.1" wrap-ansi "^5.1.0" -"@nuxt/config@2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@nuxt/config/-/config-2.8.0.tgz#56bdb23d4df6c08e9d103b6f50832b1fef6a99ee" - integrity sha512-38uFD/nGRl7y8I3IJthp7b+EmAyieqDpKFNLSk6DVUjGPy+y2m55n8Eu3vCshU3O/yLmI9sxKzz6J73t9vxaEA== +"@nuxt/config@2.8.1": + version "2.8.1" + resolved "https://registry.yarnpkg.com/@nuxt/config/-/config-2.8.1.tgz#cb4c5b2e0d6f85501b45eb4a46489f0661e8deb2" + integrity sha512-kzVYTC4VJP+noVOPb9d0cFBWbyOjLZyDpD8oJL6fUV4FLdEyOAD9Z14mypGOloeCAsc90brNXtqV9gnZiePXvQ== dependencies: - "@nuxt/utils" "2.8.0" + "@nuxt/utils" "2.8.1" consola "^2.7.1" std-env "^2.2.1" -"@nuxt/core@2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@nuxt/core/-/core-2.8.0.tgz#e2efb7eda04a2414829bb8ef7ffa89f416474330" - integrity sha512-cNpGB+aLNmlGMIBJpOcCquTs8TQhB3xtTxjFjf40bi4ILH1EU5/oMFU3EokyXARQOYdSbzbKcVRcF/9yaKN1HA== +"@nuxt/core@2.8.1": + version "2.8.1" + resolved "https://registry.yarnpkg.com/@nuxt/core/-/core-2.8.1.tgz#83c872dcef227be8fcd9c8193ad40c35c17d7c53" + integrity sha512-r702kRRX9P7CvU2m5d2AG5+GG5KC0HNYOy+P+1fjxjQhSD8TkHsP28TzgLx1vEgamJsqvdhAiOew60o54lWzaw== dependencies: - "@nuxt/config" "2.8.0" + "@nuxt/config" "2.8.1" "@nuxt/devalue" "^1.2.3" - "@nuxt/server" "2.8.0" - "@nuxt/utils" "2.8.0" - "@nuxt/vue-renderer" "2.8.0" + "@nuxt/server" "2.8.1" + "@nuxt/utils" "2.8.1" + "@nuxt/vue-renderer" "2.8.1" consola "^2.7.1" debug "^4.1.1" esm "^3.2.25" @@ -987,12 +987,12 @@ error-stack-parser "^2.0.0" string-width "^2.0.0" -"@nuxt/generator@2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@nuxt/generator/-/generator-2.8.0.tgz#15aaef4add635f009f24c019d5c6fd168b2df297" - integrity sha512-dmgd01tbcqSIBn2HCXW9RxCI43IYtWwB5+F/fX2wZK1ZPRWoiYRpvOM6vxw/4U0vdD2bl+0Hv2e0a/KY+c/C0A== +"@nuxt/generator@2.8.1": + version "2.8.1" + resolved "https://registry.yarnpkg.com/@nuxt/generator/-/generator-2.8.1.tgz#4a94842b6c9ebec455279518a23dfdce99fca2b1" + integrity sha512-K866F2en/0BLnouUbR9bFgJPIiKIfZK9+E/ORSYqPcwPNMHWMFS6Lf1orwPct11nxcv8mzqBUodXEZLcW01feA== dependencies: - "@nuxt/utils" "2.8.0" + "@nuxt/utils" "2.8.1" chalk "^2.4.2" consola "^2.7.1" fs-extra "^8.0.1" @@ -1017,13 +1017,13 @@ consola "^2.3.0" node-fetch "^2.3.0" -"@nuxt/server@2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@nuxt/server/-/server-2.8.0.tgz#ed27748c455541ef3d4cb607afa726fca56d88ed" - integrity sha512-2lrvBxmrFkY0Tf34xJkwiCZGfCtcZ3xJvaRJPrGkdao0AgWzYnYvgecyfKxyV+DdIz6lDFqVygFvuJPjzATWkA== +"@nuxt/server@2.8.1": + version "2.8.1" + resolved "https://registry.yarnpkg.com/@nuxt/server/-/server-2.8.1.tgz#f907e83446e2cd65203390197cf0d9b11536d20a" + integrity sha512-B7/AnrhTxARN0EDHrQzgoDEG1UBUqhJ0PZcvajeUX8RIgQuW+wF16hqUwsNEhtMtIHpYq6TqH58lCt/ylsiw4Q== dependencies: - "@nuxt/config" "2.8.0" - "@nuxt/utils" "2.8.0" + "@nuxt/config" "2.8.1" + "@nuxt/utils" "2.8.1" "@nuxtjs/youch" "^4.2.3" chalk "^2.4.2" compression "^1.7.4" @@ -1040,10 +1040,10 @@ serve-static "^1.14.1" server-destroy "^1.0.1" -"@nuxt/utils@2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.8.0.tgz#974d9539532007b328c2cb5b16d1c3605b0d232f" - integrity sha512-Nl/hes3JcHE/IwnDWPIXgtyTS6FLHD0x7qrqqJFwQgiixGDq6S3H5NHm1GeiaFq5HTaaNWeW/4WHjfnXGkytIQ== +"@nuxt/utils@2.8.1": + version "2.8.1" + resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.8.1.tgz#0310e2db8e5591e7f164da3931624133847c0e0c" + integrity sha512-yw2vJLSwj37BTCwfJv1GkiTdDqDWLvC/QpUnL/tDq362iy7DjPl0v3c4qG5YNEQ7GxiIiWAj4ZzCFuwxa/ToDw== dependencies: consola "^2.7.1" fs-extra "^8.0.1" @@ -1054,10 +1054,10 @@ signal-exit "^3.0.2" ua-parser-js "^0.7.19" -"@nuxt/vue-app@2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@nuxt/vue-app/-/vue-app-2.8.0.tgz#c2e1d960b6bc68257e7fd45f9a9c4650571bf982" - integrity sha512-LrdfeP4Qdh4LKAG0SbVlgxqwqURlhSQIWDrduu29qzZgWp0xeyoSsFWBPjFx8h95/gFzY2isF8hkyPrUM7UPIg== +"@nuxt/vue-app@2.8.1": + version "2.8.1" + resolved "https://registry.yarnpkg.com/@nuxt/vue-app/-/vue-app-2.8.1.tgz#1ecfc566cb9ab4679f4521cd409f4c4b78c5f79b" + integrity sha512-LNIrgWmXxyDf3o8fAF9rWJgmzAGbmsPaBWWPw7iUUADVPAeQP0CI+NDoxbIwcIOpo4nP3oqrtUfdj/xNd89CNw== dependencies: node-fetch "^2.6.0" unfetch "^4.1.0" @@ -1068,13 +1068,13 @@ vue-template-compiler "^2.6.10" vuex "^3.1.1" -"@nuxt/vue-renderer@2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer/-/vue-renderer-2.8.0.tgz#383d03c0705f15669fc67d2d167ac49efc4a6e31" - integrity sha512-J4JJ6SIvEuZegQs3bR2HB3cmG+jADd2FvasFCISPUnHeJrka3iRvatpgS1m9a6mHqoHQrUlevQFjMZbKqMUBlg== +"@nuxt/vue-renderer@2.8.1": + version "2.8.1" + resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer/-/vue-renderer-2.8.1.tgz#7e9dac6cafef15f4aa7b6d4efda15d4202b6fff0" + integrity sha512-Ew4vPZ76iGgoVsWBr87ncD53y8B6tXqSW43u8i6+Ii3XY1q1zElQFk9pU882k+mSm4FEojJ1OgY8Gp3IKP8S9g== dependencies: "@nuxt/devalue" "^1.2.3" - "@nuxt/utils" "2.8.0" + "@nuxt/utils" "2.8.1" consola "^2.7.1" fs-extra "^8.0.1" lru-cache "^5.1.1" @@ -1082,18 +1082,18 @@ vue-meta "^1.6.0" vue-server-renderer "^2.6.10" -"@nuxt/webpack@2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@nuxt/webpack/-/webpack-2.8.0.tgz#1e09ffa3c694703c376d393a52563786ea88fa2d" - integrity sha512-ONBxjADOhaiM7ojNiYdtrxogGwUukdMRCdRp/0krrKvP1tBIRo9nr2kb4hYk4cRGcSmhYL/DrqcEVMYcoyMprA== +"@nuxt/webpack@2.8.1": + version "2.8.1" + resolved "https://registry.yarnpkg.com/@nuxt/webpack/-/webpack-2.8.1.tgz#7ec040fa9f0b262ec5528b016fb3814892bf7e4b" + integrity sha512-eyD32UMBENA3YF/U7Wpu2xoIRU5oPcNTPRiUmXDCoZVQ3E0YOrn2xzp9CriovH8fOBNsb6KHm4XcC8dM5NIKsw== dependencies: "@babel/core" "^7.4.5" - "@nuxt/babel-preset-app" "2.8.0" + "@nuxt/babel-preset-app" "2.8.1" "@nuxt/friendly-errors-webpack-plugin" "^2.5.0" - "@nuxt/utils" "2.8.0" + "@nuxt/utils" "2.8.1" babel-loader "^8.0.6" cache-loader "^3.0.1" - caniuse-lite "^1.0.30000971" + caniuse-lite "^1.0.30000973" chalk "^2.4.2" consola "^2.7.1" css-loader "^2.1.1" @@ -1122,7 +1122,7 @@ time-fix-plugin "^2.0.6" url-loader "^1.1.2" vue-loader "^15.7.0" - webpack "^4.32.2" + webpack "^4.33.0" webpack-bundle-analyzer "^3.3.2" webpack-dev-middleware "^3.7.0" webpack-hot-middleware "^2.25.0" @@ -2861,10 +2861,10 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000939, caniuse-lite@^1.0.30000957, can resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz#a5039577806fccee80a04aaafb2c0890b1ee2f73" integrity sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ== -caniuse-lite@^1.0.30000971: - version "1.0.30000971" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz#d1000e4546486a6977756547352bc96a4cfd2b13" - integrity sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g== +caniuse-lite@^1.0.30000973: + version "1.0.30000973" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000973.tgz#2f8e8e54f9e6c5b7a631c9e69bfa1093d8cfd360" + integrity sha512-/F3t/Yo8LEdRSEPCmI15fLu5vepVh9UCg/9inJXF5AAfW7xRRJkbaM2ut52iRMQMnGCLQouLbFdbOA+VEFOIsg== capture-exit@^2.0.0: version "2.0.0" @@ -2944,10 +2944,10 @@ chokidar@^2.0.2, chokidar@^2.1.5: optionalDependencies: fsevents "^1.2.7" -chokidar@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.0.tgz#6b538f0fd6d5d31d5dd2b59e05426bec0f49aa40" - integrity sha512-ebzWopcacB2J19Jsb5RPtMrzmjUZ5VAQnsL0Ztrix3lswozHbiDp+1Lg3AWSKHdwsps/W2vtshA/x3I827F78g== +chokidar@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.1.tgz#98fe9aa476c55d9aea7841d6325ffdb30e95b40c" + integrity sha512-2ww34sJWehnbpV0Q4k4V5Hh7juo7po6z7LUWkcIQnSGN1lHOL8GGtLtfwabKvLFQw/hbSUQ0u6V7OgGYgBzlkQ== dependencies: anymatch "^3.0.1" async-each "^1.0.3" @@ -2956,7 +2956,7 @@ chokidar@^3.0.0: is-binary-path "^2.1.0" is-glob "^4.0.1" normalize-path "^3.0.0" - readdirp "^3.0.1" + readdirp "^3.0.2" optionalDependencies: fsevents "^2.0.6" @@ -7660,18 +7660,18 @@ nuxt-env@~0.1.0: resolved "https://registry.yarnpkg.com/nuxt-env/-/nuxt-env-0.1.0.tgz#8ac50b9ff45391ad3044ea932cbd05f06a585f87" integrity sha512-7mTao3qG0zfN0hahk3O6SuDy0KEwYmNojammWQsMwhqMn3aUjX4nMYnWDa0pua+2/rwAY9oG53jQtLgJdG7f9w== -nuxt@~2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.8.0.tgz#34e01bb9eeec02324f8e446d0c03995f174b49ce" - integrity sha512-EGgSJOWSVmH8pOPmEPkf5V8C3IpfGReHziqEdTK8JrrAb1tvGKbTrfbNwaXV0qJ62vdVSSiHtFyWqOFEHXhJ1g== +nuxt@~2.8.1: + version "2.8.1" + resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.8.1.tgz#10a307e51973fa7b55abfeb41b84c76cbdd6f2f6" + integrity sha512-y0XsKvusxmtWVsBB4kt+yA7+KoALPnUvkfLBxSy2kV2S1AudGNYAJK0IdUAP4xKd0QJSc9IzSDVat8UZi4FEQA== dependencies: - "@nuxt/builder" "2.8.0" - "@nuxt/cli" "2.8.0" - "@nuxt/core" "2.8.0" - "@nuxt/generator" "2.8.0" + "@nuxt/builder" "2.8.1" + "@nuxt/cli" "2.8.1" + "@nuxt/core" "2.8.1" + "@nuxt/generator" "2.8.1" "@nuxt/loading-screen" "^0.5.2" "@nuxt/opencollective" "^0.2.2" - "@nuxt/webpack" "2.8.0" + "@nuxt/webpack" "2.8.1" nwsapi@^2.0.7: version "2.1.4" @@ -9322,10 +9322,10 @@ readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" -readdirp@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.0.1.tgz#14a8875883c5575c235579624a1e177cb0b1ec58" - integrity sha512-emMp13NEwWQQX1yeDgrzDNCSY7NHV6k9HTW0OhyQqOAzYacbqQhnmWiCYjxNPcqMTQ9k77oXQJp28jkytm3+jg== +readdirp@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.0.2.tgz#cba63348e9e42fc1bd334b1d2ef895b6a043cbd6" + integrity sha512-LbyJYv48eywrhOlScq16H/VkCiGKGPC2TpOdZCJ7QXnYEjn3NN/Oblh8QEU3vqfSRBB7OGvh5x45NKiVeNujIQ== dependencies: picomatch "^2.0.4" @@ -11434,10 +11434,10 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.3.0: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@^4.32.2: - version "4.32.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.32.2.tgz#3639375364a617e84b914ddb2c770aed511e5bc8" - integrity sha512-F+H2Aa1TprTQrpodRAWUMJn7A8MgDx82yQiNvYMaj3d1nv3HetKU0oqEulL9huj8enirKi8KvEXQ3QtuHF89Zg== +webpack@^4.33.0: + version "4.33.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.33.0.tgz#c30fc4307db432e5c5e3333aaa7c16a15a3b277e" + integrity sha512-ggWMb0B2QUuYso6FPZKUohOgfm+Z0sVFs8WwWuSH1IAvkWs428VDNmOlAxvHGTB9Dm/qOB/qtE5cRx5y01clxw== dependencies: "@webassemblyjs/ast" "1.8.5" "@webassemblyjs/helper-module-context" "1.8.5" From 1cca86390d49267499909d53a9cc12e0b0140a19 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Wed, 5 Jun 2019 05:01:38 +0000 Subject: [PATCH 5/9] Bump node from 12.3.1-alpine to 12.4-alpine in /webapp Bumps node from 12.3.1-alpine to 12.4-alpine. --- webapp/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/Dockerfile b/webapp/Dockerfile index fc3b17779..feba44c36 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12.3.1-alpine as base +FROM node:12.4-alpine as base LABEL Description="Web Frontend of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)" EXPOSE 3000 From 569216b8bf4b6591cb5eeed84849cf0eb784e0be Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Wed, 5 Jun 2019 05:01:44 +0000 Subject: [PATCH 6/9] Bump node from 12.3.1-alpine to 12.4-alpine in /backend Bumps node from 12.3.1-alpine to 12.4-alpine. --- backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 6d3095648..d24f2747e 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12.3.1-alpine as base +FROM node:12.4-alpine as base LABEL Description="Backend of the Social Network Human-Connection.org" Vendor="Human Connection gGmbH" Version="0.0.1" Maintainer="Human Connection gGmbH (developer@human-connection.org)" EXPOSE 4000 From 96b1b0b31e2347f92c462d86762b4fbc6702dfda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 5 Jun 2019 10:33:10 +0200 Subject: [PATCH 7/9] Fix deployment - wrong docker image name --- scripts/docker_push.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index 9aa9a8e2a..6cd33ddd4 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -2,7 +2,7 @@ echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT --target production -t humanconnection/nitro-backend:latest $TRAVIS_BUILD_DIR/backend docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT --target production -t humanconnection/nitro-web:latest $TRAVIS_BUILD_DIR/webapp -docker build -t humanconnection/nitro-maintenance-worker:latest $TRAVIS_BUILD_DIR/deployment/legacy-migration/maintenance-worker +docker build -t humanconnection/maintenance-worker:latest $TRAVIS_BUILD_DIR/deployment/legacy-migration/maintenance-worker docker push humanconnection/nitro-backend:latest docker push humanconnection/nitro-web:latest -docker push humanconnection/nitro-maintenance-worker:latest +docker push humanconnection/maintenance-worker:latest From 42f5fb6bf3240ce65f35934e894e977bf4cdc626 Mon Sep 17 00:00:00 2001 From: senderfm Date: Wed, 5 Jun 2019 10:38:15 +0200 Subject: [PATCH 8/9] Fixed No untranslated strings --- webapp/locales/de.json | 5 ++ webapp/locales/en.json | 5 ++ webapp/pages/profile/_id/_slug.vue | 118 +++++++++++++++++++---------- 3 files changed, 86 insertions(+), 42 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index fb33e2fd8..909659366 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -160,6 +160,11 @@ } }, "common": { + "your": { + "post": "Dein Beitrag ::: Deine Beiträge", + "comment": "Dein Kommentar ::: Deine Kommentare", + "shouted": "Deine Empfehlung ::: Deine Empfehlungen" + }, "post": "Beitrag ::: Beiträge", "comment": "Kommentar ::: Kommentare", "letsTalk": "Miteinander reden", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 8330f97b2..bd517a7ce 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -160,6 +160,11 @@ } }, "common": { + "your": { + "post": "Your Post ::: Your Posts", + "comment": "Your Comment ::: Your Comments", + "shout": "Your Shout ::: Your Shouts" + }, "post": "Post ::: Posts", "comment": "Comment ::: Comments", "letsTalk": "Let`s Talk", diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue index 7aef41715..dff359e8f 100644 --- a/webapp/pages/profile/_id/_slug.vue +++ b/webapp/pages/profile/_id/_slug.vue @@ -3,15 +3,15 @@

PROFILE IMAGE

- + - - + + {{ userName }} - + {{ user.location.name }} - - {{ $t('profile.memberSince') }} {{ user.createdAt | date('MMMM yyyy') }} - + {{ $t('profile.memberSince') }} {{ user.createdAt | date('MMMM yyyy') }} - + - + - + @@ -61,16 +63,14 @@ /> - - - Netzwerk - + + Netzwerk Wem folgt {{ userName | truncate(15) }}? @@ -79,20 +79,21 @@ - + - - und {{ user.followingCount - user.following.length }} weitere - + und {{ user.followingCount - user.following.length }} weitere - + Wer folgt {{ userName | truncate(15) }}? @@ -101,13 +102,14 @@ - + - - und {{ user.followedByCount - user.followedBy.length }} weitere - + und {{ user.followedByCount - user.followedBy.length }} weitere