zenon/web-application-engineering
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	.gitlab-ci.yml
#	frontend/karma.conf.js
This commit is contained in:
Marco Zeisler 2021-05-12 00:31:16 +02:00
commit 723b817eef
2 changed files with 22950 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22970
frontend/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
frontend/package.json
View File

@ -45,6 +45,7 @@
"@types/jasmine": "~3.4.6", "@types/jasmine": "~3.4.6",
"@types/jasminewd2": "~2.0.8", "@types/jasminewd2": "~2.0.8",
"@types/node": "^12.12.42", "@types/node": "^12.12.42",
"@types/puppeteer": "5.4.3",
"@typescript-eslint/eslint-plugin": "4.19.0", "@typescript-eslint/eslint-plugin": "4.19.0",
"@typescript-eslint/parser": "4.19.0", "@typescript-eslint/parser": "4.19.0",
"codelyzer": "^5.2.2", "codelyzer": "^5.2.2",
@ -63,6 +64,7 @@
"karma-jasmine-html-reporter": "^1.5.4", "karma-jasmine-html-reporter": "^1.5.4",
"ngx-material-file-input": "^2.1.1", "ngx-material-file-input": "^2.1.1",
"protractor": "~5.4.4", "protractor": "~5.4.4",
"puppeteer": "9.1.1",
"ts-node": "~8.5.4", "ts-node": "~8.5.4",
"tslint": "~5.20.1", "tslint": "~5.20.1",
"typescript": "~3.8.3" "typescript": "~3.8.3"