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

branch develop updated (38b7715 -> 0e66d58)
by codelutin.com scm 21 Jan '16

21 Jan '16

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 38b7715 add a way for admin to see delteed projects new 10fcb87 refs-50 #7917 add arrow in project hierarcy graph new 0e66d58 refs-80 #7917 current question is displayed as bold in hierarchy graph 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 0e66d58a93e78dec999eec53d4e80c24ff8c704f Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Jan 21 18:05:36 2016 +0100 refs-80 #7917 current question is displayed as bold in hierarchy graph commit 10fcb8763ea5d86c2ecfb6e569a1b48c624adc6a Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Jan 21 16:18:55 2016 +0100 refs-50 #7917 add arrow in project hierarcy graph Summary of changes: .../src/main/webapp/js/coselmar-controllers.js | 1 + .../src/main/webapp/js/d3-2waytree-graph.js | 415 ++++++++++++--------- 2 files changed, 233 insertions(+), 183 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 (90e32a4 -> 38b7715)
by codelutin.com scm 21 Jan '16

21 Jan '16

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 90e32a4 fixes #7914 filtered already added documents and parents in project modification new 38b7715 add a way for admin to see delteed projects 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 38b7715d932d28bb711d8d191f152ddaa20bc877 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Jan 21 11:32:20 2016 +0100 add a way for admin to see delteed projects Summary of changes: coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + coselmar-ui/src/main/webapp/views/questions/toolsPart.html | 1 + 3 files changed, 3 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (ad46b96 -> 90e32a4)
by codelutin.com scm 20 Jan '16

20 Jan '16

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 ad46b96 Merge branch 'feature/7927-user-projects-list' into develop new 90e32a4 fixes #7914 filtered already added documents and parents in project modification 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 90e32a4833280849c018f0028e6b3ffaf1fbc800 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Jan 20 17:37:41 2016 +0100 fixes #7914 filtered already added documents and parents in project modification Summary of changes: .../fr/ifremer/coselmar/persistence/DaoUtils.java | 17 ++++++ .../persistence/entity/DocumentTopiaDao.java | 7 ++- .../persistence/entity/QuestionTopiaDao.java | 3 ++ .../src/main/webapp/js/coselmar-controllers.js | 63 +++++++++++++++++----- .../views/questions/modalQuestionSearch.html | 2 +- 5 files changed, 78 insertions(+), 14 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 (24eddf0 -> ad46b96)
by codelutin.com scm 20 Jan '16

20 Jan '16

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 24eddf0 Merge branch 'feature/7927-user-projects-list' into develop discards 7bf16cd fixes-40 #7927 Add list of projects by users on user page new 878015d fixes #7927 Add list of projects by users on user page new ad46b96 Merge branch 'feature/7927-user-projects-list' into develop 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 (24eddf0) \ N -- N -- N refs/heads/develop (ad46b96) 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 ad46b966c2247e8d27b32de7a0186a208367e3f1 Merge: 194cc6b 878015d Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Jan 20 12:20:46 2016 +0100 Merge branch 'feature/7927-user-projects-list' into develop commit 878015df2116b5bf5fea3bb950d78a1d676f839d Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Jan 20 12:20:41 2016 +0100 fixes #7927 Add list of projects by users on user page Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (194cc6b -> 24eddf0)
by codelutin.com scm 20 Jan '16

20 Jan '16

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 194cc6b fixes #7913 notify document cannot be modified instead of just no display button new 0cb0bb6 refs-40 #7927 Add service to get questions relative to an user by its role new 7bf16cd fixes-40 #7927 Add list of projects by users on user page new 24eddf0 Merge branch 'feature/7927-user-projects-list' 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 24eddf0e6da50925d9c0c00edb1fe49ac2ed6afc Merge: 194cc6b 7bf16cd Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Jan 20 12:20:46 2016 +0100 Merge branch 'feature/7927-user-projects-list' into develop commit 7bf16cd7d61387bce82c179d85bd101fa4a37473 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Jan 20 12:20:41 2016 +0100 fixes-40 #7927 Add list of projects by users on user page commit 0cb0bb641b320eb164e02052d2fa0251b1805f13 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Jan 19 17:55:04 2016 +0100 refs-40 #7927 Add service to get questions relative to an user by its role Summary of changes: .../coselmar/beans/QuestionSearchExample.java | 11 ++ .../persistence/entity/QuestionTopiaDao.java | 21 +++ .../ifremer/coselmar/beans/QuestionSearchBean.java | 38 +++++ .../ifremer/coselmar/beans/QuestionUserRole.java | 11 ++ .../coselmar/services/v1/QuestionsWebService.java | 72 +++++++++ coselmar-rest/src/main/resources/mapping | 1 + .../coselmar/services/QuestionsWebServiceTest.java | 161 +++++++++++++++++++++ coselmar-ui/src/main/webapp/i18n/en.js | 9 ++ coselmar-ui/src/main/webapp/i18n/fr.js | 9 ++ .../src/main/webapp/js/coselmar-constants.js | 1 - .../src/main/webapp/js/coselmar-controllers.js | 16 ++ .../src/main/webapp/js/coselmar-user-services.js | 7 + coselmar-ui/src/main/webapp/views/users/user.html | 64 ++++++++ 13 files changed, 420 insertions(+), 1 deletion(-) create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionUserRole.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch develop updated (cd6fc2f -> 194cc6b)
by codelutin.com scm 19 Jan '16

