From acad97ce77a8fe34966625ce09b0bf3d0d240da0 Mon Sep 17 00:00:00 2001 From: Kurt Nelson Date: Tue, 4 Nov 2014 14:15:18 -0800 Subject: [PATCH 1/2] Fix broken dependencies --- bower.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bower.json b/bower.json index 4615ea2..a5785d7 100644 --- a/bower.json +++ b/bower.json @@ -2,9 +2,9 @@ "name": "wearscript-playground", "version": "0.0.1", "dependencies": { - "angular": "1.2.14", - "angular-resource": "1.2.14", - "angular-route": "1.2.14", + "angular": "1.2.5", + "angular-resource": "1.2.5", + "angular-route": "1.2.5", "angular-ui-ace": "bower", "angular-logging": "https://gist.github.com/6938531.git", "wearscript-js": "https://github.com/lrvick/wearscript-js.git", @@ -15,8 +15,8 @@ "angular-bootstrap": "~0.10.0", "angular-hammer": "~1.0.3", "angular-ui-utils": "~0.1.1", - "angular-sanitize": "~1.2.15", - "angular-intro.js": "~1.0.2", + "angular-sanitize": "1.2.5", + "angular-intro.js": "1.1.3", "qrcode": "~1.0.1", "angular-qr": "~0.1.4" }, diff --git a/package.json b/package.json index 33d4834..7088d23 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "grunt-concurrent": "~0.4.1", "grunt-contrib-clean": "~0.5.0", "grunt-contrib-coffee": "~0.7.0", - "grunt-contrib-compass": "~0.6.0", + "grunt-contrib-compass": "~1.0.1", "grunt-contrib-concat": "~0.3.0", "grunt-contrib-connect": "~0.5.0", "grunt-contrib-copy": "~0.4.1", From 5002950577d47ae5f85e0547694f5cabdcbfb2a2 Mon Sep 17 00:00:00 2001 From: Kurt Nelson Date: Tue, 4 Nov 2014 15:36:05 -0800 Subject: [PATCH 2/2] Line up ports with example server config --- Gruntfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 72c4b71..579ed23 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -125,7 +125,7 @@ module.exports = function (grunt) { , '/authgh' ] , host: 'localhost' - , port: 4938 + , port: 8080 , https: false , changeOrigin: false , xforward: false @@ -156,7 +156,7 @@ module.exports = function (grunt) { proxies: [ { context: [ '/' ] , host: 'localhost' - , port: 4938 + , port: 8080 , https: false , changeOrigin: false , xforward: false