December 2014 - Coselmar-commits - mailman.cloud.codelutin.com

branch develop updated (6de71e0 -> 010bc96)
by codelutin.com scm 15 Dec '14

15 Dec '14

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 6de71e0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 9509ebd Add phone number on user Add comment on document new 010bc96 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop 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 010bc96fa05f31b8335c375decec2b6efe0b9095 Merge: 9509ebd 6de71e0 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Dec 15 11:43:48 2014 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop commit 9509ebd5bf231c32e15797d93ff0b49d4d2f171c Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Dec 15 11:43:19 2014 +0100 Add phone number on user Add comment on document Summary of changes: .../src/main/xmi/coselmar-model.properties | 2 ++ .../src/main/xmi/coselmar-model.zargo | Bin 10090 -> 10252 bytes .../fr/ifremer/coselmar/beans/DocumentBean.java | 24 ++++++++++------ .../java/fr/ifremer/coselmar/beans/UserBean.java | 14 +++++++++- .../fr/ifremer/coselmar/beans/UserSearchBean.java | 4 +-- .../coselmar/converter/BeanEntityConverter.java | 5 +++- .../coselmar/services/v1/DocumentsWebService.java | 4 ++- .../coselmar/services/v1/UsersWebService.java | 31 +++++++++++++++------ .../src/main/webapp/views/documents/document.html | 6 +++- .../webapp/views/documents/modalDocumentEdit.html | 15 +++++++++- .../main/webapp/views/documents/newdocument.html | 18 +++++++++--- .../src/main/webapp/views/users/edituser.html | 10 +++++++ coselmar-ui/src/main/webapp/views/users/user.html | 4 +++ 13 files changed, 109 insertions(+), 28 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (85f7d54 -> 6de71e0)
by codelutin.com scm 11 Dec '14

11 Dec '14

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 85f7d54 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop new f2850dc [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d4e6e90 [jgitflow-maven-plugin]updating poms for branch '0.3.1' with snapshot versions new 6eefb00 [jgitflow-maven-plugin]updating poms for branch'release/0.3.1' with non-snapshot versions new d3b4e61 Merge branch 'release/0.3.1' new 9c9e2fe Merge branch 'master' into develop new 6de71e0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 6de71e0fe66c745b51a2f2fa3dc3c69eacfd3171 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:53:29 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 9c9e2fe0d93cc03b510cc7ecc592e32e8ca748ab Merge: f2850dc d3b4e61 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:53:29 2014 +0000 Merge branch 'master' into develop commit f2850dce387b1800677dac1a435f73a22fbbd2ac Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:53:29 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit d3b4e61a89dda59ad9aacad7204486e9e7bb6a29 Merge: 65c582b 6eefb00 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:53:27 2014 +0000 Merge branch 'release/0.3.1' commit 6eefb00a3e71cbaf15f4baf97eba0cffc7a84292 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:52:41 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.3.1' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch release/0.3.1 deleted (was 6eefb00)
by codelutin.com scm 11 Dec '14

11 Dec '14

This is an automated email from the git hooks/post-receive script. New change to branch release/0.3.1 in repository coselmar. See http://git.codelutin.com/coselmar.git was 6eefb00 [jgitflow-maven-plugin]updating poms for branch'release/0.3.1' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/0.3.1 updated (d4e6e90 -> 6eefb00)
by codelutin.com scm 11 Dec '14

11 Dec '14

This is an automated email from the git hooks/post-receive script. New change to branch release/0.3.1 in repository coselmar. See http://git.codelutin.com/coselmar.git from d4e6e90 [jgitflow-maven-plugin]updating poms for branch '0.3.1' with snapshot versions adds 6eefb00 [jgitflow-maven-plugin]updating poms for branch'release/0.3.1' with non-snapshot versions No new revisions were added by this update. Summary of changes: 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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag coselmar-0.3.1 created (now 0f8462b)
by codelutin.com scm 11 Dec '14

11 Dec '14

This is an automated email from the git hooks/post-receive script. New change to annotated tag coselmar-0.3.1 in repository coselmar. See http://git.codelutin.com/coselmar.git at 0f8462b (tag) tagging d3b4e61a89dda59ad9aacad7204486e9e7bb6a29 (commit) replaces coselmar-0.3 tagged by Maven Release on Thu Dec 11 16:53:28 2014 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 0.3.1 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (65c582b -> d3b4e61)
by codelutin.com scm 11 Dec '14

11 Dec '14

This is an automated email from the git hooks/post-receive script. New change to branch master in repository coselmar. See http://git.codelutin.com/coselmar.git from 65c582b Merge branch 'release/0.3' adds f5c64fb fix bug during document creation adds 956d95b [jgitflow-maven-plugin]updating poms for 0.4-SNAPSHOT development adds 54efcb6 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 12a1af2 Merge branch 'master' into develop adds 09b20ec [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 85f7d54 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds d4e6e90 [jgitflow-maven-plugin]updating poms for branch '0.3.1' with snapshot versions adds 6eefb00 [jgitflow-maven-plugin]updating poms for branch'release/0.3.1' with non-snapshot versions adds d3b4e61 Merge branch 'release/0.3.1' No new revisions were added by this update. Summary of changes: coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Coselmar 0.3.1 released
by codelutin.com Release Notification 11 Dec '14

11 Dec '14

The Coselmar team is pleased to announce the coselmar-0.3.1 release! Documentation of the project can be found here: https://coselmar.codelutin.com Changes ------- Changes in this version include: Fixed Bugs: o Cannot create document from documents page Issue: 6287. Thanks to Yannick Martel. Resolved by ymartel. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/coselmar/files * coselmar-bundle-0.3.1.war - http://forge.codelutin.com/attachments/download/2617 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Coselmar team

1 0

branch release/0.3.1 created (now d4e6e90)
by codelutin.com scm 11 Dec '14

11 Dec '14

This is an automated email from the git hooks/post-receive script. New change to branch release/0.3.1 in repository coselmar. See http://git.codelutin.com/coselmar.git at d4e6e90 [jgitflow-maven-plugin]updating poms for branch '0.3.1' with snapshot versions This branch includes the following new commits: new d4e6e90 [jgitflow-maven-plugin]updating poms for branch '0.3.1' with snapshot versions 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 d4e6e902737949fb22a564ff3a9f1e0bf55b7f9b Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:50:41 2014 +0000 [jgitflow-maven-plugin]updating poms for branch '0.3.1' with snapshot versions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (09b20ec -> 85f7d54)
by codelutin.com scm 11 Dec '14

11 Dec '14

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 09b20ec [jgitflow-maven-plugin]Updating develop poms back to pre merge state new f5c64fb fix bug during document creation new 85f7d54 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop 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 85f7d54ef047bb73fef10fac1e77afeddbb9ab46 Merge: f5c64fb 09b20ec Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Dec 11 17:52:43 2014 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop commit f5c64fb7ac63e3aa08b7d81fdb9ee7d4ee4c6a15 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Dec 11 17:47:43 2014 +0100 fix bug during document creation Summary of changes: coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (956d95b -> 09b20ec)
by codelutin.com scm 11 Dec '14

11 Dec '14

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 956d95b [jgitflow-maven-plugin]updating poms for 0.4-SNAPSHOT development new 54efcb6 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6ff792b fix .gitignore new 028001a prepare release 0.3 new 93d8304 [jgitflow-maven-plugin]updating poms for branch'release/0.3' with non-snapshot versions new 65c582b Merge branch 'release/0.3' new 12a1af2 Merge branch 'master' into develop new 09b20ec [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 09b20ecfe347225ca0977b9f9f1f2b9304c72361 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:18:52 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 12a1af2acac6ab4bc792d6df488647495ac1ff31 Merge: 54efcb6 65c582b Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:18:52 2014 +0000 Merge branch 'master' into develop commit 54efcb6f6fda2347ee8f73a9bede3dcead0b43e9 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:18:51 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 65c582bb43b9502cc83898212435f7de83a5dcda Merge: 6ff792b 93d8304 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:18:50 2014 +0000 Merge branch 'release/0.3' commit 93d8304a1e58d09d0c316a1734331f50e1dbdd53 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:12:52 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.3' with non-snapshot versions commit 028001a8af9d7b80fb69f89401dc6f05babc6359 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:12:38 2014 +0000 prepare release 0.3 Summary of changes: .gitignore | 2 ++ coselmar-persistence/pom.xml | 5 +++++ .../coselmar/persistence/SearchRequestBean.java | 24 ++++++++++++++++++++++ .../persistence/entity/QuestionTopiaDao.java | 24 ++++++++++++++++++++++ .../fr/ifremer/coselmar/beans/QuestionBean.java | 24 ++++++++++++++++++++++ .../coselmar/services/v1/QuestionsWebService.java | 24 ++++++++++++++++++++++ .../main/webapp/js/coselmar-questions-services.js | 23 +++++++++++++++++++++ .../webapp/views/documents/modalDocumentEdit.html | 23 +++++++++++++++++++++ .../views/documents/modalDocumentSearch.html | 23 +++++++++++++++++++++ .../main/webapp/views/questions/closeQuestion.html | 23 +++++++++++++++++++++ .../main/webapp/views/questions/editquestion.html | 23 +++++++++++++++++++++ .../webapp/views/questions/newDocumentsPart.html | 23 +++++++++++++++++++++ .../main/webapp/views/questions/newquestion.html | 23 +++++++++++++++++++++ .../src/main/webapp/views/questions/question.html | 23 +++++++++++++++++++++ .../src/main/webapp/views/questions/questions.html | 23 +++++++++++++++++++++ .../views/questions/viewRestrictedQuestion.html | 23 +++++++++++++++++++++ .../main/webapp/views/questions/viewquestion.html | 23 +++++++++++++++++++++ .../main/webapp/views/referential/referential.html | 23 +++++++++++++++++++++ 18 files changed, 379 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6