branch develop updated (85c2f73 -> bd88c64)
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 85c2f73 [jgitflow-maven-plugin]updating poms for 0.8-SNAPSHOT development new e9a33c6 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new ec8a680 prepare release new bce2bb7 [jgitflow-maven-plugin]updating poms for branch'release/0.7' with non-snapshot versions new c6dc0f8 Merge branch 'release/0.7' new 280abc4 Merge branch 'master' into develop new bd88c64 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 bd88c649cdca3543f4cf3ad3473e0b8597324da6 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 30 14:14:44 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 280abc48c664120fe3852f133e5f2beda683cf97 Merge: e9a33c6 c6dc0f8 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 30 14:14:44 2015 +0000 Merge branch 'master' into develop commit e9a33c6f0c5523e75bc0bb248e9f796393692dca Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 30 14:14:43 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit c6dc0f8be5c326d81e8cf0f78dc4f314f6ad2b77 Merge: 22b6b6a bce2bb7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 30 14:14:42 2015 +0000 Merge branch 'release/0.7' commit bce2bb77ae881002c4a11e6c8546316d5a3536e9 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 30 14:13:28 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.7' with non-snapshot versions commit ec8a680a120edf677153103ab2e0abc69d6b96ea Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 30 14:13:02 2015 +0000 prepare release Summary of changes: .../src/main/webapp/views/users/newPassword.html | 23 ++++++++++++++++++++++ .../src/main/webapp/views/users/searchPart.html | 23 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) -- 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 ec8a680a120edf677153103ab2e0abc69d6b96ea Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 30 14:13:02 2015 +0000 prepare release --- .../src/main/webapp/views/users/newPassword.html | 23 ++++++++++++++++++++++ .../src/main/webapp/views/users/searchPart.html | 23 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/coselmar-ui/src/main/webapp/views/users/newPassword.html b/coselmar-ui/src/main/webapp/views/users/newPassword.html index bb6f23f..faa2d31 100644 --- a/coselmar-ui/src/main/webapp/views/users/newPassword.html +++ b/coselmar-ui/src/main/webapp/views/users/newPassword.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 - 2015 Ifremer, Code Lutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <div class="page-header"> <h2> <!-- Heading goes here --> diff --git a/coselmar-ui/src/main/webapp/views/users/searchPart.html b/coselmar-ui/src/main/webapp/views/users/searchPart.html index 74650d6..915e20f 100644 --- a/coselmar-ui/src/main/webapp/views/users/searchPart.html +++ b/coselmar-ui/src/main/webapp/views/users/searchPart.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 - 2015 Ifremer, Code Lutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <!-- Simple search part --> <div> -- 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 bce2bb77ae881002c4a11e6c8546316d5a3536e9 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 30 14:13:28 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.7' with non-snapshot versions --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index 008ba9a..cfacc4b 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index bb42a95..3427a99 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 94bbebf..2e3d4a7 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index d27dd42..7af1d03 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 16cfb31..8ff5c9c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> <packaging>pom</packaging> <name>Coselmar</name> -- 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 c6dc0f8be5c326d81e8cf0f78dc4f314f6ad2b77 Merge: 22b6b6a bce2bb7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 30 14:14:42 2015 +0000 Merge branch 'release/0.7' coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- .../coselmar/config/CoselmarServicesConfig.java | 4 + .../config/CoselmarServicesConfigOption.java | 5 + .../persistence/entity/CoselmarUserTopiaDao.java | 11 +- coselmar-rest/pom.xml | 2 +- ...erAccountCreatedMail.java => AbstractMail.java} | 33 +-- ...countCreatedMail.java => LostPasswordMail.java} | 46 +--- .../coselmar/beans/UserAccountCreatedMail.java | 40 +--- ...eatedMail.java => UserPasswordChangedMail.java} | 46 +--- .../indexation/DocumentsIndexationService.java | 12 +- .../indexation/QuestionsIndexationService.java | 12 +- .../coselmar/services/v1/DocumentsWebService.java | 40 +++- .../coselmar/services/v1/QuestionsWebService.java | 14 ++ .../coselmar/services/v1/UsersWebService.java | 54 ++++- .../i18n/coselmar-services_en_GB.properties | 4 +- .../i18n/coselmar-services_fr_FR.properties | 4 +- .../main/resources/mail/LostPasswordMail.mustache | 13 + .../resources/mail/LostPasswordMail_fr.mustache | 13 + .../resources/mail/UserAccountCreatedMail.mustache | 4 +- .../mail/UserAccountCreatedMail_fr.mustache | 4 +- .../mail/UserPasswordChangedMail.mustache | 13 + .../mail/UserPasswordChangedMail_fr.mustache | 13 + coselmar-rest/src/main/resources/mapping | 1 + .../coselmar/services/UsersWebServiceTest.java | 23 ++ coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/css/coselmar.css | 266 ++++++++++++++++++++- coselmar-ui/src/main/webapp/i18n/en.js | 93 +++++-- coselmar-ui/src/main/webapp/i18n/fr.js | 101 ++++++-- coselmar-ui/src/main/webapp/img/StatusIcons.png | Bin 0 -> 2005 bytes coselmar-ui/src/main/webapp/img/logo.gif | Bin 0 -> 4274 bytes coselmar-ui/src/main/webapp/index.html | 44 ++-- .../src/main/webapp/js/coselmar-controllers.js | 137 +++++++---- .../src/main/webapp/js/coselmar-user-services.js | 18 +- coselmar-ui/src/main/webapp/js/coselmar.js | 6 +- .../src/main/webapp/views/documents/documents.html | 57 ++--- .../main/webapp/views/documents/editDocument.html | 123 ++++++---- .../webapp/views/documents/modalDocumentEdit.html | 16 +- .../main/webapp/views/documents/newdocument.html | 101 ++++---- .../main/webapp/views/documents/viewDocument.html | 193 +++++++++------ coselmar-ui/src/main/webapp/views/home.html | 25 +- .../main/webapp/views/questions/closeQuestion.html | 17 +- .../main/webapp/views/questions/editquestion.html | 193 ++++++++------- .../views/questions/modalQuestionSearch.html | 2 +- .../main/webapp/views/questions/newquestion.html | 9 +- .../src/main/webapp/views/questions/question.html | 27 ++- .../src/main/webapp/views/questions/questions.html | 101 ++++---- .../main/webapp/views/questions/viewquestion.html | 249 +++++++++---------- .../main/webapp/views/referential/referential.html | 133 ++++++----- .../src/main/webapp/views/users/adminUsers.html | 131 +++------- .../src/main/webapp/views/users/edituser.html | 9 +- .../src/main/webapp/views/users/newPassword.html | 53 ++++ .../src/main/webapp/views/users/newuser.html | 1 + .../src/main/webapp/views/users/searchPart.html | 122 ++++++++++ .../main/webapp/views/users/supervisorUsers.html | 133 +++-------- coselmar-ui/src/main/webapp/views/users/user.html | 2 +- pom.xml | 2 +- 57 files changed, 1694 insertions(+), 1087 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 e9a33c6f0c5523e75bc0bb248e9f796393692dca Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 30 14:14:43 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index 06ca534..cfacc4b 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 257b9c2..3427a99 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 7c98e66..2e3d4a7 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 1252028..7af1d03 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 849a181..8ff5c9c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7</version> <packaging>pom</packaging> <name>Coselmar</name> -- 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 280abc48c664120fe3852f133e5f2beda683cf97 Merge: e9a33c6 c6dc0f8 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 30 14:14:44 2015 +0000 Merge branch 'master' into develop .../src/main/webapp/views/users/newPassword.html | 23 ++++++++++++++++++++++ .../src/main/webapp/views/users/searchPart.html | 23 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) -- 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 bd88c649cdca3543f4cf3ad3473e0b8597324da6 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 30 14:14:44 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index cfacc4b..06ca534 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 3427a99..257b9c2 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 2e3d4a7..7c98e66 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 7af1d03..1252028 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 8ff5c9c..849a181 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm