From 76b2ba49547bfc39941a8b4979bec30099c3c167 Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Sat, 30 Jun 2018 15:03:00 +0200 Subject: [PATCH 01/14] Update markdown-pdf Signed-off-by: Sheogorath --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 442d00a77..a031b03bf 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "markdown-it-regexp": "^0.4.0", "markdown-it-sub": "^1.0.0", "markdown-it-sup": "^1.0.0", - "markdown-pdf": "^7.0.0", + "markdown-pdf": "^8.0.0", "mathjax": "~2.7.0", "mermaid": "~7.1.0", "mattermost": "^3.4.0", From d8df6e43427f627b35c910455260a8dfe9bf6cb0 Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Sat, 30 Jun 2018 15:03:17 +0200 Subject: [PATCH 02/14] Update minio Signed-off-by: Sheogorath --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a031b03bf..e12371c79 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "meta-marked": "^0.4.2", "method-override": "^2.3.7", "minimist": "^1.2.0", - "minio": "^3.1.3", + "minio": "^6.0.0", "moment": "^2.17.1", "morgan": "^1.7.0", "mysql": "^2.12.0", From fd3733e7d1faf31906d4599652bf7051ff6e54da Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Sat, 30 Jun 2018 15:03:38 +0200 Subject: [PATCH 03/14] Update password-gitlab2 Signed-off-by: Sheogorath --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e12371c79..721a1cd15 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "passport-dropbox-oauth2": "^1.1.0", "passport-facebook": "^2.1.1", "passport-github": "^1.1.0", - "passport-gitlab2": "^2.2.0", + "passport-gitlab2": "^4.0.0", "passport-google-oauth20": "^1.0.0", "passport-ldapauth": "^0.6.0", "passport-local": "^1.0.0", From f51de7f3bb55d298cfc50a779d6a8d36a0b6667a Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Sat, 30 Jun 2018 15:03:52 +0200 Subject: [PATCH 04/14] Update validator Signed-off-by: Sheogorath --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 721a1cd15..afc037727 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "toobusy-js": "^0.5.1", "uuid": "^3.1.0", "uws": "~0.14.1", - "validator": "^6.2.0", + "validator": "^10.4.0", "velocity-animate": "^1.4.0", "visibilityjs": "^1.2.4", "viz.js": "^1.7.0", From 562985a115cb62cc380dc5905e8e95d2d41c4a0e Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Sat, 30 Jun 2018 15:04:15 +0200 Subject: [PATCH 05/14] Update passport-ldap Signed-off-by: Sheogorath --- lib/web/auth/ldap/index.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/web/auth/ldap/index.js b/lib/web/auth/ldap/index.js index ab1cb4cd4..8d71c18eb 100644 --- a/lib/web/auth/ldap/index.js +++ b/lib/web/auth/ldap/index.js @@ -15,7 +15,7 @@ let ldapAuth = module.exports = Router() passport.use(new LDAPStrategy({ server: { url: config.ldap.url || null, - bindDn: config.ldap.bindDn || null, + bindDN: config.ldap.bindDn || null, bindCredentials: config.ldap.bindCredentials || null, searchBase: config.ldap.searchBase || null, searchFilter: config.ldap.searchFilter || null, diff --git a/package.json b/package.json index afc037727..931385c13 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "passport-github": "^1.1.0", "passport-gitlab2": "^4.0.0", "passport-google-oauth20": "^1.0.0", - "passport-ldapauth": "^0.6.0", + "passport-ldapauth": "^2.0.0", "passport-local": "^1.0.0", "passport-oauth2": "^1.4.0", "passport-twitter": "^1.0.4", From b6e1144627c13b6a8fd7965621bb2a7cbbd72223 Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Sat, 30 Jun 2018 15:08:36 +0200 Subject: [PATCH 06/14] Update to octicon 4.4.0 Signed-off-by: Sheogorath --- package.json | 2 +- public/views/codimd/head.ejs | 2 +- public/views/html.hbs | 2 +- public/views/pretty.ejs | 2 +- public/views/slide.ejs | 2 +- webpackBaseConfig.js | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 931385c13..dc7c377b8 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "morgan": "^1.7.0", "mysql": "^2.12.0", "node-uuid": "^1.4.7", - "octicons": "~3.5.0", + "octicons": "~4.4.0", "passport": "^0.3.2", "passport-dropbox-oauth2": "^1.1.0", "passport-facebook": "^2.1.1", diff --git a/public/views/codimd/head.ejs b/public/views/codimd/head.ejs index 8dfef432d..1f4462538 100644 --- a/public/views/codimd/head.ejs +++ b/public/views/codimd/head.ejs @@ -12,7 +12,7 @@ - + <%- include ../build/index-header %> <%- include ../shared/polyfill %> diff --git a/public/views/html.hbs b/public/views/html.hbs index a300ddd5e..e3d557f95 100644 --- a/public/views/html.hbs +++ b/public/views/html.hbs @@ -18,7 +18,7 @@ - + diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index 395f921b1..885844bc4 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -21,7 +21,7 @@ - + <%- include build/pretty-header %> <%- include shared/polyfill %> diff --git a/public/views/slide.ejs b/public/views/slide.ejs index d9be51f9a..8f66bf5d2 100644 --- a/public/views/slide.ejs +++ b/public/views/slide.ejs @@ -18,7 +18,7 @@ <% if(useCDN) { %> - + <%- include build/slide-header %> diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js index 2c6a56f65..798b64e7c 100644 --- a/webpackBaseConfig.js +++ b/webpackBaseConfig.js @@ -234,7 +234,7 @@ module.exports = { path.join(__dirname, 'node_modules/font-awesome/css/font-awesome.min.css'), path.join(__dirname, 'public/css/bootstrap-social.css'), path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'), - path.join(__dirname, 'node_modules/octicons/octicons/octicons.css') + path.join(__dirname, 'node_modules/octicons/build/octicons.css') ], 'index-pack': [ 'babel-polyfill', @@ -284,7 +284,7 @@ module.exports = { path.join(__dirname, 'node_modules/bootstrap/dist/css/bootstrap.min.css'), path.join(__dirname, 'node_modules/font-awesome/css/font-awesome.min.css'), path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'), - path.join(__dirname, 'node_modules/octicons/octicons/octicons.css') + path.join(__dirname, 'node_modules/octicons/build/octicons.css') ], 'pretty-pack': [ 'babel-polyfill', @@ -321,7 +321,7 @@ module.exports = { 'slide-styles-pack': [ path.join(__dirname, 'node_modules/font-awesome/css/font-awesome.min.css'), path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'), - path.join(__dirname, 'node_modules/octicons/octicons/octicons.css') + path.join(__dirname, 'node_modules/octicons/build/octicons.css') ], 'slide-pack': [ 'babel-polyfill', From 0cebeb68d726fc63b631e61aeff65c3dfb84afcb Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Sat, 30 Jun 2018 15:29:13 +0200 Subject: [PATCH 07/14] Update passport Signed-off-by: Sheogorath --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dc7c377b8..ad9ab202c 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "mysql": "^2.12.0", "node-uuid": "^1.4.7", "octicons": "~4.4.0", - "passport": "^0.3.2", + "passport": "^0.4.0", "passport-dropbox-oauth2": "^1.1.0", "passport-facebook": "^2.1.1", "passport-github": "^1.1.0", From 3f49aee63fd3e27f4ce989a386fba8b21098f063 Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Sat, 30 Jun 2018 15:32:17 +0200 Subject: [PATCH 08/14] Update shortid Signed-off-by: Sheogorath --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad9ab202c..ef1a27ecd 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "select2": "^3.5.2-browserify", "sequelize": "^3.28.0", "sequelize-cli": "^2.5.1", - "shortid": "2.2.6", + "shortid": "2.2.8", "socket.io": "~2.0.4", "socket.io-client": "~2.0.4", "spin.js": "^2.3.2", From 459fe2da07bd72104e10038c8fee3877cb5c728d Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Sat, 30 Jun 2018 15:32:29 +0200 Subject: [PATCH 09/14] Update sqlite Signed-off-by: Sheogorath --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ef1a27ecd..bd9f4e67d 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "socket.io": "~2.0.4", "socket.io-client": "~2.0.4", "spin.js": "^2.3.2", - "sqlite3": "^3.1.8", + "sqlite3": "^4.0.1", "store": "^1.3.20", "string": "^3.3.3", "tedious": "^1.14.0", From 565cdc0197bd76df516204948ab4ec658f0dfc58 Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Sat, 30 Jun 2018 15:32:43 +0200 Subject: [PATCH 10/14] Update xss protection Signed-off-by: Sheogorath --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bd9f4e67d..9bae4f52e 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "visibilityjs": "^1.2.4", "viz.js": "^1.7.0", "winston": "^2.3.0", - "xss": "^0.3.3" + "xss": "^1.0.3" }, "engines": { "node": ">=6.x <10.x" From 1812b1aaca4127e1640f107a7bd3d67f5f5afe47 Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Sat, 30 Jun 2018 15:37:07 +0200 Subject: [PATCH 11/14] Update highlight.js Signed-off-by: Sheogorath --- package.json | 2 +- public/views/codimd/foot.ejs | 2 +- public/views/html.hbs | 2 +- public/views/pretty.ejs | 2 +- public/views/slide.ejs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9bae4f52e..445f2a0fe 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "graceful-fs": "^4.1.11", "handlebars": "^4.0.6", "helmet": "^3.3.0", - "highlight.js": "~9.9.0", + "highlight.js": "~9.12.0", "i18n": "^0.8.3", "imgur": "git+https://github.com/hackmdio/node-imgur.git", "ionicons": "~2.0.1", diff --git a/public/views/codimd/foot.ejs b/public/views/codimd/foot.ejs index 4d73d05f0..000ccb6da 100644 --- a/public/views/codimd/foot.ejs +++ b/public/views/codimd/foot.ejs @@ -14,7 +14,7 @@ - + diff --git a/public/views/html.hbs b/public/views/html.hbs index e3d557f95..a87bf81a0 100644 --- a/public/views/html.hbs +++ b/public/views/html.hbs @@ -20,7 +20,7 @@ - +