This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit c1bb341d83e425ea570dd38f20ca1c638e0e28de Merge: 242180a 408c5cd Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 7 16:49:30 2016 +0100 Merge branch 'feature/7867-list-links-in-project' into develop coselmar-persistence/pom.xml | 5 ++ .../V1_2_0_1__7867_add_list_links_in_projects.sql | 34 +++++++++ .../src/main/xmi/coselmar-model.zargo | Bin 10470 -> 10955 bytes .../java/fr/ifremer/coselmar/beans/LinkBean.java | 39 +++++++++++ .../fr/ifremer/coselmar/beans/QuestionBean.java | 17 +++++ .../coselmar/converter/BeanEntityConverter.java | 26 +++++++ .../services/CoselmarRestApplicationListener.java | 4 +- .../coselmar/services/v1/QuestionsWebService.java | 55 +++++++++++++++ coselmar-ui/src/main/webapp/i18n/en.js | 10 +++ coselmar-ui/src/main/webapp/i18n/fr.js | 10 +++ .../src/main/webapp/js/coselmar-controllers.js | 69 +++++++++++++++++- .../src/main/webapp/views/links/modalLinkEdit.html | 78 +++++++++++++++++++++ .../main/webapp/views/questions/editquestion.html | 42 ++++++++++- .../main/webapp/views/questions/viewquestion.html | 16 +++++ pom.xml | 5 ++ 15 files changed, 406 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.