branch develop updated (e3064f3 -> 1965ef8)
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 discards e3064f3 Upgrade de librairies côté front discards 67eac51 R7299 Liste fixe des départments, filtrés par le territoire de l'utilisateur, dans l'ajout de communes adhérentes à une collectivité discards 8500e90 Remove james.bond@mi6.org from placeholders new 8cac082 Remove james.bond@mi6.org from placeholders new 1965ef8 Upgrade de librairies côté front This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e3064f3) \ N -- N -- N refs/heads/develop (1965ef8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 2 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 1965ef82c4e93c3d173930dcdc2ca601d164ff06 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 2 17:26:21 2015 +0100 Upgrade de librairies côté front commit 8cac0829b5bf4c70cedc71057276c54a388350c9 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Wed Dec 2 10:35:03 2015 +0100 Remove james.bond@mi6.org from placeholders Summary of changes: .../ifremer/coselmar/persistence/FixedH2Dialect.java | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/FixedH2Dialect.java -- 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 8cac0829b5bf4c70cedc71057276c54a388350c9 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Wed Dec 2 10:35:03 2015 +0100 Remove james.bond@mi6.org from placeholders --- coselmar-ui/src/main/webapp/views/users/newPassword.html | 2 +- coselmar-ui/src/main/webapp/views/users/searchPart.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coselmar-ui/src/main/webapp/views/users/newPassword.html b/coselmar-ui/src/main/webapp/views/users/newPassword.html index f97b6e5..82fee7f 100644 --- a/coselmar-ui/src/main/webapp/views/users/newPassword.html +++ b/coselmar-ui/src/main/webapp/views/users/newPassword.html @@ -41,7 +41,7 @@ <label class="control-label">{{ 'user.message.enterMail' | translate }}</label> <input type="email" class="form-control" name="mail" - placeholder="james.bond@mi6.org" ng-model="mail" required/> + placeholder="nom@ifremer.fr" ng-model="mail" required/> </div> diff --git a/coselmar-ui/src/main/webapp/views/users/searchPart.html b/coselmar-ui/src/main/webapp/views/users/searchPart.html index bd65cfc..f972776 100644 --- a/coselmar-ui/src/main/webapp/views/users/searchPart.html +++ b/coselmar-ui/src/main/webapp/views/users/searchPart.html @@ -66,17 +66,17 @@ <label class="col-md-1 control-label">{{ 'user.metadata.name' | translate }}</label> <div class="col-md-2"> - <input class="form-control" type="search" class="form-control" placeholder="Bond" ng-model="example.name" /> + <input class="form-control" type="search" class="form-control" placeholder="Nom" ng-model="example.name" /> </div> <label class="col-md-1 control-label">{{ 'user.metadata.firstName' | translate }}</label> <div class="col-md-2"> - <input class="form-control" type="search" class="form-control" placeholder="James" ng-model="example.firstName" /> + <input class="form-control" type="search" class="form-control" placeholder="Prénom" ng-model="example.firstName" /> </div> <label class="col-md-1 control-label">{{ 'user.metadata.mail' | translate }}</label> <div class="col-md-2"> - <input class="form-control" type="search" class="form-control" placeholder="james.bond@mi6.org" ng-model="example.mail" /> + <input class="form-control" type="search" class="form-control" placeholder="nom@ifremer.fr" ng-model="example.mail" /> </div> <label class="col-md-1 control-label">{{ 'user.metadata.role' | translate }}</label> -- 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 1965ef82c4e93c3d173930dcdc2ca601d164ff06 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 2 17:26:21 2015 +0100 Upgrade de librairies côté front --- coselmar-ui/src/main/webapp/index.html | 32 ++++++++++++++++---------------- pom.xml | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/coselmar-ui/src/main/webapp/index.html b/coselmar-ui/src/main/webapp/index.html index cb067b3..f5e6678 100644 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@ -27,29 +27,29 @@ <meta charset="utf-8" /> <title>Coselmar {{ 'application.title' | translate}}</title> - <link rel="stylesheet" href="webjars/angular-notify/2.0.2/angular-notify.min.css"> - <link rel="stylesheet" href="webjars/bootstrap/3.3.2/css/bootstrap.css"> - <link rel="stylesheet" href="webjars/font-awesome/4.3.0/css/font-awesome.css"> + <link rel="stylesheet" href="webjars/angular-notify/2.5.0/angular-notify.min.css"> + <link rel="stylesheet" href="webjars/bootstrap/3.3.6/css/bootstrap.css"> + <link rel="stylesheet" href="webjars/font-awesome/4.5.0/css/font-awesome.css"> <link rel="stylesheet" href="css/coselmar.css"> - <script src="webjars/jquery/2.1.3/jquery.js"></script> - <script src="webjars/angularjs/1.3.13/angular.js"></script> - <script src="webjars/angularjs/1.3.13/angular-route.js"></script> - <script src="webjars/angularjs/1.3.13/angular-resource.js"></script> - <script src="webjars/angularjs/1.3.13/angular-messages.js"></script> - <script src="webjars/angularjs/1.3.13/angular-animate.js"></script> + <script src="webjars/jquery/2.1.4/jquery.js"></script> + <script src="webjars/angularjs/1.4.8/angular.js"></script> + <script src="webjars/angularjs/1.4.8/angular-route.js"></script> + <script src="webjars/angularjs/1.4.8/angular-resource.js"></script> + <script src="webjars/angularjs/1.4.8/angular-messages.js"></script> + <script src="webjars/angularjs/1.4.8/angular-animate.js"></script> <!--<script src="nuiton-js/angular-ui-bootstrap.js"></script>--> - <script src="webjars/bootstrap/3.3.2/js/bootstrap.js"></script> - <script src="webjars/angular-translate/2.6.0/angular-translate.js"></script> + <script src="webjars/bootstrap/3.3.6/js/bootstrap.js"></script> + <script src="webjars/angular-translate/2.7.2/angular-translate.js"></script> <script src="webjars/angular-dynamic-locale/0.1.27/src/tmhDynamicLocale.js"></script> - <script src="webjars/angular-notify/2.0.2/angular-notify.min.js"></script> + <script src="webjars/angular-notify/2.5.0/angular-notify.min.js"></script> - <script src="webjars/angular-ui-select/0.9.6/select.js"></script> - <link rel="stylesheet" href="webjars/angular-ui-select/0.9.6/select.css"> - <script src="webjars/angular-ui-bootstrap/0.12.0/ui-bootstrap.js"></script> - <script src="webjars/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.js"></script> + <script src="webjars/angular-ui-select/0.13.1/select.js"></script> + <link rel="stylesheet" href="webjars/angular-ui-select/0.13.1/select.css"> + <script src="webjars/angular-ui-bootstrap/0.14.3/ui-bootstrap.js"></script> + <script src="webjars/angular-ui-bootstrap/0.14.3/ui-bootstrap-tpls.js"></script> <script src="js/angular-jwt.js"></script> <script src="i18n/en.js"></script> diff --git a/pom.xml b/pom.xml index 7fde07a..611b532 100644 --- a/pom.xml +++ b/pom.xml @@ -142,15 +142,15 @@ <tomcatEmbedVersion>7.0.50</tomcatEmbedVersion> - <angularVersion>1.3.13</angularVersion> - <bootstrapVersion>3.3.2</bootstrapVersion> - <angularUiSelectVersion>0.9.6</angularUiSelectVersion> - <angularUiBootstrapVersion>0.12.0</angularUiBootstrapVersion> - <angularTranslateVersion>2.6.0</angularTranslateVersion> + <angularVersion>1.4.8</angularVersion> + <bootstrapVersion>3.3.6</bootstrapVersion> + <angularUiSelectVersion>0.13.1</angularUiSelectVersion> + <angularUiBootstrapVersion>0.14.3</angularUiBootstrapVersion> + <angularTranslateVersion>2.7.2</angularTranslateVersion> <angularDynamicLocaleVersion>0.1.27</angularDynamicLocaleVersion> - <angularNotifyVersion>2.0.2</angularNotifyVersion> - <jqueryVersion>2.1.3</jqueryVersion> - <fontAwesomeVersion>4.3.0-1</fontAwesomeVersion> + <angularNotifyVersion>2.5.0</angularNotifyVersion> + <jqueryVersion>2.1.4</jqueryVersion> + <fontAwesomeVersion>4.5.0</fontAwesomeVersion> <java-jwt.version>2.1.0</java-jwt.version> <gson.version>2.5</gson.version> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm