ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4044 from jsaalfeld/fix_ts_version_conflict

Browse Source 
fixing ts version due to conflict
This commit is contained in:
Finn Stutzenstein 2018-11-30 09:46:45 +01:00 committed by GitHub
commit 0a823877c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
client/package.json
View File

@ -16,62 +16,62 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^7.0.0", "@angular/animations": "^7.1.1",
"@angular/cdk": "^7.0.4", "@angular/cdk": "^7.1.0",
"@angular/common": "^7.0.0", "@angular/common": "^7.1.1",
"@angular/compiler": "^7.0.0", "@angular/compiler": "^7.1.1",
"@angular/core": "^7.0.0", "@angular/core": "^7.1.1",
"@angular/forms": "^7.0.0", "@angular/forms": "^7.1.1",
"@angular/http": "^7.0.0", "@angular/http": "^7.1.1",
"@angular/material": "^7.0.4", "@angular/material": "^7.1.0",
"@angular/platform-browser": "^7.0.0", "@angular/platform-browser": "^7.1.1",
"@angular/platform-browser-dynamic": "^7.0.0", "@angular/platform-browser-dynamic": "^7.1.1",
"@angular/router": "^7.0.0", "@angular/router": "^7.1.1",
"@ngx-pwa/local-storage": "^7.0.0", "@ngx-pwa/local-storage": "^7.2.0",
"@ngx-translate/core": "^11.0.1", "@ngx-translate/core": "^11.0.1",
"@ngx-translate/http-loader": "^4.0.0", "@ngx-translate/http-loader": "^4.0.0",
"@tinymce/tinymce-angular": "^2.3.1", "@tinymce/tinymce-angular": "^2.3.1",
"angular-tree-component": "^8.0.0", "angular-tree-component": "^8.0.1",
"core-js": "^2.5.4", "core-js": "^2.5.4",
"file-saver": "^2.0.0-rc.3", "file-saver": "^2.0.0",
"material-design-icons": "^3.0.1", "material-design-icons": "^3.0.1",
"ngx-file-drop": "^5.0.0", "ngx-file-drop": "^5.0.0",
"ngx-mat-select-search": "^1.4.0", "ngx-mat-select-search": "^1.4.2",
"po2json": "^1.0.0-alpha", "po2json": "^1.0.0-alpha",
"roboto-fontface": "^0.10.0", "roboto-fontface": "^0.10.0",
"rxjs": "^6.3.3", "rxjs": "^6.3.3",
"tinymce": "^4.8.5", "tinymce": "^4.9.0",
"uuid": "^3.3.2", "uuid": "^3.3.2",
"zone.js": "^0.8.26" "zone.js": "^0.8.26"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "^0.10.5", "@angular-devkit/build-angular": "^0.10.7",
"@angular/cli": "^7.0.5", "@angular/cli": "^7.1.0",
"@angular/compiler-cli": "^7.0.0", "@angular/compiler-cli": "^7.1.1",
"@angular/language-service": "^7.0.0", "@angular/language-service": "^7.1.1",
"@biesbjerg/ngx-translate-extract": "^2.3.4", "@biesbjerg/ngx-translate-extract": "^2.3.4",
"@compodoc/compodoc": "^1.1.5", "@compodoc/compodoc": "^1.1.7",
"@types/jasmine": "^2.8.9", "@types/jasmine": "^2.8.12",
"@types/jasminewd2": "^2.0.5", "@types/jasminewd2": "^2.0.6",
"@types/node": "~10.12.7", "@types/node": "^10.12.10",
"@types/yargs": "^12.0.1", "@types/yargs": "^12.0.1",
"codelyzer": "~4.5.0", "codelyzer": "~4.5.0",
"husky": "^1.1.4", "husky": "^1.1.4",
"jasmine-core": "~2.99.1", "jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1", "jasmine-spec-reporter": "~4.2.1",
"karma": "^3.0.0", "karma": "^3.1.1",
"karma-chrome-launcher": "~2.2.0", "karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "^2.0.4", "karma-coverage-istanbul-reporter": "^2.0.4",
"karma-jasmine": "~1.1.1", "karma-jasmine": "~1.1.1",
"karma-jasmine-html-reporter": "^0.2.2", "karma-jasmine-html-reporter": "^0.2.2",
"npm-run-all": "^4.1.3", "npm-run-all": "^4.1.5",
"prettier": "^1.15.2", "prettier": "^1.15.3",
"pretty-quick": "^1.8.0", "pretty-quick": "^1.8.0",
"protractor": "^5.4.1", "protractor": "^5.4.1",
"ts-node": "~7.0.1", "ts-node": "~7.0.1",
"tslint": "~5.11.0", "tslint": "~5.11.0",
"tsutils": "^3.5.0", "tsutils": "^3.5.1",
"typescript": "^3.1.3", "typescript": ">=3.1.1 <3.2",
"webpack-bundle-analyzer": "^3.0.3" "webpack-bundle-analyzer": "^3.0.3"
} }
} }