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 96c457b251eda8e699b4f04ee3b2cefa9a704bef Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Jun 17 11:43:52 2014 +0200 add ckeditor in bower --- pollen-ui-angular/bower.json | 2 +- pollen-ui-angular/src/main/webapp/index.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index 9f6e529..54f3ce2 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -15,7 +15,7 @@ "angular-translate": "2.0.0", "angular-bootstrap": "0.11.0", "angular-animate": "1.2.16", - "bootstrap": "~3.1.1", + "bootstrap": "3.1.1", "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 e63654b..09fd223 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -36,6 +36,7 @@ <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/jqplot/plugins/jqplot.highlighter.min.js"></script> <script language="javascript" type="text/javascript" src="bower/ckeditor/ckeditor.js"></script> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.