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 ad46b966c2247e8d27b32de7a0186a208367e3f1 Merge: 194cc6b 878015d Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 20 12:20:46 2016 +0100 Merge branch 'feature/7927-user-projects-list' into develop .../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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.