From 5abf5001a8ccde91fddcab8794dce23441143545 Mon Sep 17 00:00:00 2001 From: Bjoern Kimminich Date: Mon, 21 Dec 2015 23:02:57 +0100 Subject: [PATCH 1/3] ignoring IntelliJ IDEA files --- .gitignore | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a5df3133..e7b4f216 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ +.idea/ +*.iml +*.iws +*.eml +out/ .DS_Store .svn log/*.log @@ -5,4 +10,4 @@ tmp/** node_modules/ .sass-cache css/reveal.min.css -js/reveal.min.js +js/reveal.min.js \ No newline at end of file From de4efa5d194329095f90911101a67c5b5e13922f Mon Sep 17 00:00:00 2001 From: Bjoern Kimminich Date: Mon, 21 Dec 2015 23:17:53 +0100 Subject: [PATCH 2/3] updated to mustache 2.2.1 prevents XSS vulnerability (see https://github.com/janl/mustache.js/pull/388) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 15c84d05..f7035aae 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "dependencies": { "underscore": "~1.8.3", "express": "~4.13.3", - "mustache": "~2.1.3", + "mustache": "~2.2.1", "socket.io": "~1.3.7" }, "devDependencies": { From 4881281ea11f2ecdd927cc8c0c262ddff7354ca3 Mon Sep 17 00:00:00 2001 From: Victor Powell Date: Wed, 6 Jan 2016 13:01:58 -0800 Subject: [PATCH 3/3] Add the grunt-cli as a dependency instead of assuming global grunt. --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7f058f34..fd8e36cb 100644 --- a/package.json +++ b/package.json @@ -22,10 +22,11 @@ "node": "~4.1.1" }, "dependencies": { - "underscore": "~1.8.3", "express": "~4.13.3", + "grunt-cli": "^0.1.13", "mustache": "~2.1.3", - "socket.io": "~1.3.7" + "socket.io": "~1.3.7", + "underscore": "~1.8.3" }, "devDependencies": { "grunt-contrib-qunit": "~0.7.0",