IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Human-Connection/Human-Connection into add-masonry-grid

Browse Source
This commit is contained in:
Matt Rider 2019-08-20 08:52:31 +02:00
commit f5ef859cc9
6 changed files with 2867 additions and 832 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/package.json
View File

@ -55,9 +55,9 @@
"cheerio": "~1.0.0-rc.3", "cheerio": "~1.0.0-rc.3",
"cors": "~2.8.5", "cors": "~2.8.5",
"cross-env": "~5.2.0", "cross-env": "~5.2.0",
"date-fns": "2.0.0-beta.4", "date-fns": "2.0.0-beta.5",
"debug": "~4.1.1", "debug": "~4.1.1",
"dotenv": "~8.0.0", "dotenv": "~8.1.0",
"express": "^4.17.1", "express": "^4.17.1",
"faker": "Marak/faker.js#master", "faker": "Marak/faker.js#master",
"graphql": "~14.4.2", "graphql": "~14.4.2",
@ -89,7 +89,7 @@
"metascraper-youtube": "^5.6.3", "metascraper-youtube": "^5.6.3",
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"neo4j-driver": "~1.7.5", "neo4j-driver": "~1.7.5",
"neo4j-graphql-js": "^2.7.0", "neo4j-graphql-js": "^2.7.1",
"neode": "^0.3.1", "neode": "^0.3.1",
"node-fetch": "~2.6.0", "node-fetch": "~2.6.0",
"nodemailer": "^6.3.0", "nodemailer": "^6.3.0",
@ -111,10 +111,10 @@
"apollo-server-testing": "~2.8.1", "apollo-server-testing": "~2.8.1",
"babel-core": "~7.0.0-0", "babel-core": "~7.0.0-0",
"babel-eslint": "~10.0.2", "babel-eslint": "~10.0.2",
"babel-jest": "~24.8.0", "babel-jest": "~24.9.0",
"chai": "~4.2.0", "chai": "~4.2.0",
"cucumber": "~5.1.0", "cucumber": "~5.1.0",
"eslint": "~6.1.0", "eslint": "~6.2.0",
"eslint-config-prettier": "~6.0.0", "eslint-config-prettier": "~6.0.0",
"eslint-config-standard": "~13.0.1", "eslint-config-standard": "~13.0.1",
"eslint-plugin-import": "~2.18.2", "eslint-plugin-import": "~2.18.2",
@ -124,7 +124,7 @@
"eslint-plugin-promise": "~4.2.1", "eslint-plugin-promise": "~4.2.1",
"eslint-plugin-standard": "~4.0.0", "eslint-plugin-standard": "~4.0.0",
"graphql-request": "~1.8.2", "graphql-request": "~1.8.2",
"jest": "~24.8.0", "jest": "~24.9.0",
"nodemon": "~1.19.1", "nodemon": "~1.19.1",
"prettier": "~1.18.2", "prettier": "~1.18.2",
"supertest": "~4.0.2" "supertest": "~4.0.2"

954
backend/yarn.lock
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -26,7 +26,7 @@
"cypress-cucumber-preprocessor": "^1.13.1", "cypress-cucumber-preprocessor": "^1.13.1",
"cypress-file-upload": "^3.3.3", "cypress-file-upload": "^3.3.3",
"cypress-plugin-retries": "^1.2.2", "cypress-plugin-retries": "^1.2.2",
"dotenv": "^8.0.0", "dotenv": "^8.1.0",
"faker": "Marak/faker.js#master", "faker": "Marak/faker.js#master",
"graphql-request": "^1.8.2", "graphql-request": "^1.8.2",
"neo4j-driver": "^1.7.5", "neo4j-driver": "^1.7.5",

8
webapp/package.json
View File

@ -51,7 +51,7 @@
}, },
"dependencies": { "dependencies": {
"@human-connection/styleguide": "0.5.19", "@human-connection/styleguide": "0.5.19",
"@nuxtjs/apollo": "^4.0.0-rc10", "@nuxtjs/apollo": "^4.0.0-rc9",
"@nuxtjs/axios": "~5.5.4", "@nuxtjs/axios": "~5.5.4",
"@nuxtjs/dotenv": "~1.4.0", "@nuxtjs/dotenv": "~1.4.0",
"@nuxtjs/style-resources": "~1.0.0", "@nuxtjs/style-resources": "~1.0.0",
@ -60,7 +60,7 @@
"apollo-client": "~2.6.4", "apollo-client": "~2.6.4",
"cookie-universal-nuxt": "~2.0.17", "cookie-universal-nuxt": "~2.0.17",
"cross-env": "~5.2.0", "cross-env": "~5.2.0",
"date-fns": "2.0.0-beta.4", "date-fns": "2.0.0-beta.5",
"express": "~4.17.1", "express": "~4.17.1",
"graphql": "~14.4.2", "graphql": "~14.4.2",
"isemail": "^3.2.0", "isemail": "^3.2.0",
@ -95,7 +95,7 @@
"@vue/test-utils": "~1.0.0-beta.29", "@vue/test-utils": "~1.0.0-beta.29",
"babel-core": "~7.0.0-bridge.0", "babel-core": "~7.0.0-bridge.0",
"babel-eslint": "~10.0.2", "babel-eslint": "~10.0.2",
"babel-jest": "~24.8.0", "babel-jest": "~24.9.0",
"babel-loader": "~8.0.6", "babel-loader": "~8.0.6",
"babel-preset-vue": "~2.0.2", "babel-preset-vue": "~2.0.2",
"core-js": "~2.6.9", "core-js": "~2.6.9",
@ -113,7 +113,7 @@
"eslint-plugin-vue": "~5.2.3", "eslint-plugin-vue": "~5.2.3",
"flush-promises": "^1.0.2", "flush-promises": "^1.0.2",
"fuse.js": "^3.4.5", "fuse.js": "^3.4.5",
"jest": "~24.8.0", "jest": "~24.9.0",
"mutation-observer": "^1.0.3", "mutation-observer": "^1.0.3",
"node-sass": "~4.12.0", "node-sass": "~4.12.0",
"nodemon": "~1.19.1", "nodemon": "~1.19.1",

2715
webapp/yarn.lock
View File

File diff suppressed because it is too large Load Diff

8
yarn.lock
View File

@ -2084,10 +2084,10 @@ dotenv@^4.0.0:
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
integrity sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0= integrity sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=
dotenv@^8.0.0: dotenv@^8.1.0:
version "8.0.0" version "8.1.0"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.0.0.tgz#ed310c165b4e8a97bb745b0a9d99c31bda566440" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.1.0.tgz#d811e178652bfb8a1e593c6dd704ec7e90d85ea2"
integrity sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg== integrity sha512-GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA==
duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2: duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2:
version "0.1.4" version "0.1.4"