merge conflicts resolved

1 files changed, 58 insertions, 56 deletions

diff --git a/package.json b/package.json
index 0e6906fc8..8f67704cb 100644
--- a/package.json
+++ b/package.json
@@ -23,67 +23,67 @@
         "@types/archiver": "^3.0.0",
         "@types/async": "^2.4.1",
         "@types/bcrypt-nodejs": "0.0.30",
-        "@types/bluebird": "^3.5.29",
+        "@types/bluebird": "^3.5.32",
         "@types/body-parser": "^1.17.1",
         "@types/chai": "^4.2.7",
         "@types/color": "^3.0.1",
         "@types/connect-flash": "0.0.34",
         "@types/cookie-parser": "^1.4.2",
-        "@types/cookie-session": "^2.0.36",
+        "@types/cookie-session": "^2.0.41",
         "@types/dotenv": "^6.1.1",
-        "@types/exif": "^0.6.0",
+        "@types/exif": "^0.6.1",
         "@types/express": "^4.17.2",
         "@types/express-flash": "0.0.0",
         "@types/express-session": "^1.15.16",
         "@types/express-validator": "^3.0.0",
         "@types/formidable": "^1.0.31",
-        "@types/google-maps-react": "^2.0.4",
-        "@types/jquery": "^3.3.31",
+        "@types/google-maps-react": "^2.0.5",
+        "@types/jquery": "^3.5.0",
         "@types/libxmljs": "^0.18.5",
-        "@types/lodash": "^4.14.149",
+        "@types/lodash": "^4.14.157",
         "@types/mobile-detect": "^1.3.4",
         "@types/mocha": "^5.2.6",
-        "@types/mongodb": "^3.3.14",
-        "@types/mongoose": "^5.5.43",
-        "@types/node": "^10.17.13",
+        "@types/mongodb": "^3.5.25",
+        "@types/mongoose": "^5.7.28",
+        "@types/node": "^10.17.26",
         "@types/nodemailer": "^4.6.6",
         "@types/passport": "^1.0.2",
         "@types/passport-google-oauth20": "^2.0.3",
         "@types/passport-local": "^1.0.33",
-        "@types/pdfjs-dist": "^2.1.3",
+        "@types/pdfjs-dist": "^2.1.4",
         "@types/prosemirror-commands": "^1.0.1",
         "@types/prosemirror-history": "^1.0.1",
         "@types/prosemirror-inputrules": "^1.0.2",
-        "@types/prosemirror-keymap": "^1.0.1",
-        "@types/prosemirror-menu": "^1.0.1",
+        "@types/prosemirror-keymap": "^1.0.2",
+        "@types/prosemirror-menu": "^1.0.2",
         "@types/prosemirror-model": "^1.7.0",
         "@types/prosemirror-schema-list": "^1.0.1",
-        "@types/prosemirror-state": "^1.2.3",
+        "@types/prosemirror-state": "^1.2.4",
         "@types/prosemirror-transform": "^1.1.1",
         "@types/prosemirror-view": "^1.11.2",
-        "@types/puppeteer": "^2.1.0",
+        "@types/puppeteer": "^2.1.1",
         "@types/rc-switch": "^1.9.0",
-        "@types/react": "^16.9.19",
-        "@types/react-autosuggest": "^9.3.13",
-        "@types/react-color": "^2.17.3",
-        "@types/react-dom": "^16.9.5",
+        "@types/react": "^16.9.41",
+        "@types/react-autosuggest": "^9.3.14",
+        "@types/react-color": "^2.17.4",
+        "@types/react-dom": "^16.9.8",
         "@types/react-grid-layout": "^0.17.1",
         "@types/react-measure": "^2.0.6",
         "@types/react-select": "^3.0.13",
         "@types/react-table": "^6.8.6",
-        "@types/request": "^2.48.4",
+        "@types/request": "^2.48.5",
         "@types/request-promise": "^4.1.45",
         "@types/rimraf": "^2.0.3",
         "@types/sharp": "^0.23.1",
-        "@types/shelljs": "^0.8.6",
-        "@types/socket.io": "^2.1.4",
-        "@types/socket.io-client": "^1.4.32",
+        "@types/shelljs": "^0.8.8",
+        "@types/socket.io": "^2.1.8",
+        "@types/socket.io-client": "^1.4.33",
         "@types/typescript": "^2.0.0",
         "@types/uuid": "^3.4.6",
         "@types/valid-url": "^1.0.3",
-        "@types/webpack": "^4.41.3",
-        "@types/webpack-dev-middleware": "^2.0.2",
-        "@types/webpack-hot-middleware": "^2.25.0",
+        "@types/webpack": "^4.41.18",
+        "@types/webpack-dev-middleware": "^2.0.5",
+        "@types/webpack-hot-middleware": "^2.25.3",
         "@types/xregexp": "^4.3.0",
         "@types/youtube": "0.0.39",
         "awesome-typescript-loader": "^5.2.1",
@@ -101,27 +101,28 @@
         "style-loader": "^0.23.1",
         "ts-loader": "^5.3.3",
         "ts-node": "^7.0.1",
-        "ts-node-dev": "^1.0.0-pre.44",
+        "ts-node-dev": "^1.0.0-pre.49",
         "tslint": "^5.20.1",
         "tslint-loader": "^3.6.0",
-        "typescript": "^3.7.5",
+        "typescript": "^3.9.5",
         "webpack": "^4.41.5",
-        "webpack-cli": "^3.3.10",
+        "webpack-cli": "^3.3.12",
         "webpack-dev-middleware": "^3.7.2",
