January 2015 - Coselmar-commits - mailman.cloud.codelutin.com

branch develop updated (a6fe9d1 -> 18e9db9)
by codelutin.com scm Jan. 27, 2015

Jan. 27, 2015

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 a6fe9d1 fixes #6502 : Change menu order new efe50d4 create some predefined document types new d844843 manage new predefined document type new a34520d fixes #6431 Merge branch 'feature/6431-document-type-as-defined-list' into develop new 18e9db9 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop The 4 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 18e9db9dee9b09f36e6e2bb2e5b77e809330ced7 Merge: a34520d a6fe9d1 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Jan 27 14:52:24 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop commit a34520d3956c9a7b7469953ef719e8a32a6ea83e Merge: 93c275a d844843 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Jan 27 14:51:41 2015 +0100 fixes #6431 Merge branch 'feature/6431-document-type-as-defined-list' into develop commit d8448436787384f0c3cd4626ce52bbb889e5f284 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Jan 27 14:51:32 2015 +0100 manage new predefined document type commit efe50d4f2ac976cdb9e9e9f667fb96cab5a89eec Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Jan 26 17:53:02 2015 +0100 create some predefined document types Summary of changes: coselmar-ui/src/main/webapp/i18n/en.js | 14 ++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 14 ++++++++++++++ coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 4 ++-- .../src/main/webapp/views/documents/editDocument.html | 16 ++++++++++++++-- .../main/webapp/views/documents/modalDocumentEdit.html | 16 ++++++++++++++-- .../src/main/webapp/views/documents/newdocument.html | 16 ++++++++++++++-- .../src/main/webapp/views/documents/viewDocument.html | 16 ++++++++++++++-- 7 files changed, 86 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (93c275a -> a6fe9d1)
by codelutin.com scm Jan. 27, 2015

Jan. 27, 2015

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 93c275a [jgitflow-maven-plugin]Updating develop poms back to pre merge state new a6fe9d1 fixes #6502 : Change menu order 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 a6fe9d14df67e24cc9304cf6a87526f729c4f190 Author: Léo Kaufmann <kaufmann(a)codelutin.com> Date: Tue Jan 27 14:28:49 2015 +0100 fixes #6502 : Change menu order Summary of changes: coselmar-ui/src/main/webapp/index.html | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch release/0.6 deleted (was 03ab385)
by codelutin.com scm Jan. 26, 2015

Jan. 26, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/0.6 in repository coselmar. See http://git.codelutin.com/coselmar.git was 03ab385 [jgitflow-maven-plugin]updating poms for branch'release/0.6' 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

annotated tag coselmar-0.6 created (now 70adecd)
by codelutin.com scm Jan. 26, 2015

Jan. 26, 2015

This is an automated email from the git hooks/post-receive script. New change to annotated tag coselmar-0.6 in repository coselmar. See http://git.codelutin.com/coselmar.git at 70adecd (tag) tagging 22b6b6a3d45c31b9669561fcb9cc7ec660b4b45f (commit) replaces coselmar-0.5 tagged by Maven Release on Mon Jan 26 09:33:19 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 0.6 ----------------------------------------------------------------------- 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 release/0.6 updated (20f1407 -> 03ab385)
by codelutin.com scm Jan. 26, 2015

Jan. 26, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/0.6 in repository coselmar. See http://git.codelutin.com/coselmar.git from 20f1407 fix bundle module javascript constants... adds b42365b Prepare release adds 03ab385 [jgitflow-maven-plugin]updating poms for branch'release/0.6' 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 +- .../src/test/java/fr/ifremer/DocumentDaoTest.java | 24 ++++++++++++++++++++++ coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/i18n/en.js | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 23 +++++++++++++++++++++ .../main/webapp/views/documents/editDocument.html | 23 +++++++++++++++++++++ .../main/webapp/views/documents/viewDocument.html | 23 +++++++++++++++++++++ .../main/webapp/views/users/supervisorUsers.html | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/views/users/users.html | 23 +++++++++++++++++++++ pom.xml | 4 ++-- 12 files changed, 168 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (bacd44c -> 93c275a)
by codelutin.com scm Jan. 26, 2015

