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' into editor

Browse Source
This commit is contained in:
Grzegorz Leoniec 2019-02-15 18:08:22 +01:00 committed by GitHub
commit ddfdc6fdf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 445 additions and 485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package.json
View File

@ -38,13 +38,13 @@
] ]
}, },
"dependencies": { "dependencies": {
"@nuxtjs/apollo": "4.0.0-rc3", "@nuxtjs/apollo": "4.0.0-rc4",
"@nuxtjs/axios": "~5.3.6", "@nuxtjs/axios": "~5.3.6",
"@nuxtjs/dotenv": "~1.3.0", "@nuxtjs/dotenv": "~1.3.0",
"@nuxtjs/style-resources": "~0.1.2", "@nuxtjs/style-resources": "~0.1.2",
"accounting": "~0.4.1", "accounting": "~0.4.1",
"apollo-cache-inmemory": "~1.4.2", "apollo-cache-inmemory": "~1.4.3",
"apollo-client": "~2.4.12", "apollo-client": "~2.4.13",
"cookie-universal-nuxt": "~2.0.14", "cookie-universal-nuxt": "~2.0.14",
"cross-env": "~5.2.0", "cross-env": "~5.2.0",
"date-fns": "2.0.0-alpha.26", "date-fns": "2.0.0-alpha.26",
@ -53,7 +53,7 @@
"jsonwebtoken": "~8.4.0", "jsonwebtoken": "~8.4.0",
"linkify-it": "~2.1.0", "linkify-it": "~2.1.0",
"nuxt": "~2.4.3", "nuxt": "~2.4.3",
"nuxt-env": "~0.0.4", "nuxt-env": "~0.1.0",
"portal-vue": "~1.5.1", "portal-vue": "~1.5.1",
"string-hash": "^1.1.3", "string-hash": "^1.1.3",
"tiptap": "^1.13.0", "tiptap": "^1.13.0",
@ -87,8 +87,5 @@
"sass-loader": "~7.1.0", "sass-loader": "~7.1.0",
"vue-jest": "~3.0.3", "vue-jest": "~3.0.3",
"vue-svg-loader": "~0.11.0" "vue-svg-loader": "~0.11.0"
},
"resolutions": {
"vue-apollo": "3.0.0-beta.25"
} }
} }

919
yarn.lock
View File

File diff suppressed because it is too large Load Diff