status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade all dependencies and fixes afterward issues

This commit is contained in:
Wu Cheng-Han 2016-01-19 09:57:58 -06:00
parent 4073909b16
commit 96931e6e3a
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bower.json
View File

@ -25,12 +25,12 @@
"gsap": "greensock#~1.18.0", "gsap": "greensock#~1.18.0",
"jquery-mousewheel": "~3.1.13", "jquery-mousewheel": "~3.1.13",
"spin.js": "~2.3.2", "spin.js": "~2.3.2",
"moment": "~2.10.6", "moment": "~2.11.1",
"handlebars": "~4.0.5", "handlebars": "~4.0.5",
"js-url": "~2.0.2", "js-url": "~2.1.0",
"socket.io-client": "~1.3.7", "socket.io-client": "~1.4.4",
"viz.js": "~1.3.0", "viz.js": "~1.3.0",
"js-yaml": "~3.4.6", "js-yaml": "~3.5.2",
"to-markdown": "~1.3.0", "to-markdown": "~1.3.0",
"lz-string": "~1.4.4" "lz-string": "~1.4.4"
} }

2
lib/user.js
View File

@ -1,7 +1,7 @@
//user //user
//external modules //external modules
var mongoose = require('mongoose'); var mongoose = require('mongoose');
var md5 = require("blueimp-md5").md5; var md5 = require("md5");
//core //core
var config = require("../config.js"); var config = require("../config.js");

22
package.json
View File

@ -7,22 +7,22 @@
"private": true, "private": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"async": "^1.5.0", "async": "^1.5.2",
"blueimp-md5": "^1.1.1", "blueimp-md5": "^2.1.0",
"body-parser": "^1.14.1", "body-parser": "^1.14.2",
"chance": "^0.8.0", "chance": "^0.8.0",
"cheerio": "^0.19.0", "cheerio": "^0.19.0",
"compression": "^1.6.0", "compression": "^1.6.0",
"connect-mongo": "^0.8.2", "connect-mongo": "^1.1.0",
"kerberos": "0.0.17", "kerberos": "0.0.17",
"cookie": "0.2.3", "cookie": "0.2.3",
"cookie-parser": "1.4.0", "cookie-parser": "1.4.1",
"ejs": "^2.3.4", "ejs": "^2.3.4",
"emojify.js": "^1.1.0", "emojify.js": "^1.1.0",
"express": ">=4.13", "express": ">=4.13",
"express-session": "^1.12.1", "express-session": "^1.13.0",
"formidable": "^1.0.17", "formidable": "^1.0.17",
"highlight.js": "^9.0.0", "highlight.js": "^9.1.0",
"imgur": "^0.1.7", "imgur": "^0.1.7",
"jsdom-nogyp": "^0.8.3", "jsdom-nogyp": "^0.8.3",
"lz-string": "1.4.4", "lz-string": "1.4.4",
@ -30,8 +30,8 @@
"marked": "^0.3.5", "marked": "^0.3.5",
"meta-marked": "^0.4.0", "meta-marked": "^0.4.0",
"method-override": "^2.3.5", "method-override": "^2.3.5",
"moment": "^2.10.6", "moment": "^2.11.1",
"mongoose": "^4.3.1", "mongoose": "^4.3.6",
"morgan": "^1.6.1", "morgan": "^1.6.1",
"node-uuid": "^1.4.7", "node-uuid": "^1.4.7",
"passport": "^0.3.2", "passport": "^0.3.2",
@ -41,9 +41,9 @@
"passport-twitter": "^1.0.3", "passport-twitter": "^1.0.3",
"passport.socketio": "^3.6.1", "passport.socketio": "^3.6.1",
"pg": "4.x", "pg": "4.x",
"randomcolor": "^0.4.2", "randomcolor": "^0.4.3",
"shortid": "2.2.4", "shortid": "2.2.4",
"socket.io": "1.3.7", "socket.io": "1.4.4",
"string": "^3.3.1", "string": "^3.3.1",
"toobusy-js": "^0.4.2", "toobusy-js": "^0.4.2",
"winston": "^2.1.1", "winston": "^2.1.1",

2
public/js/index.js
View File

@ -1195,6 +1195,8 @@ socket.on('connect', function (data) {
personalInfo['id'] = socket.id; personalInfo['id'] = socket.id;
showStatus(statusType.connected); showStatus(statusType.connected);
socket.emit('version'); socket.emit('version');
if (socket.id.indexOf('/') == -1)
socket.id = socket.nsp + '#' + socket.id;
}); });
socket.on('version', function (data) { socket.on('version', function (data) {
if (data != version) if (data != version)