From 5dd2dd9f0b2ca13e2e1a44375cc5b7d6606d6b1a Mon Sep 17 00:00:00 2001 From: pierreozoux Date: Wed, 10 Jun 2015 18:23:20 +0100 Subject: [PATCH 1/4] Allows to specify PORT from env on multiplex plugin --- plugin/multiplex/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/multiplex/index.js b/plugin/multiplex/index.js index 6f5d8b11..af058ed2 100644 --- a/plugin/multiplex/index.js +++ b/plugin/multiplex/index.js @@ -9,7 +9,7 @@ var staticDir = express.static; io = io.listen(app); var opts = { - port: 1948, + port: process.env.PORT || 1948, baseDir : __dirname + '/../../' }; From 018ca774061846820b4289c49f0fb6033cb3ef07 Mon Sep 17 00:00:00 2001 From: Jason Karns Date: Tue, 16 Jun 2015 10:39:58 -0400 Subject: [PATCH 2/4] enabling launching presentation with npm-start --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 201c6bf7..4b26ade0 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "main": "js/reveal.js", "scripts": { "test": "grunt test", - "start": "" + "start": "grunt serve" }, "author": { "name": "Hakim El Hattab", From 071a523f423b2484eadf0082850aa172c9a9ad52 Mon Sep 17 00:00:00 2001 From: Jason Karns Date: Tue, 16 Jun 2015 10:43:20 -0400 Subject: [PATCH 3/4] `licenses` field is deprecated the `licenses` field in package.json is deprecated. https://docs.npmjs.com/files/package.json#license The `license` field is the recommended field and expects an SPDX expression. --- package.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 201c6bf7..c55021c7 100644 --- a/package.json +++ b/package.json @@ -40,10 +40,6 @@ "grunt": "~0.4.0", "node-sass": "~0.9.3" }, - "licenses": [ - { - "type": "MIT", - "url": "https://github.com/hakimel/reveal.js/blob/master/LICENSE" - } - ] + + "license": "MIT" } From be91cc61185f5121e55751fffe7596d092eea5d9 Mon Sep 17 00:00:00 2001 From: Jason Karns Date: Sat, 20 Jun 2015 10:04:39 -0400 Subject: [PATCH 4/4] broken html in demo deck --- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index d4adcf6b..869ccb4d 100644 --- a/index.html +++ b/index.html @@ -277,17 +277,17 @@ function linkify( selector ) { - + - + - +
Apples $1 7
Lemonade $2 18
Bread $3 2