This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 576df6d287f7981a72bcedfdbf9533ce5061c5ee Author: Adrien <a.garandel@dralagen.fr> Date: Fri Jul 18 15:03:40 2014 +0200 change jqplot to jqplot-bower who have tags version --- pollen-ui-angular/.bowerrc | 3 ++- pollen-ui-angular/bower.json | 4 ++-- pollen-ui-angular/src/main/webapp/index.html | 14 +++++++------- pollen-ui-angular/src/test/karma.conf.js | 8 +------- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/pollen-ui-angular/.bowerrc b/pollen-ui-angular/.bowerrc index 52e49a3..80c5b33 100644 --- a/pollen-ui-angular/.bowerrc +++ b/pollen-ui-angular/.bowerrc @@ -1,4 +1,5 @@ { - "directory" : "./src/main/webapp/lib" + "directory" : "./src/main/webapp/lib", + "analytics": false } diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index 7261c1b..905062e 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -17,9 +17,9 @@ "angular-animate": "1.2.16", "bootstrap": "3.1.1", "jquery": "2.1.1", - "jqplot": "*", "ckeditor": "4.4.2", - "less": "1.7.3" + "less": "1.7.3", + "jqplot-bower": "1.0.8" }, "devDependencies": { "angular-mocks": "1.2.16" diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 289e79f..e2716f3 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -25,7 +25,7 @@ <meta charset="utf-8" /> <link rel="stylesheet" type="text/css" href="lib/bootstrap/dist/css/bootstrap.min.css" /> - <link rel="stylesheet" type="text/css" href="lib/jqplot/jquery.jqplot.min.css" /> + <link rel="stylesheet" type="text/css" href="lib/jqplot-bower/dist//jquery.jqplot.min.css" /> <!-- TODO : compile less to css $ lessc -x less/style.less css/style.css ou @@ -38,12 +38,12 @@ <script language="javascript" type="text/javascript" src="js/conf.js"></script> <script language="javascript" type="text/javascript" src="lib/jquery/dist/jquery.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/jqplot/jquery.jqplot.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/jqplot/plugins/jqplot.barRenderer.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/jqplot/plugins/jqplot.pieRenderer.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/jqplot/plugins/jqplot.categoryAxisRenderer.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/jqplot/plugins/jqplot.pointLabels.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/jqplot/plugins/jqplot.highlighter.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//jquery.jqplot.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.barRenderer.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.pieRenderer.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.categoryAxisRenderer.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.pointLabels.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.highlighter.min.js"></script> <script language="javascript" type="text/javascript" src="lib/ckeditor/ckeditor.js"></script> diff --git a/pollen-ui-angular/src/test/karma.conf.js b/pollen-ui-angular/src/test/karma.conf.js index 3959745..8c352a3 100644 --- a/pollen-ui-angular/src/test/karma.conf.js +++ b/pollen-ui-angular/src/test/karma.conf.js @@ -17,13 +17,7 @@ module.exports = function(config) { files: [ 'src/main/webapp/js/conf.js.exemple', // fix conf is not defined for controller 'src/main/webapp/lib/jquery/dist/jquery.min.js', - 'src/main/webapp/lib/jqplot/jquery.jqplot.min.js', - 'src/main/webapp/lib/jqplot/plugins/jqplot.barRenderer.min.js', - 'src/main/webapp/lib/jqplot/plugins/jqplot.pieRenderer.min.js', - 'src/main/webapp/lib/jqplot/plugins/jqplot.categoryAxisRenderer.min.js', - 'src/main/webapp/lib/jqplot/plugins/jqplot.pointLabels.min.js', - 'src/main/webapp/lib/jqplot/plugins/jqplot.highlighter.min.js', - 'src/main/webapp/lib/ckeditor/ckeditor.js', + 'src/main/webapp/lib/ckeditor/ckeditor.js', 'src/main/webapp/lib/angular/angular.js', 'src/main/webapp/lib/angular-mocks/angular-mocks.js', 'src/main/webapp/lib/angular-bootstrap/ui-bootstrap-tpls.js', -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.