From 50003ad04650f5242dad902fad7637dc6f2b6757 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 1 Aug 2016 12:12:55 +0200 Subject: [PATCH 1/6] c9-auto-bump 3.1.2969 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 83718669..8ac20db2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2968", + "version": "3.1.2969", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 810f3b70921a5847e64569fa2c53bb15a172c382 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 1 Aug 2016 14:29:13 +0200 Subject: [PATCH 2/6] c9-auto-bump 3.1.2970 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8ac20db2..be3604f3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2969", + "version": "3.1.2970", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a45e98ff6aaab20dfcc5a303766bf27a344feb42 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 1 Aug 2016 19:37:06 +0000 Subject: [PATCH 3/6] update cs50 --- integrations/scripts/update.sh | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integrations/scripts/update.sh b/integrations/scripts/update.sh index 61b2b812..75736b92 100755 --- a/integrations/scripts/update.sh +++ b/integrations/scripts/update.sh @@ -5,7 +5,7 @@ cd `dirname $0`/.. # set -x NAME=$1 shift -BRANCH= +BRANCH=master URL= for i in "$@"; do case $i in @@ -56,7 +56,7 @@ popd node -e ' var name = "'$NAME'"; var url = "'$URL'"; - var hash = "'$HASH'" + var hash = "'$HASH'".trim(); var fs = require("fs"); function updateJSON(path, fn) { @@ -81,13 +81,13 @@ node -e ' updateJSON("../package.json", function(package) { var deps = package.dependencies; console.log(deps[name], hash) - deps[name] = deps[name].replace(/#[a-f\d]+$/i, "#" + hash) + deps[name] = deps[name].replace(/#[a-f\d]*$/i, "#" + hash) console.log(deps[name], hash) }); updateJSON("../npm-shrinkwrap.json", function(package) { var deps = package.dependencies; - deps[name].from = deps[name].from.replace(/#[a-f\d]+$/i, "#" + hash); - deps[name].resolved = deps[name].resolved.replace(/#[a-f\d]+$/i, "#" + hash); + deps[name].from = deps[name].from.replace(/#[a-f\d]*$/i, "#" + hash); + deps[name].resolved = deps[name].resolved.replace(/#[a-f\d]*$/i, "#" + hash); }); ' diff --git a/package.json b/package.json index be3604f3..1a4896b7 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "connect": "~2.12.0", "debug": "~0.7.4", "ejs": "~1.0.0", - "emmet": "git://github.com/cloud9ide/emmet-core.git#2ff6dc06ad", + "emmet": "https://github.com/cloud9ide/emmet-core.git#2ff6dc06ad", "engine.io": "1.6.9", "engine.io-client": "1.6.9", "jsonm": "1.0.6", From 6e420a0bc8b0e6c7ccf2bef8836b6d8e2b1d8765 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 2 Aug 2016 10:14:59 +0200 Subject: [PATCH 4/6] c9-auto-bump 3.1.2971 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1a4896b7..9db8831e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2970", + "version": "3.1.2971", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 121b1ddc31e8e22d3ec02a9b997deb30ad5c7a98 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 2 Aug 2016 12:41:39 +0200 Subject: [PATCH 5/6] c9-auto-bump 3.1.2972 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9db8831e..8f577d5d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2971", + "version": "3.1.2972", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2cbf429e2e39098256bd2e769b07be1eaa910c87 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 2 Aug 2016 16:11:45 +0200 Subject: [PATCH 6/6] c9-auto-bump 3.1.2973 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8f577d5d..9c02abd6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2972", + "version": "3.1.2973", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9",