Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into editableSchema

1 files changed, 25 insertions, 1 deletions

diff --git a/package.json b/package.json
index 3a1928632..640f16437 100644
--- a/package.json
+++ b/package.json
@@ -38,10 +38,19 @@
     "@fortawesome/free-solid-svg-icons": "^5.7.2",
     "@fortawesome/react-fontawesome": "^0.1.4",
     "@hig/flyout": "^1.0.3",
+<<<<<<< HEAD
     "@trendmicro/react-dropdown": "^1.3.0",
+=======
+    "@types/async": "^2.4.1",
+    "@hig/theme-context": "^2.1.3",
+    "@hig/theme-data": "^2.3.3",
+>>>>>>> f70ad315167b714f11f7d68f35a46abe9e525a4d
     "@types/bcrypt-nodejs": "0.0.30",
     "@types/bluebird": "^3.5.25",
     "@types/body-parser": "^1.17.0",
+    "@types/connect-flash": "0.0.34",
+    "@types/cookie-parser": "^1.4.1",
+    "@types/cookie-session": "^2.0.36",
     "@types/express": "^4.16.1",
     "@types/express-flash": "0.0.0",
     "@types/express-session": "^1.15.12",
@@ -50,13 +59,16 @@
     "@types/jquery": "^3.3.29",
     "@types/jsonwebtoken": "^8.3.2",
     "@types/lodash": "^4.14.121",
+    "@types/mobile-detect": "^1.3.4",
     "@types/mongodb": "^3.1.22",
     "@types/mongoose": "^5.3.21",
     "@types/node": "^10.12.30",
+    "@types/nodemailer": "^4.6.6",
     "@types/passport": "^1.0.0",
     "@types/passport-local": "^1.0.33",
     "@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-model": "^1.7.0",
     "@types/prosemirror-schema-basic": "^1.0.1",
@@ -75,12 +87,20 @@
     "@types/typescript": "^2.0.0",
     "@types/uuid": "^3.4.4",
     "@types/webpack": "^4.4.25",
+    "async": "^2.6.2",
     "babel-runtime": "^6.26.0",
     "bcrypt-nodejs": "0.0.3",
     "bluebird": "^3.5.3",
     "body-parser": "^1.18.3",
+<<<<<<< HEAD
     "bootstrap": "^4.3.1",
+=======
+    "connect-flash": "^0.1.1",
+>>>>>>> f70ad315167b714f11f7d68f35a46abe9e525a4d
     "connect-mongo": "^2.0.3",
+    "cookie-parser": "^1.4.4",
+    "cookie-session": "^2.0.0-beta.3",
+    "crypto-browserify": "^3.11.0",
     "express": "^4.16.4",
     "express-flash": "0.0.2",
     "express-session": "^1.15.6",
@@ -94,12 +114,14 @@
     "jsonwebtoken": "^8.5.0",
     "jsx-to-string": "^1.4.0",
     "lodash": "^4.17.11",
+    "mobile-detect": "^1.4.3",
     "mobx": "^5.9.0",
     "mobx-react": "^5.3.5",
     "mobx-react-devtools": "^6.1.1",
     "mongodb": "^3.1.13",
     "mongoose": "^5.4.18",
     "node-sass": "^4.11.0",
+    "nodemailer": "^5.1.1",
     "nodemon": "^1.18.10",
     "normalize.css": "^8.0.1",
     "npm": "^6.9.0",
@@ -137,7 +159,9 @@
     "request": "^2.88.0",
     "socket.io": "^2.2.0",
     "socket.io-client": "^2.2.0",
+    "socketio": "^1.0.0",
     "url-loader": "^1.1.2",
-    "uuid": "^3.3.2"
+    "uuid": "^3.3.2",
+    "xoauth2": "^1.2.0"
   }
 }