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

branch develop updated (afc6184 -> 65748fb)
by codelutin.com scm 19 Dec '14

19 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 afc6184 use webjars instead of nuiton-js new 65748fb fixes #6301 add a dialog to confirm 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 65748fbaa00eda5785b57e171aac7e871c8ea9e5 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Dec 19 15:15:39 2014 +0100 fixes #6301 add a dialog to confirm delete Summary of changes: .../src/main/webapp/js/coselmar-controllers.js | 50 +++++++++++++++++++++- .../src/main/webapp/views/documents/document.html | 4 +- .../src/main/webapp/views/documents/documents.html | 4 +- .../src/main/webapp/views/questions/question.html | 4 +- .../src/main/webapp/views/questions/questions.html | 4 +- coselmar-ui/src/main/webapp/views/users/user.html | 5 ++- coselmar-ui/src/main/webapp/views/users/users.html | 4 +- 7 files changed, 68 insertions(+), 7 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 (010abb8 -> afc6184)
by codelutin.com scm 17 Dec '14

17 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 010abb8 manage error from servers new afc6184 use webjars instead of nuiton-js 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 afc618447a6cfb2225f5dd768065c0853b267905 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Dec 17 09:39:48 2014 +0100 use webjars instead of nuiton-js Summary of changes: coselmar-ui/pom.xml | 37 +++++++++++----------------------- coselmar-ui/src/main/webapp/index.html | 18 ++++++++--------- 2 files changed, 21 insertions(+), 34 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 (91242fb -> 010abb8)
by codelutin.com scm 16 Dec '14

16 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 91242fb review question wiew and access to documents new 010abb8 manage error from servers 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 010abb8c63ae381981b6d172b37896edba194aad Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Dec 16 16:56:28 2014 +0100 manage error from servers Summary of changes: .../ifremer/coselmar/services/v1/ErrorAction.java | 27 +++++++++++++++ .../coselmar/services/v1/UsersWebService.java | 7 +++- coselmar-rest/src/main/resources/mapping | 10 +++--- coselmar-ui/src/main/webapp/index.html | 5 --- .../src/main/webapp/js/coselmar-controllers.js | 30 ++++++++++------ coselmar-ui/src/main/webapp/js/coselmar.js | 40 +++++++++++++++++++++- coselmar-ui/src/main/webapp/views/errors/401.html | 7 ++++ coselmar-ui/src/main/webapp/views/errors/403.html | 4 +++ coselmar-ui/src/main/webapp/views/errors/404.html | 4 +++ 9 files changed, 111 insertions(+), 23 deletions(-) create mode 100644 coselmar-ui/src/main/webapp/views/errors/401.html create mode 100644 coselmar-ui/src/main/webapp/views/errors/403.html create mode 100644 coselmar-ui/src/main/webapp/views/errors/404.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (2410946 -> 91242fb)
by codelutin.com scm 16 Dec '14

16 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 2410946 review access on question new 91242fb review question wiew and access to documents 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 91242fb566146501c746543d73eba8980d0e1ed9 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Dec 16 11:57:17 2014 +0100 review question wiew and access to documents Summary of changes: coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 2 +- coselmar-ui/src/main/webapp/views/questions/viewquestion.html | 4 ++-- 2 files changed, 3 insertions(+), 3 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 (701d3f6 -> 2410946)
by codelutin.com scm 16 Dec '14

16 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 701d3f6 #6302 on question, clients could be anyone from system new 2410946 review access on question 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 241094674b215001268cdad6615275c141a0de27 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Dec 16 11:24:23 2014 +0100 review access on question Summary of changes: .../coselmar/services/v1/QuestionsWebService.java | 22 +++++++++++----- .../src/main/webapp/js/coselmar-controllers.js | 17 ++++++++++--- .../src/main/webapp/views/questions/questions.html | 29 ++++++++++++++-------- .../main/webapp/views/questions/viewquestion.html | 4 +-- .../src/main/webapp/views/users/edituser.html | 2 +- 5 files changed, 52 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 (9839ff7 -> 701d3f6)
by codelutin.com scm 16 Dec '14

16 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 9839ff7 Merge branch 'feature/6166-add-suggestion-for-keywords' into develop new 701d3f6 #6302 on question, clients could be anyone from system 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 701d3f6abd44475c9f4db0a6337250d0367573f7 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Dec 16 09:55:24 2014 +0100 #6302 on question, clients could be anyone from system Summary of changes: .../fr/ifremer/coselmar/converter/BeanEntityConverter.java | 5 ++++- coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 2 +- coselmar-ui/src/main/webapp/views/questions/editquestion.html | 10 +++++++--- 3 files changed, 12 insertions(+), 5 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 (010bc96 -> 9839ff7)
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 010bc96 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop new d6e163c add completion on question.type, question.themes, document.type (plain and modal) and document.keywords(modal) new 7e7e5b0 review document creation page new 9839ff7 Merge branch 'feature/6166-add-suggestion-for-keywords' 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 9839ff7afd7394587f5fa89fa7153612e7162beb Merge: 010bc96 7e7e5b0 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Dec 15 18:16:16 2014 +0100 Merge branch 'feature/6166-add-suggestion-for-keywords' into develop commit 7e7e5b0f5621d68dfd68d324522481b4bdba6338 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Dec 15 18:16:06 2014 +0100 review document creation page commit d6e163cbfee762f2796dbc1cb25ab4fe6d7b4e79 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Dec 15 17:23:16 2014 +0100 add completion on question.type, question.themes, document.type (plain and modal) and document.keywords(modal) Summary of changes: .../persistence/entity/DocumentTopiaDao.java | 23 ++ .../coselmar/services/v1/DocumentsWebService.java | 14 ++ coselmar-rest/src/main/resources/mapping | 8 +- .../src/main/webapp/js/coselmar-controllers.js | 59 ++++- .../main/webapp/js/coselmar-questions-services.js | 19 +- .../src/main/webapp/js/coselmar-services.js | 21 +- .../webapp/views/documents/modalDocumentEdit.html | 77 ++++--- .../main/webapp/views/documents/newdocument.html | 249 ++++++++++++--------- .../main/webapp/views/questions/editquestion.html | 10 +- 9 files changed, 331 insertions(+), 149 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

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