19 Jan '16

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 cd6fc2f fix migration script for citation, as text for pg new 194cc6b fixes #7913 notify document cannot be modified instead of just no display button 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 194cc6be00a357d723d574c929ecd15fefcd02e7 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Jan 19 12:18:20 2016 +0100 fixes #7913 notify document cannot be modified instead of just no display button Summary of changes: coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + coselmar-ui/src/main/webapp/views/documents/viewDocument.html | 5 ++++- 3 files changed, 6 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 (5ec2cbc -> cd6fc2f)
by codelutin.com scm 19 Jan '16

19 Jan '16

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 5ec2cbc Merge branch 'feature/7911-add-citations-field-on-document' into develop new cd6fc2f fix migration script for citation, as text for pg 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 cd6fc2feba8e85e31d1063bdb6154be4477eefaf Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Jan 19 10:38:45 2016 +0100 fix migration script for citation, as text for pg Summary of changes: .../resources/db/migration/V1_4_0_1__7911_add_citation_in_documents.sql | 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 1

branch develop updated (395eb60 -> 5ec2cbc)
by codelutin.com scm 18 Jan '16

18 Jan '16

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 395eb60 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 0865a71 refs-60 #7911 add citation in document - persistence & services part new c02daaf fixes #7911 add citation in documents new 5ec2cbc Merge branch 'feature/7911-add-citations-field-on-document' 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 5ec2cbc3532c9343225f7cc391e9a1a55a1649d3 Merge: 395eb60 c02daaf Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Jan 18 19:17:57 2016 +0100 Merge branch 'feature/7911-add-citations-field-on-document' into develop commit c02daaf159f6df6352758ffc1a3bd116b91f1294 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Jan 18 19:17:51 2016 +0100 fixes #7911 add citation in documents commit 0865a71a454e4a386a0c33a046e346a8526b4a9d Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Jan 18 18:38:11 2016 +0100 refs-60 #7911 add citation in document - persistence & services part Summary of changes: ...=> V1_4_0_1__7911_add_citation_in_documents.sql} | 13 +------------ .../src/main/xmi/coselmar-model.properties | 1 + .../src/main/xmi/coselmar-model.zargo | Bin 10955 -> 11007 bytes .../fr/ifremer/coselmar/beans/DocumentBean.java | 13 ++++++++++++- .../ifremer/coselmar/beans/DocumentSearchBean.java | 4 ++-- .../coselmar/converter/BeanEntityConverter.java | 6 +++++- .../coselmar/services/v1/DocumentsWebService.java | 5 ++++- .../indexation/DocumentsIndexationServiceTest.java | 16 ++++++++-------- coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + .../main/webapp/views/documents/editDocument.html | 11 +++++++++++ .../webapp/views/documents/modalDocumentEdit.html | 12 ++++++++++++ .../main/webapp/views/documents/newdocument.html | 11 +++++++++++ .../main/webapp/views/documents/viewDocument.html | 4 ++++ 14 files changed, 73 insertions(+), 25 deletions(-) copy coselmar-persistence/src/main/resources/db/migration/{V1_2_0_1__7867_add_list_links_in_projects.sql => V1_4_0_1__7911_add_citation_in_documents.sql} (68%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch release/1.3 deleted (was 389eb4f)
by codelutin.com scm 18 Jan '16

18 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch release/1.3 in repository coselmar. See http://git.codelutin.com/coselmar.git was 389eb4f [jgitflow-maven-plugin]updating poms for branch'release/1.3' 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-1.3 created (now f509ac5)
by codelutin.com scm 18 Jan '16

18 Jan '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag coselmar-1.3 in repository coselmar. See http://git.codelutin.com/coselmar.git at f509ac5 (tag) tagging d63a60c2d31cfd036076784c6daec3458eed7f27 (commit) replaces coselmar-1.2.1 tagged by Maven Release on Mon Jan 18 14:55:51 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 1.3 ----------------------------------------------------------------------- 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