merge from master

1 files changed, 14 insertions, 4 deletions

diff --git a/package.json b/package.json
index 9fca2227f..252104435 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
         "ts-node-dev": "^1.0.0-pre.32",
         "tslint": "^5.15.0",
         "tslint-loader": "^3.5.4",
-        "typescript": "^3.5.3",
+        "typescript": "^3.7.2",
         "webpack": "^4.29.6",
         "webpack-cli": "^3.2.3",
         "webpack-dev-middleware": "^3.6.1",
@@ -59,11 +59,13 @@
         "@types/bluebird": "^3.5.25",
         "@types/body-parser": "^1.17.0",
         "@types/classnames": "^2.2.8",
+        "@types/color": "^3.0.0",
         "@types/connect-flash": "0.0.34",
         "@types/cookie-parser": "^1.4.1",
         "@types/cookie-session": "^2.0.36",
         "@types/d3-format": "^1.3.1",
         "@types/dotenv": "^6.1.1",
+        "@types/exif": "^0.6.0",
         "@types/express": "^4.16.1",
         "@types/express-flash": "0.0.0",
         "@types/express-session": "^1.15.12",
@@ -80,6 +82,7 @@
         "@types/node": "^10.12.30",
         "@types/nodemailer": "^4.6.6",
         "@types/passport": "^1.0.0",
+        "@types/passport-google-oauth20": "^2.0.2",
         "@types/passport-local": "^1.0.33",
         "@types/pdfjs-dist": "^2.0.0",
         "@types/prosemirror-commands": "^1.0.1",
@@ -112,6 +115,7 @@
         "@types/youtube": "0.0.38",
         "adm-zip": "^0.4.13",
         "archiver": "^3.0.3",
+        "array-batcher": "^1.2.3",
         "async": "^2.6.2",
         "babel-runtime": "^6.26.0",
         "bcrypt-nodejs": "0.0.3",
@@ -121,6 +125,7 @@
         "canvas": "^2.5.0",
         "child_process": "^1.0.2",
         "class-transformer": "^0.2.0",
+        "color": "^3.1.2",
         "connect-flash": "^0.1.1",
         "connect-mongo": "^2.0.3",
         "cookie-parser": "^1.4.4",
@@ -128,17 +133,20 @@
         "crypto-browserify": "^3.11.0",
         "d3-format": "^1.3.2",
         "dotenv": "^8.0.0",
+        "exif": "^0.6.0",
         "express": "^4.16.4",
         "express-flash": "0.0.2",
         "express-session": "^1.15.6",
         "express-validator": "^5.3.1",
         "expressjs": "^1.0.1",
+        "find-in-files": "^0.5.0",
         "flexlayout-react": "^0.3.3",
         "font-awesome": "^4.7.0",
         "formidable": "^1.2.1",
         "golden-layout": "^1.5.9",
         "google-auth-library": "^4.2.4",
         "googleapis": "^40.0.0",
+        "googlephotos": "^0.2.1",
         "howler": "^2.1.2",
         "html-to-image": "^0.1.0",
         "i": "^0.3.6",
@@ -161,10 +169,12 @@
         "nodemailer": "^5.1.1",
         "nodemon": "^1.18.10",
         "normalize.css": "^8.0.1",
-        "npm": "^6.10.3",
+        "npm": "^6.12.0",
         "p-limit": "^2.2.0",
         "passport": "^0.4.0",
+        "passport-google-oauth20": "^2.0.0",
         "passport-local": "^1.0.0",
+        "pdf-parse": "^1.1.1",
         "pdfjs-dist": "^2.0.943",
         "probe-image-size": "^4.0.0",
         "prosemirror-commands": "^1.0.8",
@@ -191,13 +201,13 @@
         "react-dimensions": "^1.3.1",
         "react-dom": "^16.8.4",
         "react-golden-layout": "^1.0.6",
-        "react-image-lightbox": "^5.1.0",
+        "react-image-lightbox-with-rotate": "^5.1.1",
         "react-jsx-parser": "^1.15.0",
         "react-measure": "^2.2.4",
         "react-mosaic": "0.0.20",
         "react-simple-dropdown": "^3.2.3",
         "react-split-pane": "^0.1.85",
-        "react-table": "^6.9.2",
+        "react-table": "^6.10.3",
         "readline": "^1.3.0",
         "request": "^2.88.0",
         "request-promise": "^4.2.4",