You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/04/09 00:22:00 UTC
[34/43] git commit: fix grunt file reference to intro.js
fix grunt file reference to intro.js
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f5a7830d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f5a7830d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f5a7830d
Branch: refs/pull/96/merge
Commit: f5a7830df1b67ebfeb61ee18e6f76d7b99715a25
Parents: ded28e5
Author: Shawn Feldman <sh...@gmail.com>
Authored: Tue Apr 8 13:45:06 2014 -0600
Committer: Shawn Feldman <sh...@gmail.com>
Committed: Tue Apr 8 13:45:06 2014 -0600
----------------------------------------------------------------------
portal/Gruntfile.js | 6 +++---
portal/bower.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f5a7830d/portal/Gruntfile.js
----------------------------------------------------------------------
diff --git a/portal/Gruntfile.js b/portal/Gruntfile.js
index 63d61ce..bf2e071 100644
--- a/portal/Gruntfile.js
+++ b/portal/Gruntfile.js
@@ -45,8 +45,8 @@ module.exports = function (grunt) {
'js/libs/ui-bootstrap/ui-bootstrap-custom-tpls-0.3.0.min.js',
'js/libs/jqueryui/jquery-ui-1.8.18.min.js',
'js/libs/jqueryui/date.min.js',
- 'bower_components/angular-intro.js/angular-intro.js',
- 'bower_components/intro.js/minified/intro.min.js'
+ 'bower_components/intro.js/minified/intro.min.js',
+ 'bower_components/angular-intro.js/src/angular-intro.js',
]
}
},
@@ -403,7 +403,7 @@ module.exports = function (grunt) {
grunt.registerTask('build-dev', [ 'ngtemplates','uglify:usergrid-dev','uglify:usergrid', 'cssmin','dom_munger','karma:unit']);
grunt.registerTask('build-coverage', [ 'ngtemplates','instrument','uglify:usergrid-coverage','uglify:usergrid-coverage-min', 'cssmin','dom_munger', 'copy:coverage']);
- grunt.registerTask('default', ['build','karma:unit']);
+ grunt.registerTask('default', ['build']);
grunt.registerTask('e2e', ['connect:e2e-phantom','protractor:phantom']);
grunt.registerTask('e2e-chrome', ['connect:e2e-chrome','protractor:chrome']);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f5a7830d/portal/bower.json
----------------------------------------------------------------------
diff --git a/portal/bower.json b/portal/bower.json
index f032249..4561fab 100644
--- a/portal/bower.json
+++ b/portal/bower.json
@@ -23,7 +23,7 @@
"dependencies": {
"angularitics": "~0.8.7",
"apigee-sdk": "~2.0.8",
- "angular-intro.js": "*",
+ "angular-intro.js": "1.0.3",
"sizzle":"1.10.16"
},
"devDependencies": {},