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

branch feature/6010-search-document deleted (was e9101fc)
by codelutin.com scm Jan. 23, 2015

Jan. 23, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/6010-search-document in repository coselmar. See http://git.codelutin.com/coselmar.git was e9101fc enable search by keywords on Documents 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 documentDeleteTopiaError deleted (was 5987947)
by codelutin.com scm Jan. 23, 2015

Jan. 23, 2015

This is an automated email from the git hooks/post-receive script. New change to branch documentDeleteTopiaError in repository coselmar. See http://git.codelutin.com/coselmar.git was 5987947 Use topia SNAPSHOT to fix issue 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 develop updated (bec58be -> 1e73bf2)
by codelutin.com scm Jan. 23, 2015

Jan. 23, 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 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 new 1e73bf2 move config to persistence package, add an unit test about cascade deletion bug with document and questions, use snapshot topia solution 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 1e73bf2ffa9e2408e587234e1d750b4749808e74 Merge: bec58be 5987947 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Jan 23 16:56:46 2015 +0100 move config to persistence package, add an unit test about cascade deletion bug with document and questions, use snapshot topia solution Summary of changes: coselmar-persistence/pom.xml | 23 ++++ .../coselmar}/config/CoselmarServicesConfig.java | 4 +- .../config/CoselmarServicesConfigOption.java | 2 +- .../exceptions}/CoselmarTechnicalException.java | 2 +- .../i18n/coselmar-persistence_en_GB.properties | 2 + .../i18n/coselmar-persistence_fr_FR.properties | 2 + .../java/fr/ifremer/AbstractCoselmarDaoTest.java | 11 +- .../src/test/java/fr/ifremer/DocumentDaoTest.java | 75 +++++++++++ .../ifremer}/FakeCoselmarApplicationContext.java | 141 +++------------------ .../resources/coselmar-persistence-test.properties | 2 - coselmar-rest/pom.xml | 4 - .../services/CoselmarApplicationContext.java | 2 +- .../CoselmarServicesApplicationContext.java | 2 +- .../coselmar/services/CoselmarServicesContext.java | 2 +- .../services/CoselmarSimpleServiceSupport.java | 2 +- .../services/CoselmarWebServiceSupport.java | 3 +- .../services/DefaultCoselmarServicesContext.java | 3 +- .../coselmar/services/indexation/LuceneUtils.java | 2 +- .../coselmar/services/v1/AdminWebService.java | 2 +- .../coselmar/services/v1/DocumentsWebService.java | 21 +-- .../coselmar/services/v1/UsersWebService.java | 4 +- coselmar-rest/src/main/resources/mapping | 2 +- .../services/FakeCoselmarApplicationContext.java | 4 +- .../services/FakeCoselmarServicesContext.java | 2 +- pom.xml | 5 +- 25 files changed, 147 insertions(+), 177 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/test/resources/coselmar-test.properties => coselmar-persistence/src/test/resources/coselmar-persistence-test.properties (97%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (cf4f833 -> bec58be)
by codelutin.com scm Jan. 23, 2015

Jan. 23, 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 cf4f833 better filter for document edit and delete new 949faa6 i18n menu and document part new c7383c1 i18n question part new 0429979 i18n question part new 987afe4 i18n users part new 6220fb4 i18n french translation new bec58be fixes #6202 Merge branch 'feature/6202-add-multiliguage' into develop 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 bec58be049f0839efe9f231ffcc1b5e927c25c7c Merge: cf4f833 6220fb4 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Jan 23 15:20:40 2015 +0100 fixes #6202 Merge branch 'feature/6202-add-multiliguage' into develop commit 6220fb4517925d89d3eb5c5fe3dfb1d9b9b7e2fb Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Jan 23 15:14:27 2015 +0100 i18n french translation commit 987afe439f3e425bceafd8250e90d87dba11d395 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Jan 23 10:45:19 2015 +0100 i18n users part commit 0429979fb6bd8929572fe7348098e7ef0d52dae1 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Jan 22 17:56:39 2015 +0100 i18n question part commit c7383c1e45910545c25c213e9c8417de613852a3 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Jan 22 17:52:22 2015 +0100 i18n question part commit 949faa6a7668b239cc0bc61144022812614175ca Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Jan 22 16:37:59 2015 +0100 i18n menu and document part Summary of changes: coselmar-ui/pom.xml | 6 + coselmar-ui/src/main/webapp/i18n/en.js | 210 +++++++++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 210 +++++++++++++++++++++ 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 | 58 +++--- .../src/main/webapp/js/coselmar-constants.js | 3 +- .../src/main/webapp/js/coselmar-controllers.js | 37 +++- coselmar-ui/src/main/webapp/js/coselmar.js | 13 +- .../src/main/webapp/views/admin/admintools.html | 12 +- .../src/main/webapp/views/documents/documents.html | 22 +-- .../main/webapp/views/documents/editDocument.html | 44 ++--- .../webapp/views/documents/modalDocumentEdit.html | 55 +++--- .../views/documents/modalDocumentSearch.html | 17 +- .../main/webapp/views/documents/newdocument.html | 64 +++---- .../main/webapp/views/documents/viewDocument.html | 44 ++--- .../main/webapp/views/questions/closeQuestion.html | 14 +- .../main/webapp/views/questions/editquestion.html | 56 +++--- .../views/questions/modalQuestionSearch.html | 12 +- .../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 | 24 +-- .../views/questions/viewRestrictedQuestion.html | 6 +- .../main/webapp/views/questions/viewquestion.html | 52 ++--- .../main/webapp/views/referential/referential.html | 33 ++-- .../src/main/webapp/views/users/adminUsers.html | 49 +++-- .../src/main/webapp/views/users/edituser.html | 49 +++-- .../src/main/webapp/views/users/newuser.html | 12 +- .../main/webapp/views/users/supervisorUsers.html | 48 ++--- coselmar-ui/src/main/webapp/views/users/user.html | 26 +-- coselmar-ui/src/main/webapp/views/users/users.html | 2 +- pom.xml | 8 + 33 files changed, 847 insertions(+), 371 deletions(-) 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch develop updated (d201394 -> cf4f833)
by codelutin.com scm Jan. 22, 2015

Jan. 22, 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 d201394 Refs #6440 : Update display of user edition page new cf4f833 better filter for document edit and delete 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 cf4f833c60b8038cdb9a89cd726ef71762d7ec45 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Jan 22 10:43:22 2015 +0100 better filter for document edit and delete Summary of changes: .../java/fr/ifremer/coselmar/beans/DocumentBean.java | 12 +++++++++++- .../ifremer/coselmar/converter/BeanEntityConverter.java | 14 +++++++++----- .../fr/ifremer/coselmar/services/v1/AdminWebService.java | 2 +- .../coselmar/services/v1/DocumentsWebService.java | 8 ++++---- .../indexation/DocumentsIndexationServiceTest.java | 16 ++++++++-------- coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 1 + .../src/main/webapp/views/documents/documents.html | 4 ++-- .../src/main/webapp/views/documents/viewDocument.html | 2 +- 8 files changed, 37 insertions(+), 22 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (c615964 -> d201394)
by codelutin.com scm Jan. 21, 2015

Jan. 21, 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 c615964 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop new d201394 Refs #6440 : Update display of user edition page 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 d201394883cc97f8a341518bcdf047507c39296b Author: Léo Kaufmann <kaufmann(a)codelutin.com> Date: Wed Jan 21 19:18:25 2015 +0100 Refs #6440 : Update display of user edition page Summary of changes: coselmar-ui/src/main/webapp/css/coselmar.css | 6 +++ .../src/main/webapp/views/users/edituser.html | 46 ++++++++++++---------- 2 files changed, 31 insertions(+), 21 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (3290654 -> c615964)
by codelutin.com scm Jan. 21, 2015

Jan. 21, 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 3290654 Refs #6308 : Change information text for supervisor admin page new 4e09a96 prepare document edit service new b54a05d Merge branch 'develop' into feature/6435-modify-document new 9139630 add edit document page new b0a9c28 cannot edit document used by questions new b789cd4 fixes #6435 Merge branch 'feature/6435-modify-document' into develop new c615964 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop 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 c6159649a91059ac02da323514732d87f108eb2c Merge: b789cd4 3290654 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Jan 21 18:16:22 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop commit b789cd461e14f93efc0545fbf7c75ad4de39b101 Merge: 19ba20f b0a9c28 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Jan 21 18:16:07 2015 +0100 fixes #6435 Merge branch 'feature/6435-modify-document' into develop commit b0a9c2844cf0fb97a679f554e56b464269ba1ea8 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Jan 21 18:16:03 2015 +0100 cannot edit document used by questions commit 91396303b4273f34348bfbfce74a715e7e2eb2d2 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Jan 21 17:50:23 2015 +0100 add edit document page commit b54a05d8704d102690de5e3d57957ff23dbaec1d Merge: 4e09a96 19ba20f Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Jan 21 12:08:03 2015 +0100 Merge branch 'develop' into feature/6435-modify-document commit 4e09a9665c18f531809074b5a80cae3ca7deb8df Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Jan 21 11:57:34 2015 +0100 prepare document edit service Summary of changes: .../fr/ifremer/coselmar/beans/DocumentBean.java | 16 +++++ .../coselmar/services/v1/DocumentsWebService.java | 84 +++++++++++++++++++++- .../src/main/webapp/js/coselmar-controllers.js | 82 ++++++++++++++++++++- .../src/main/webapp/js/coselmar-services.js | 7 +- .../src/main/webapp/views/documents/document.html | 82 +-------------------- .../{newdocument.html => editDocument.html} | 80 +++++---------------- .../documents/{document.html => viewDocument.html} | 41 ++++------- 7 files changed, 211 insertions(+), 181 deletions(-) copy coselmar-ui/src/main/webapp/views/documents/{newdocument.html => editDocument.html} (75%) copy coselmar-ui/src/main/webapp/views/documents/{document.html => viewDocument.html} (67%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch develop updated (19ba20f -> 3290654)
by codelutin.com scm Jan. 21, 2015

Jan. 21, 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 19ba20f fix unit test for login new 3290654 Refs #6308 : Change information text for supervisor admin page 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 3290654b645e0c0c1140b7ddc6f236ed586e56a8 Author: Léo Kaufmann <kaufmann(a)codelutin.com> Date: Wed Jan 21 16:47:54 2015 +0100 Refs #6308 : Change information text for supervisor admin page Summary of changes: coselmar-ui/src/main/webapp/views/users/newuser.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (7c43e75 -> 19ba20f)
by codelutin.com scm Jan. 21, 2015

Jan. 21, 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 7c43e75 fixes #6440 Merge branch 'feature/6440-add-second-input-for-password-change' into develop new 19ba20f fix unit test for login 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 19ba20f68f7032187734d3ea9bfb1439f624eb6d Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Jan 21 12:03:20 2015 +0100 fix unit test for login Summary of changes: .../coselmar/services/UsersWebServiceTest.java | 54 ++++++++++++++++++---- 1 file changed, 46 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (c489e6a -> 7c43e75)
by codelutin.com scm Jan. 20, 2015

Jan. 20, 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 c489e6a fixes #6308 : Merge branch 'feature/6308-supervisor-can-create-client' into develop new d97bdc2 fix user edit permission in service to be get own profile as supervisor new 568dce2 add second new password input to avoid bad write in password new 7c43e75 fixes #6440 Merge branch 'feature/6440-add-second-input-for-password-change' into develop The 3 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 7c43e757dacc6707bb35b81790e6fe8e66d8ed39 Merge: c489e6a 568dce2 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Jan 20 17:52:44 2015 +0100 fixes #6440 Merge branch 'feature/6440-add-second-input-for-password-change' into develop commit 568dce29ae463f486bfb439670b71d04e8ec751d Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Jan 20 17:52:34 2015 +0100 add second new password input to avoid bad write in password commit d97bdc2faf6c2436c973846d9817d014e1c04010 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Jan 20 17:50:58 2015 +0100 fix user edit permission in service to be get own profile as supervisor Summary of changes: .../coselmar/services/v1/UsersWebService.java | 2 +- .../src/main/webapp/js/coselmar-controllers.js | 27 +++++++++++++++-- .../src/main/webapp/views/users/edituser.html | 35 ++++++++++++++++++---- 3 files changed, 55 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3