Merge pull request #56 from javiercejudo/dep-upgrade

Dep upgrade
javiercejudo · Dec 6, 2014 · 042c0db · 042c0db
2 parents e4bf3c1 + 09cfb02
commit 042c0db
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/bower.json b/bower.json
@@ -8,15 +8,15 @@
     "tests"
   ],
   "devDependencies": {
-    "angular-mocks": "1.3.0",
-    "angular-scenario": "1.3.0"
+    "angular-mocks": "1.3.5",
+    "angular-scenario": "1.3.5"
   },
   "dependencies": {
-    "angular": "1.3.0",
-    "angular-route": "1.3.0",
-    "angular-sanitize": "1.3.0",
-    "angular-touch": "1.3.0",
-    "angular-animate": "1.3.0",
+    "angular": "1.3.5",
+    "angular-route": "1.3.5",
+    "angular-sanitize": "1.3.5",
+    "angular-touch": "1.3.5",
+    "angular-animate": "1.3.5",
     "angularfire": "~0.8.2",
     "ngstorage": "~0.3.0",
     "jquery": "~2.1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/gulp-tasks/manifest.js b/gulp-tasks/manifest.js
@@ -13,7 +13,7 @@ gulp.task('manifest', function () {
   fontsURL = assetsURL + '/' + paths.fonts;
 
   Object.keys(revManifest).forEach(function(filename) {
-    assetsRev.push(assetsURL + '/' +revManifest[filename]);
+    assetsRev.push(assetsURL + '/' + revManifest[filename]);
   });
 
   options = {

diff --git a/jcConfig.js b/jcConfig.js
@@ -1,7 +1,7 @@
 var constants, paths;
 
 constants = {
-  ASSETS_URL: '//dxnqhjr6ye2au.cloudfront.net'
+  ASSETS_URL: process.env.ASSETS_URL || 'build'
 };
 
 paths = {