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 in changes from master

Browse Source
This commit is contained in:
Matt Rider 2019-05-08 09:55:55 -03:00
parent cfef88fc6e
commit 632ad37a3f
2 changed files with 387 additions and 393 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
webapp/package.json
View File

@ -17,6 +17,8 @@
},
"jest": {
"verbose": true,
"collectCoverage": true,
"coverageReporters": ["text", "lcov"],
"moduleFileExtensions": [
"js",
"json",
@ -51,8 +53,8 @@
"nuxt-env": "~0.1.0",
"stack-utils": "^1.0.2",
"string-hash": "^1.1.3",
"tiptap": "^1.17.0",
"tiptap-extensions": "^1.17.0",
"tiptap": "^1.18.0",
"tiptap-extensions": "^1.18.1",
"v-tooltip": "~2.0.2",
"vue-count-to": "~1.0.13",
"vue-izitoast": "1.1.2",
@ -68,16 +70,16 @@
"@vue/test-utils": "~1.0.0-beta.29",
"babel-core": "~7.0.0-bridge.0",
"babel-eslint": "~10.0.1",
"babel-jest": "~24.7.1",
"babel-jest": "~24.8.0",
"eslint": "~5.16.0",
"eslint-config-prettier": "~4.2.0",
"eslint-loader": "~2.1.2",
"eslint-plugin-prettier": "~3.0.1",
"eslint-plugin-vue": "~5.2.2",
"fuse.js": "^3.4.4",
"jest": "~24.7.1",
"node-sass": "~4.11.0",
"nodemon": "~1.18.11",
"jest": "~24.8.0",
"node-sass": "~4.12.0",
"nodemon": "~1.19.0",
"prettier": "~1.14.3",
"sass-loader": "~7.1.0",
"tippy.js": "^4.3.0",

766
webapp/yarn.lock
View File

File diff suppressed because it is too large Load Diff