branch develop updated (010abb8 -> afc6184)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 010abb8 manage error from servers new afc6184 use webjars instead of nuiton-js The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit afc618447a6cfb2225f5dd768065c0853b267905 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 17 09:39:48 2014 +0100 use webjars instead of nuiton-js Summary of changes: coselmar-ui/pom.xml | 37 +++++++++++----------------------- coselmar-ui/src/main/webapp/index.html | 18 ++++++++--------- 2 files changed, 21 insertions(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit afc618447a6cfb2225f5dd768065c0853b267905 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 17 09:39:48 2014 +0100 use webjars instead of nuiton-js --- coselmar-ui/pom.xml | 37 +++++++++++----------------------- coselmar-ui/src/main/webapp/index.html | 18 ++++++++--------- 2 files changed, 21 insertions(+), 34 deletions(-) diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 41ee670..5c72446 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -38,45 +38,32 @@ <description>Coselmar UI module</description> <dependencies> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-wro</artifactId> - <version>1.0.3</version> - <scope>runtime</scope> - </dependency> <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angularjs</artifactId> - <version>1.3.2-1</version> + <groupId>org.webjars</groupId> + <artifactId>angularjs</artifactId> + <version>1.3.6</version> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-bootstrap</artifactId> - <version>3.2.0-1</version> + <groupId>org.webjars</groupId> + <artifactId>bootstrap</artifactId> + <version>3.3.1</version> <scope>runtime</scope> </dependency> - <!--<dependency>--> - <!--<groupId>org.nuiton.js</groupId>--> - <!--<artifactId>nuiton-js-angular-ui-bootstrap</artifactId>--> - <!--<version>0.11.0-2</version>--> - <!--<scope>runtime</scope>--> - <!--</dependency>--> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery</artifactId> - <version>2.1.1-1</version> + <groupId>org.webjars</groupId> + <artifactId>jquery</artifactId> + <version>2.1.1</version> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-font-awesome</artifactId> - <version>4.2.0-1</version> + <groupId>org.webjars</groupId> + <artifactId>font-awesome</artifactId> + <version>4.2.0</version> <scope>runtime</scope> </dependency> diff --git a/coselmar-ui/src/main/webapp/index.html b/coselmar-ui/src/main/webapp/index.html index e511ed8..5f08ce1 100644 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@ -24,17 +24,17 @@ <html ng-app="coselmarApp" ng-controller="HomeCtrl"> <head> - <link rel="stylesheet" href="nuiton-js/bootstrap.css"> - <link rel="stylesheet" href="nuiton-js/font-awesome.css"> + <link rel="stylesheet" href="webjars/bootstrap/3.3.1/css/bootstrap.css"> + <link rel="stylesheet" href="webjars/font-awesome/4.2.0/css/font-awesome.css"> <link rel="stylesheet" href="css/coselmar.css"> - <script src="nuiton-js/jquery.js"></script> - <script src="nuiton-js/angular.js"></script> - <script src="nuiton-js/angular-route.js"></script> - <script src="nuiton-js/angular-resource.js"></script> - <script src="nuiton-js/angular.js"></script> - <script src="nuiton-js/angular-messages.js"></script> + + <script src="webjars/jquery/2.1.1/jquery.js"></script> + <script src="webjars/angularjs/1.3.6/angular.js"></script> + <script src="webjars/angularjs/1.3.6/angular-route.js"></script> + <script src="webjars/angularjs/1.3.6/angular-resource.js"></script> + <script src="webjars/angularjs/1.3.6/angular-messages.js"></script> <!--<script src="nuiton-js/angular-ui-bootstrap.js"></script>--> - <script src="nuiton-js/bootstrap.js"></script> + <script src="webjars/bootstrap/3.3.1/js/bootstrap.js"></script> <!--TODO ymartel 20141203 : extract version, or use wro --> <script src="webjars/angular-ui-select/0.9.0/select.js"></script> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm