Merge branch 'master' into webpack-frontend

This commit is contained in:
Yukai Huang
2016-10-11 18:39:15 +08:00
527 changed files with 2584 additions and 601 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "hackmd",
"version": "0.4.4",
"version": "0.4.5",
"description": "Realtime collaborative markdown notes on all platforms.",
"main": "app.js",
"license": "MIT",
@@ -10,26 +10,26 @@
},
"dependencies": {
"async": "^2.0.1",
"blueimp-md5": "^2.3.0",
"blueimp-md5": "^2.4.0",
"body-parser": "^1.15.2",
"bootstrap": "^3.3.7",
"chance": "^1.0.4",
"cheerio": "^0.20.0",
"cheerio": "^0.22.0",
"compression": "^1.6.2",
"connect-session-sequelize": "^3.1.0",
"connect-session-sequelize": "^3.2.0",
"cookie": "0.3.1",
"cookie-parser": "1.4.3",
"diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git",
"ejs": "^2.5.1",
"ejs": "^2.5.2",
"emojify.js": "^1.1.0",
"express": ">=4.14",
"express-session": "^1.14.0",
"express-session": "^1.14.1",
"file-saver": "^1.3.3",
"flowchart.js": "^1.6.3",
"formidable": "^1.0.17",
"gist-embed": "github:yukaii/gist-embed",
"handlebars": "^4.0.5",
"helmet": "^2.1.2",
"helmet": "^2.3.0",
"highlight.js": "^9.7.0",
"i18n": "^0.8.3",
"imgur": "git+https://github.com/hackmdio/node-imgur.git",
@@ -44,9 +44,10 @@
"jsdom-nogyp": "^0.8.3",
"keymaster": "^1.6.2",
"list.js": "^1.2.0",
"list.pagination.js": "^0.1.1",
"lodash": "^4.16.4",
"lz-string": "1.4.4",
"markdown-it": "^7.0.1",
"markdown-it": "^8.0.0",
"markdown-it-abbr": "^1.0.4",
"markdown-it-container": "^2.0.0",
"markdown-it-deflist": "^2.0.1",
@@ -59,9 +60,9 @@
"markdown-it-sub": "^1.0.0",
"markdown-it-sup": "^1.0.0",
"markdown-pdf": "^7.0.0",
"meta-marked": "^0.4.1",
"meta-marked": "^0.4.2",
"method-override": "^2.3.6",
"moment": "^2.14.1",
"moment": "^2.15.1",
"morgan": "^1.7.0",
"mysql": "^2.11.1",
"node-uuid": "^1.4.7",
@@ -74,19 +75,19 @@
"passport-twitter": "^1.0.4",
"passport.socketio": "^3.6.2",
"pdfobject": "^2.0.201604172",
"pg": "^6.0.3",
"pg": "^6.1.0",
"pg-hstore": "^2.3.2",
"prismjs": "^1.5.1",
"randomcolor": "^0.4.4",
"raphael": "github:dmitrybaranovskiy/raphael",
"request": "^2.74.0",
"request": "^2.75.0",
"reveal.js": "3.3.0",
"sequelize": "^3.23.6",
"sequelize": "^3.24.3",
"sequelize-cli": "^2.4.0",
"shortid": "2.2.6",
"socket.io": "1.4.8",
"socket.io": "1.5.0",
"socket.io-client": "^1.4.8",
"sqlite3": "^3.1.4",
"sqlite3": "^3.1.6",
"store": "^1.3.20",
"string": "^3.3.1",
"tedious": "^1.14.0",