Upgrade all dependencies and fixes afterward issues

4 files changed, 18 insertions, 16 deletions

diff --git a/bower.json b/bower.json
index a68755e5..6505d091 100644
--- a/bower.json
+++ b/bower.json
@@ -25,12 +25,12 @@
     "gsap": "greensock#~1.18.0",
     "jquery-mousewheel": "~3.1.13",
     "spin.js": "~2.3.2",
-    "moment": "~2.10.6",
+    "moment": "~2.11.1",
     "handlebars": "~4.0.5",
-    "js-url": "~2.0.2",
-    "socket.io-client": "~1.3.7",
+    "js-url": "~2.1.0",
+    "socket.io-client": "~1.4.4",
     "viz.js": "~1.3.0",
-    "js-yaml": "~3.4.6",
+    "js-yaml": "~3.5.2",
     "to-markdown": "~1.3.0",
     "lz-string": "~1.4.4"
   }
diff --git a/lib/user.js b/lib/user.js
index b3fae39c..639d66c3 100644
--- a/lib/user.js
+++ b/lib/user.js
@@ -1,7 +1,7 @@
 //user
 //external modules
 var mongoose = require('mongoose');
-var md5 = require("blueimp-md5").md5;
+var md5 = require("md5");
 
 //core
 var config = require("../config.js");
diff --git a/package.json b/package.json
index 1238ff35..9cd41567 100644
--- a/package.json
+++ b/package.json
@@ -7,22 +7,22 @@
   "private": true,
   "license": "MIT",
   "dependencies": {
-    "async": "^1.5.0",
-    "blueimp-md5": "^1.1.1",
-    "body-parser": "^1.14.1",
+    "async": "^1.5.2",
+    "blueimp-md5": "^2.1.0",
+    "body-parser": "^1.14.2",
     "chance": "^0.8.0",
     "cheerio": "^0.19.0",
     "compression": "^1.6.0",
-    "connect-mongo": "^0.8.2",
+    "connect-mongo": "^1.1.0",
     "kerberos": "0.0.17",
     "cookie": "0.2.3",
-    "cookie-parser": "1.4.0",
+    "cookie-parser": "1.4.1",
     "ejs": "^2.3.4",
     "emojify.js": "^1.1.0",
     "express": ">=4.13",
-    "express-session": "^1.12.1",
+    "express-session": "^1.13.0",
     "formidable": "^1.0.17",
-    "highlight.js": "^9.0.0",
+    "highlight.js": "^9.1.0",
     "imgur": "^0.1.7",
     "jsdom-nogyp": "^0.8.3",
     "lz-string": "1.4.4",
@@ -30,8 +30,8 @@
     "marked": "^0.3.5",
     "meta-marked": "^0.4.0",
     "method-override": "^2.3.5",
-    "moment": "^2.10.6",
-    "mongoose": "^4.3.1",
+    "moment": "^2.11.1",
+    "mongoose": "^4.3.6",
     "morgan": "^1.6.1",
     "node-uuid": "^1.4.7",
     "passport": "^0.3.2",
@@ -41,9 +41,9 @@
     "passport-twitter": "^1.0.3",
     "passport.socketio": "^3.6.1",
     "pg": "4.x",
-    "randomcolor": "^0.4.2",
+    "randomcolor": "^0.4.3",
     "shortid": "2.2.4",
-    "socket.io": "1.3.7",
+    "socket.io": "1.4.4",
     "string": "^3.3.1",
     "toobusy-js": "^0.4.2",
     "winston": "^2.1.1",
diff --git a/public/js/index.js b/public/js/index.js
index c35c2c38..46e46f22 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -1195,6 +1195,8 @@ socket.on('connect', function (data) {
     personalInfo['id'] = socket.id;
     showStatus(statusType.connected);
     socket.emit('version');
+    if (socket.id.indexOf('/') == -1)
+        socket.id = socket.nsp + '#' + socket.id;
 });
 socket.on('version', function (data) {
     if (data != version)