Jan. 26, 2015

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 bacd44c [jgitflow-maven-plugin]updating poms for 0.7-SNAPSHOT development new e01e771 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new b42365b Prepare release new 03ab385 [jgitflow-maven-plugin]updating poms for branch'release/0.6' with non-snapshot versions new 22b6b6a Merge branch 'release/0.6' new 0a52409 Merge branch 'master' into develop new 93c275a [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 93c275a45bb94935240e47edaa5e35b675f867d8 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 26 09:33:20 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 0a52409996a06fce65caca808824073e80bbb868 Merge: e01e771 22b6b6a Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 26 09:33:20 2015 +0000 Merge branch 'master' into develop commit e01e771259b10fdb80892ff9c7cf73846a84ca17 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 26 09:33:20 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 22b6b6a3d45c31b9669561fcb9cc7ec660b4b45f Merge: 12c71d0 03ab385 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 26 09:33:19 2015 +0000 Merge branch 'release/0.6' commit 03ab3850dab484f314f990aeb756dca430a2c378 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 26 09:31:36 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.6' with non-snapshot versions commit b42365bec824bc1cdfc29b6096fd670fdc1b1242 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 26 09:31:19 2015 +0000 Prepare release Summary of changes: .../src/test/java/fr/ifremer/DocumentDaoTest.java | 24 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/i18n/en.js | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 23 +++++++++++++++++++++ .../main/webapp/views/documents/editDocument.html | 23 +++++++++++++++++++++ .../main/webapp/views/documents/viewDocument.html | 23 +++++++++++++++++++++ .../main/webapp/views/users/supervisorUsers.html | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/views/users/users.html | 23 +++++++++++++++++++++ pom.xml | 2 +- 8 files changed, 163 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch master updated (12c71d0 -> 22b6b6a)
by codelutin.com scm Jan. 26, 2015

Jan. 26, 2015

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 12c71d0 Merge branch 'release/0.5' adds 8dc289e [jgitflow-maven-plugin]updating poms for 0.6-SNAPSHOT development adds c19f8f9 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2417d30 Merge branch 'master' into develop adds a73f267 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds fc0ae77 fixes #6434 add some placeholders adds 97d27e1 start review of user search adds 3055de4 prepare advanced search on users adds 2f41890 can switch simple/advanced search on user adds 6f93a2b fixes #6205 Merge branch 'feature/6205-improve-user-search' into develop adds 993c889 fix error on user search with active, inactive, both adds 4c5b6ed change 'Deleted' label to 'disable' for users, and redirect to users list after modify adds e24edc0 review data encoding with POST method adds ea8bffd change way to create document with file, in order to have metadata in utf-8 : split into to ways : first create document and then attach file adds 924395d Fixes #6438 Merge branch 'feature/6438-improve-user-management' into develop adds 9164c42 fix compil... adds 3a8ba65 try webmotion 2.5-SNAPSHOT adds 092d492 fixes #6429 review initial load off referential page adds b4ffcf9 review way to update data in lucene index adds 844afae supervisor can create client user adds f13b8d3 allow supervisor to add client user from ui adds 5e0d885 fixes #6504 change application title adds 289e7d4 merge changes from develop adds 78b17b9 supervisor is able to edit client profile adds c489e6a fixes #6308 : Merge branch 'feature/6308-supervisor-can-create-client' into develop adds d97bdc2 fix user edit permission in service to be get own profile as supervisor adds 568dce2 add second new password input to avoid bad write in password adds 7c43e75 fixes #6440 Merge branch 'feature/6440-add-second-input-for-password-change' into develop adds 4e09a96 prepare document edit service adds 19ba20f fix unit test for login adds b54a05d Merge branch 'develop' into feature/6435-modify-document adds 9139630 add edit document page adds b0a9c28 cannot edit document used by questions adds b789cd4 fixes #6435 Merge branch 'feature/6435-modify-document' into develop adds 3290654 Refs #6308 : Change information text for supervisor admin page adds c615964 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds d201394 Refs #6440 : Update display of user edition page adds cf4f833 better filter for document edit and delete adds 949faa6 i18n menu and document part adds c7383c1 i18n question part adds 0429979 i18n question part adds 987afe4 i18n users part adds 6220fb4 i18n french translation adds bec58be fixes #6202 Merge branch 'feature/6202-add-multiliguage' into develop adds 088e487 add an unit test to highlight error with topia during deletion adds 5987947 Use topia SNAPSHOT to fix issue adds 1e73bf2 move config to persistence package, add an unit test about cascade deletion bug with document and questions, use snapshot topia solution adds f7f716d fix default locale adds 4bef73f fix relatedQuestion info from documents Fix view of document in question adds ab97af5 use stable version for topia and webmotion adds efcdb80 fix pom dependencies adds 20f1407 fix bundle module javascript constants... adds b42365b Prepare release adds 03ab385 [jgitflow-maven-plugin]updating poms for branch'release/0.6' with non-snapshot versions adds 22b6b6a Merge branch 'release/0.6' No new revisions were added by this update. Summary of changes: coselmar-bundle/pom.xml | 2 +- .../src/main/webapp/js/coselmar-constants.js | 3 +- coselmar-persistence/pom.xml | 40 ++- .../coselmar}/config/CoselmarServicesConfig.java | 4 +- .../config/CoselmarServicesConfigOption.java | 2 +- .../exceptions}/CoselmarTechnicalException.java | 2 +- .../persistence/entity/CoselmarUserTopiaDao.java | 8 +- .../i18n/coselmar-persistence_en_GB.properties | 2 + .../i18n/coselmar-persistence_fr_FR.properties | 2 + .../src/main/xmi/coselmar-model.zargo | Bin 10322 -> 10390 bytes .../java/fr/ifremer/AbstractCoselmarDaoTest.java | 11 +- .../src/test/java/fr/ifremer/DocumentDaoTest.java | 99 ++++++++ .../ifremer}/FakeCoselmarApplicationContext.java | 141 ++--------- .../resources/coselmar-persistence-test.properties | 0 coselmar-rest/pom.xml | 6 +- .../fr/ifremer/coselmar/beans/DocumentBean.java | 49 +++- .../fr/ifremer/coselmar/beans/UserSearchBean.java | 10 +- .../coselmar/converter/BeanEntityConverter.java | 17 +- .../services/CoselmarApplicationContext.java | 2 +- .../CoselmarServicesApplicationContext.java | 2 +- .../coselmar/services/CoselmarServicesContext.java | 2 +- .../services/CoselmarSimpleServiceSupport.java | 2 +- .../services/CoselmarWebServiceSupport.java | 3 +- .../services/DefaultCoselmarServicesContext.java | 3 +- .../indexation/DocumentsIndexationService.java | 9 +- .../coselmar/services/indexation/LuceneUtils.java | 2 +- .../indexation/QuestionsIndexationService.java | 11 +- .../coselmar/services/v1/AdminWebService.java | 4 +- .../coselmar/services/v1/DocumentsWebService.java | 166 ++++++++++-- .../coselmar/services/v1/QuestionsWebService.java | 2 +- .../coselmar/services/v1/UsersWebService.java | 80 ++++-- .../main/resources/coselmar-services.properties | 2 + coselmar-rest/src/main/resources/mapping | 7 +- .../services/FakeCoselmarApplicationContext.java | 4 +- .../services/FakeCoselmarServicesContext.java | 2 +- .../coselmar/services/UsersWebServiceTest.java | 54 +++- .../indexation/DocumentsIndexationServiceTest.java | 32 +-- .../indexation/QuestionsIndexationServiceTest.java | 12 + coselmar-ui/pom.xml | 8 +- coselmar-ui/src/main/webapp/css/coselmar.css | 6 + coselmar-ui/src/main/webapp/i18n/en.js | 233 +++++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 233 +++++++++++++++++ coselmar-ui/src/main/webapp/img/en.png | Bin 0 -> 599 bytes coselmar-ui/src/main/webapp/img/fr.png | Bin 0 -> 545 bytes coselmar-ui/src/main/webapp/index.html | 64 +++-- .../src/main/webapp/js/coselmar-constants.js | 5 +- .../src/main/webapp/js/coselmar-controllers.js | 280 ++++++++++++++++----- .../main/webapp/js/coselmar-questions-services.js | 14 +- .../src/main/webapp/js/coselmar-services.js | 52 +++- .../src/main/webapp/js/coselmar-user-services.js | 39 +-- coselmar-ui/src/main/webapp/js/coselmar.js | 16 +- .../src/main/webapp/views/admin/admintools.html | 12 +- .../src/main/webapp/views/documents/document.html | 78 +----- .../src/main/webapp/views/documents/documents.html | 28 +-- .../{newdocument.html => editDocument.html} | 106 ++++---- .../webapp/views/documents/modalDocumentEdit.html | 66 ++--- .../views/documents/modalDocumentSearch.html | 16 +- .../main/webapp/views/documents/newdocument.html | 73 +++--- .../documents/{document.html => viewDocument.html} | 58 +++-- .../main/webapp/views/questions/closeQuestion.html | 14 +- .../main/webapp/views/questions/editquestion.html | 60 ++--- .../views/questions/modalQuestionSearch.html | 14 +- .../webapp/views/questions/newDocumentsPart.html | 12 +- .../main/webapp/views/questions/newquestion.html | 4 +- .../src/main/webapp/views/questions/question.html | 16 +- .../src/main/webapp/views/questions/questions.html | 26 +- .../views/questions/viewRestrictedQuestion.html | 6 +- .../main/webapp/views/questions/viewquestion.html | 52 ++-- .../main/webapp/views/referential/referential.html | 35 +-- .../src/main/webapp/views/users/adminUsers.html | 122 +++++++++ .../src/main/webapp/views/users/edituser.html | 98 ++++++-- .../src/main/webapp/views/users/newuser.html | 15 +- .../main/webapp/views/users/supervisorUsers.html | 123 +++++++++ coselmar-ui/src/main/webapp/views/users/user.html | 26 +- coselmar-ui/src/main/webapp/views/users/users.html | 61 +---- pom.xml | 28 ++- 76 files changed, 2033 insertions(+), 865 deletions(-) rename {coselmar-rest/src/main/java/fr/ifremer/coselmar/services => coselmar-persistence/src/main/java/fr/ifremer/coselmar}/config/CoselmarServicesConfig.java (98%) rename {coselmar-rest/src/main/java/fr/ifremer/coselmar/services => coselmar-persistence/src/main/java/fr/ifremer/coselmar}/config/CoselmarServicesConfigOption.java (98%) rename {coselmar-rest/src/main/java/fr/ifremer/coselmar/services => coselmar-persistence/src/main/java/fr/ifremer/coselmar/exceptions}/CoselmarTechnicalException.java (97%) copy coselmar-rest/src/test/java/fr/ifremer/coselmar/services/AbstractCoselmarServiceTest.java => coselmar-persistence/src/test/java/fr/ifremer/AbstractCoselmarDaoTest.java (74%) create mode 100644 coselmar-persistence/src/test/java/fr/ifremer/DocumentDaoTest.java copy {coselmar-rest/src/test/java/fr/ifremer/coselmar/services => coselmar-persistence/src/test/java/fr/ifremer}/FakeCoselmarApplicationContext.java (56%) copy coselmar-rest/src/main/resources/coselmar-services.properties => coselmar-persistence/src/test/resources/coselmar-persistence-test.properties (100%) create mode 100644 coselmar-ui/src/main/webapp/i18n/en.js create mode 100644 coselmar-ui/src/main/webapp/i18n/fr.js create mode 100644 coselmar-ui/src/main/webapp/img/en.png create mode 100644 coselmar-ui/src/main/webapp/img/fr.png copy coselmar-ui/src/main/webapp/views/documents/{newdocument.html => editDocument.html} (65%) copy coselmar-ui/src/main/webapp/views/documents/{document.html => viewDocument.html} (50%) create mode 100644 coselmar-ui/src/main/webapp/views/users/adminUsers.html create mode 100644 coselmar-ui/src/main/webapp/views/users/supervisorUsers.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Coselmar 0.6 released
by codelutin.com Release Notification Jan. 26, 2015

Jan. 26, 2015

The Coselmar team is pleased to announce the coselmar-0.6 release! Documentation of the project can be found here: https://coselmar.codelutin.com Changes ------- Changes in this version include: New features: o Rename Application Title Issue: 6504. Thanks to Yannick Martel. Resolved by lkaufmann. o Supervisor can create "client" user Issue: 6308. Thanks to Yannick Martel. Resolved by ymartel. o Add multi-language support in UI Issue: 6202. Thanks to Yannick Martel. Resolved by ymartel. o Ajout d'un deuxième champ pour la modification du mot de passe Issue: 6440. Thanks to Léo Kaufmann. Resolved by lkaufmann. o Améliorations sur l'écran de recherche dans le référentiel Issue: 6429. Thanks to Léo Kaufmann. Resolved by ymartel. o Modification d'un document existant Issue: 6435. Thanks to Léo Kaufmann. Resolved by ymartel. o Improve search on users Issue: 6205. Thanks to Yannick Martel. Resolved by ymartel. o Modifications sur la gestion des utilisateurs Issue: 6438. Thanks to Léo Kaufmann. Resolved by ymartel. o Ajout de placeholders Issue: 6434. Thanks to Léo Kaufmann. Resolved by ymartel. Fixed Bugs: o Corrections graphiques & ergonomiques Issue: 6432. Thanks to Léo Kaufmann. Resolved by lkaufmann. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/coselmar/files * coselmar-bundle-0.6.war - http://forge.codelutin.com/attachments/download/2790 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Coselmar team

1 0

branch release/0.6 created (now 20f1407)
by codelutin.com scm Jan. 26, 2015

Jan. 26, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/0.6 in repository coselmar. See http://git.codelutin.com/coselmar.git at 20f1407 fix bundle module javascript constants... 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 develop updated (20f1407 -> bacd44c)
by codelutin.com scm Jan. 26, 2015

Jan. 26, 2015

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 20f1407 fix bundle module javascript constants... new bacd44c [jgitflow-maven-plugin]updating poms for 0.7-SNAPSHOT development 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 bacd44c2090249dda5350669058e8a043f482b66 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 26 09:26:23 2015 +0000 [jgitflow-maven-plugin]updating poms for 0.7-SNAPSHOT development 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 1