Merge from upstream

1 files changed, 19 insertions, 20 deletions

diff --git a/client/package.json b/client/package.json
index 6f8c62402..a14978998 100644
--- a/client/package.json
+++ b/client/package.json
@@ -63,23 +63,23 @@
     "setupTestFrameworkScriptFile": "<rootDir>/src/setupJest.ts"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.8.3",
-    "@angular/animations": "~6.1.4",
-    "@angular/cli": "~6.2.3",
-    "@angular/common": "~6.1.4",
-    "@angular/compiler": "~6.1.4",
-    "@angular/compiler-cli": "~6.1.4",
-    "@angular/core": "~6.1.4",
-    "@angular/forms": "~6.1.4",
-    "@angular/http": "~6.1.4",
-    "@angular/language-service": "~6.1.4",
-    "@angular/platform-browser": "~6.1.4",
-    "@angular/platform-browser-dynamic": "~6.1.4",
-    "@angular/router": "~6.1.4",
-    "@angular/service-worker": "~6.1.4",
+    "@angular-devkit/build-angular": "~0.10.0",
+    "@angular/animations": "~7.0.2",
+    "@angular/cli": "~7.0.4",
+    "@angular/common": "~7.0.2",
+    "@angular/compiler": "~7.0.2",
+    "@angular/compiler-cli": "~7.0.2",
+    "@angular/core": "~7.0.2",
+    "@angular/forms": "~7.0.2",
+    "@angular/http": "~7.0.2",
+    "@angular/language-service": "~7.0.2",
+    "@angular/platform-browser": "~7.0.2",
+    "@angular/platform-browser-dynamic": "~7.0.2",
+    "@angular/router": "~7.0.2",
+    "@angular/service-worker": "~7.0.2",
     "@angularclass/hmr": "^2.1.3",
     "@neos21/bootstrap3-glyphicons": "^1.0.1",
-    "@ng-bootstrap/ng-bootstrap": "^3.1.0",
+    "@ng-bootstrap/ng-bootstrap": "^4.0.0",
     "@ngx-loading-bar/core": "^2.2.0",
     "@ngx-loading-bar/http-client": "^2.2.0",
     "@ngx-loading-bar/router": "^2.2.0",
@@ -129,7 +129,6 @@
     "ngx-clipboard": "11.1.7",
     "ngx-pipes": "^2.1.7",
     "ngx-qrcode2": "^0.0.9",
-    "ngx-textarea-autosize": "^2.0.0",
     "node-sass": "^4.9.3",
     "npm-font-source-sans-pro": "^1.0.2",
     "path-browserify": "^1.0.0",
@@ -139,17 +138,17 @@
     "purify-css": "^1.2.5",
     "purifycss-webpack": "^0.7.0",
     "raw-loader": "^0.5.1",
-    "rxjs": "^6.1.0",
+    "rxjs": "^6.3.3",
     "sanitize-html": "^1.18.4",
     "sass-loader": "^7.1.0",
-    "sass-resources-loader": "^1.2.1",
+    "sass-resources-loader": "^2.0.0",
     "stream-browserify": "^2.0.1",
-    "stream-http": "^2.8.3",
+    "stream-http": "^3.0.0",
     "terser-webpack-plugin": "^1.1.0",
     "ts-jest": "^23.1.4",
     "tslint": "^5.7.0",
     "tslint-config-standard": "^8.0.1",
-    "typescript": "2.9",
+    "typescript": "3.1.6",
     "video.js": "^7",
     "videojs-contextmenu-ui": "^5.0.0",
     "videojs-dock": "^2.0.2",