This is an automated email from the git hooks/post-receive script. New commit to branch feature/addBuilder in repository pollen. See http://git.chorem.org/pollen.git commit 8495c4cfc6f6a479b4cfcc8091a2c0ff5775f36c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Jun 16 15:31:18 2014 +0200 fix conflit --- pollen-ui-angular/bower.json | 5 ++- pollen-ui-angular/src/main/webapp/index.html | 65 +++++++++++++++------------- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index 278a446..9f6e529 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -9,14 +9,15 @@ "tests" ], "dependencies": { - "angular-route": "1.2.16", "angular": "1.2.16", + "angular-route": "1.2.16", "angular-resource": "1.2.16", "angular-translate": "2.0.0", "angular-bootstrap": "0.11.0", "angular-animate": "1.2.16", "bootstrap": "~3.1.1", - "jqplot": "*" + "jquery": "2.2.1", + "jqplot": "1.0.8" } } diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 585ad84..e63654b 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -23,37 +23,40 @@ <head> <title>Pollen</title> <meta charset="utf-8" /> - <link href="bower/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/> - <link href="bower/jqplot/jquery.jqplot.min.css" rel="stylesheet"/> - <link rel="stylesheet" href="css/style.css"/> - - <script src="js/conf.js"></script> - - <script src="bower/jquery/dist/jquery.min.js"></script> - <script src="bower/jqplot/jquery.jqplot.min.js"></script> - <script src="bower/jqplot/plugins/jqplot.barRenderer.min.js"></script> - <script src="bower/jqplot/plugins/jqplot.pieRenderer.min.js"></script> - <script src="bower/jqplot/plugins/jqplot.categoryAxisRenderer.min.js"></script> - <script src="bower/jqplot/plugins/jqplot.pointLabels.min.js"></script> - - <script src="bower/angular/angular.min.js"></script> - <script src="bower/angular-route/angular-route.min.js"></script> - <script src="bower/angular-resource/angular-resource.min.js"></script> - <script src="bower/angular-translate/angular-translate.min.js"></script> - <script src="bower/angular-animate/angular-animate.min.js"></script> - <script src="bower/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> - <script src="bower/ckeditor/ckeditor.js"></script> - - <script src="js/app.js"></script> - <script src="js/services.js"></script> - <script src="js/controllers/pollCtrl.js"></script> - <script src="js/controllers/userCtrl.js"></script> - <script src="js/controllers/favoriteListCtrl.js"></script> - <script src="js/controllers/localeCtrl.js"></script> - <script src="js/controllers/alertCtrl.js"></script> - - <script src="i18n/fr.js"></script> - <script src="i18n/en.js"></script> + + <link rel="stylesheet" type="text/css" href="bower/bootstrap/dist/css/bootstrap.min.css" /> + <link rel="stylesheet" type="text/css" href="bower/jqplot/jquery.jqplot.min.css" /> + <link rel="stylesheet" type="text/css" href="css/style.css"/> + + <script language="javascript" type="text/javascript" src="js/conf.js"></script> + + <script language="javascript" type="text/javascript" src="bower/jquery/dist/jquery.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/jqplot/jquery.jqplot.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.barRenderer.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.pieRenderer.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.categoryAxisRenderer.min.js"> </script> + <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.pointLabels.min.js"></script> + + <script language="javascript" type="text/javascript" src="bower/ckeditor/ckeditor.js"></script> + + <script language="javascript" type="text/javascript" src="bower/angular/angular.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/angular-route/angular-route.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/angular-resource/angular-resource.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/angular-translate/angular-translate.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/angular-animate/angular-animate.min.js"></script> + <script language="javascript" type="text/javascript" src="bower/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> + + <script language=javascript" type="text/javascript" src="js/app.js"></script> + <script language=javascript" type="text/javascript" src="js/services.js"></script> + <script language=javascript" type="text/javascript" src="js/controllers/pollCtrl.js"></script> + <script language=javascript" type="text/javascript" src="js/controllers/userCtrl.js"></script> + <script language=javascript" type="text/javascript" src="js/controllers/favoriteListCtrl.js"></script> + <script language=javascript" type="text/javascript" src="js/controllers/localeCtrl.js"></script> + <script language=javascript" type="text/javascript" src="js/controllers/alertCtrl.js"></script> + + <script language=javascript" type="text/javascript" src="i18n/fr.js"></script> + <script language=javascript" type="text/javascript" src="i18n/en.js"></script> + </head> <body> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.