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 6f93a2b8480a9614ca2869e6196ab761f22bfdaf Merge: fc0ae77 2f41890 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 15 10:53:32 2015 +0100 fixes #6205 Merge branch 'feature/6205-improve-user-search' into develop .../persistence/entity/CoselmarUserTopiaDao.java | 8 +-- .../fr/ifremer/coselmar/beans/UserSearchBean.java | 10 ++-- .../coselmar/services/v1/UsersWebService.java | 17 ++---- coselmar-rest/src/main/resources/mapping | 2 +- .../src/main/webapp/js/coselmar-controllers.js | 21 +++++++- .../src/main/webapp/js/coselmar-user-services.js | 26 +++------ coselmar-ui/src/main/webapp/views/users/users.html | 63 ++++++++++++++++++---- 7 files changed, 92 insertions(+), 55 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.