-        "webpack-dev-server": "^3.10.1",
+        "webpack-dev-server": "^3.11.0",
         "webpack-hot-middleware": "^2.24.3"
     },
     "dependencies": {
-        "@fortawesome/fontawesome-svg-core": "^1.2.26",
-        "@fortawesome/free-regular-svg-icons": "^5.12.0",
-        "@fortawesome/free-solid-svg-icons": "^5.12.0",
-        "@fortawesome/react-fontawesome": "^0.1.8",
-        "@hig/flyout": "^1.2.0",
+        "@fortawesome/fontawesome-svg-core": "^1.2.29",
+        "@fortawesome/free-regular-svg-icons": "^5.13.1",
+        "@fortawesome/free-solid-svg-icons": "^5.13.1",
+        "@fortawesome/react-fontawesome": "^0.1.11",
+        "@hig/flyout": "^1.2.1",
         "@hig/theme-context": "^2.1.3",
-        "@hig/theme-data": "^2.13.0",
+        "@hig/theme-data": "^2.16.1",
+        "@types/google-maps": "^3.2.2",
         "@types/webscopeio__react-textarea-autocomplete": "^4.6.1",
-        "@webscopeio/react-textarea-autocomplete": "^4.6.3",
-        "adm-zip": "^0.4.13",
+        "@webscopeio/react-textarea-autocomplete": "^4.7.0",
+        "adm-zip": "^0.4.16",
         "archiver": "^3.1.1",
         "array-batcher": "^1.2.3",
         "async": "^2.6.2",
@@ -130,7 +131,7 @@
         "bezier-curve": "^1.0.0",
         "bluebird": "^3.7.2",
         "body-parser": "^1.18.3",
-        "bootstrap": "^4.4.1",
+        "bootstrap": "^4.5.0",
         "canvas": "^2.5.0",
         "child_process": "^1.0.2",
         "chrome": "^0.1.0",
@@ -151,14 +152,14 @@
         "expressjs": "^1.0.1",
         "find-in-files": "^0.5.0",
         "fit-curve": "^0.1.7",
-        "flexlayout-react": "^0.3.3",
+        "flexlayout-react": "^0.3.11",
         "formidable": "^1.2.1",
         "golden-layout": "^1.5.9",
         "google-auth-library": "^4.2.4",
         "google-maps-react": "^2.0.6",
         "googleapis": "^40.0.0",
         "googlephotos": "^0.2.5",
-        "howler": "^2.1.3",
+        "howler": "^2.2.0",
         "html-to-image": "^0.1.0",
         "html-to-text": "^5.1.1",
         "i": "^0.3.6",
@@ -173,46 +174,47 @@
         "mobx": "^5.15.3",
         "mobx-react": "^5.3.5",
         "mobx-react-devtools": "^6.1.1",
-        "mobx-utils": "^5.5.3",
-        "mongodb": "^3.5.2",
-        "mongoose": "^5.8.9",
+        "mobx-utils": "^5.6.1",
+        "mongodb": "^3.5.9",
+        "mongoose": "^5.9.20",
         "node-sass": "^4.14.1",
-        "node-stream-zip": "^1.9.1",
+        "node-stream-zip": "^1.11.2",
         "nodemailer": "^5.1.1",
         "nodemon": "^1.19.4",
         "normalize.css": "^8.0.1",
-        "npm": "^6.14.4",
+        "npm": "^6.14.5",
         "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.3.200",
+        "pdfjs": "^2.3.9",
+        "pdfjs-dist": "^2.4.456",
         "probe-image-size": "^4.0.0",
         "prosemirror-commands": "^1.1.3",
-        "prosemirror-dev-tools": "^3.0.0",
+        "prosemirror-dev-tools": "^3.0.1",
         "prosemirror-find-replace": "^0.9.0",
         "prosemirror-history": "^1.1.3",
         "prosemirror-inputrules": "^1.1.2",
-        "prosemirror-keymap": "^1.1.3",
-        "prosemirror-model": "^1.9.1",
+        "prosemirror-keymap": "^1.1.4",
+        "prosemirror-model": "^1.10.0",
         "prosemirror-schema-list": "^1.1.2",
         "prosemirror-state": "^1.3.2",
-        "prosemirror-transform": "^1.2.3",
-        "prosemirror-view": "^1.13.8",
+        "prosemirror-transform": "^1.2.6",
+        "prosemirror-view": "^1.15.0",
         "pug": "^2.0.4",
-        "puppeteer": "^3.1.0",
-        "query-string": "^6.10.1",
+        "puppeteer": "^3.3.0",
+        "query-string": "^6.13.1",
         "raw-loader": "^1.0.0",
         "rc-switch": "^1.9.0",
         "react": "^16.12.0",
         "react-autosuggest": "^9.4.3",
-        "react-color": "^2.18.0",
+        "react-color": "^2.18.1",
         "react-compound-slider": "^2.5.0",
         "react-dom": "^16.12.0",
         "react-grid-layout": "^0.18.3",
         "react-image-lightbox-with-rotate": "^5.1.1",
-        "react-jsx-parser": "^1.21.0",
+        "react-jsx-parser": "^1.25.1",
         "react-measure": "^2.2.4",
         "react-resizable": "^1.10.1",
         "react-select": "^3.1.0",
@@ -235,7 +237,7 @@
         "uuid": "^3.4.0",
         "valid-url": "^1.0.9",
         "web-request": "^1.0.7",
-        "webrtc-adapter": "^7.3.0",
+        "webrtc-adapter": "^7.6.3",
         "wikijs": "^6.0.1",
         "words-to-numbers": "^1.5.1",
         "xoauth2": "^1.2.0",