Merge branch 'frontend/timo' into develop

This commit is contained in:
Timo Volkmann 2019-05-14 12:17:19 +02:00
commit 625574d765
2 changed files with 703 additions and 402 deletions

File diff suppressed because it is too large Load Diff

View File

@ -13,14 +13,14 @@
"build": "quasar build" "build": "quasar build"
}, },
"dependencies": { "dependencies": {
"@quasar/extras": "^1.1.1", "@quasar/extras": "^1.1.2",
"ajv": "6.8.1", "ajv": "6.8.1",
"axios": "^0.18.0", "axios": "^0.18.0",
"quasar": "^1.0.0-beta.17", "quasar": "^1.0.0-beta.23",
"vue-qrcode-reader": "^1.4.2" "vue-qrcode-reader": "^1.4.2"
}, },
"devDependencies": { "devDependencies": {
"@quasar/app": "^1.0.0-beta.17", "@quasar/app": "^1.0.0-beta.25",
"@vue/eslint-config-prettier": "^4.0.0", "@vue/eslint-config-prettier": "^4.0.0",
"babel-eslint": "^10.0.1", "babel-eslint": "^10.0.1",
"eslint": "^5.10.0", "eslint": "^5.10.0",