Skip to content

Commit

Permalink
Merge branch 'development' into 'master'
Browse files Browse the repository at this point in the history
Development

See merge request b650/Deep-Lynx!188
  • Loading branch information
DnOberon committed Mar 2, 2022
2 parents ef55f5d + 6fd9776 commit 940ecf1
Show file tree
Hide file tree
Showing 63 changed files with 2,778 additions and 651 deletions.
2 changes: 1 addition & 1 deletion .env-sample
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,4 @@ RSA_CLIENT_KEY=
RSA_CLIENT_ID=

# Email for the authorized HPC user to access tasks
HPC_EMAIL=
HPC_EMAIL=
442 changes: 441 additions & 1 deletion API Documentation/Core.swagger_collection.yaml

Large diffs are not rendered by default.

76 changes: 50 additions & 26 deletions AdminWebApp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 23 additions & 23 deletions AdminWebApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,53 +8,53 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@mdi/js": "^5.8.55",
"@types/jwt-decode": "^2.2.1",
"@types/uuid": "^8.3.0",
"@typescript-eslint/eslint-plugin": "^2.18.0",
"@typescript-eslint/parser": "^2.18.0",
"@vue/cli-plugin-eslint": "~4.2.0",
"@vue/cli-plugin-router": "~4.2.0",
"@vue/cli-plugin-typescript": "^4.5.13",
"@vue/cli-plugin-vuex": "~4.2.0",
"@vue/cli-service": "~4.2.0",
"@vue/eslint-config-typescript": "^5.1.0",
"axios": "^0.21.1",
"build-url": "^6.0.1",
"cross-env": "^7.0.3",
"cytoscape-cola": "^2.5.0",
"deep-diff": "^1.0.2",
"diff": "^5.0.0",
"element-ui": "^2.14.1",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^6.1.2",
"highlight.js": "^10.4.1",
"is-svg": "^4.3.1",
"jwt-decode": "^2.2.0",
"node-forge": "^0.10.0",
"prismjs": "^1.23.0",
"sass": "~1.30.0",
"sass-loader": "^8.0.0",
"ssri": "^8.0.1",
"three": "^0.132.2",
"three-mesh-bvh": "^0.4.3",
"tslib": "^2.0.3",
"typescript": "~3.7.5",
"uuid": "^8.3.2",
"vue": "^2.6.12",
"vue-class-component": "^7.2.6",
"vue-cli-plugin-vuetify": "^2.0.8",
"vue-cytoscape": "^1.0.8",
"vue-i18n": "^8.25.0",
"vue-json-component": "^0.4.1",
"vue-prism-editor": "^1.2.2",
"vue-property-decorator": "^8.5.1",
"vue-router": "^3.4.9",
"vue-template-compiler": "^2.6.12",
"vuetify": "^2.3.19",
"vuetify-loader": "^1.6.0",
"vuex": "^3.6.0",
"web-ifc-three": "^0.0.67",
"webcola": "^3.4.0",
"@mdi/js": "^5.8.55",
"@typescript-eslint/eslint-plugin": "^2.18.0",
"@typescript-eslint/parser": "^2.18.0",
"@vue/cli-plugin-eslint": "~4.2.0",
"@vue/cli-plugin-router": "~4.2.0",
"@vue/cli-plugin-typescript": "^4.5.13",
"@vue/cli-plugin-vuex": "~4.2.0",
"@vue/cli-service": "~4.2.0",
"@vue/eslint-config-typescript": "^5.1.0",
"cross-env": "^7.0.3",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^6.1.2",
"prismjs": "^1.23.0",
"sass": "~1.30.0",
"sass-loader": "^8.0.0",
"tslib": "^2.0.3",
"typescript": "~3.7.5",
"vue-cli-plugin-vuetify": "^2.0.8",
"vue-template-compiler": "^2.6.12",
"vuetify-loader": "^1.6.0"
},
"devDependencies": {
"webcola": "^3.4.0"
}
}
Loading

0 comments on commit 940ecf1

Please sign in to comment.