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 3679385 Merge branch 'feature/6142-filter-documents-list' into develop new b411b4d #6015 User deletion is not a real deletion : user become non active 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 b411b4df246b2d55f2743ba64eee192aff120230 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Nov 27 11:53:32 2014 +0100 #6015 User deletion is not a real deletion : user become non active Summary of changes: .../src/main/xmi/coselmar-model.zargo | Bin 6490 -> 6557 bytes .../main/java/fr/ifremer/coselmar/beans/UserBean.java | 12 +++++++++++- .../coselmar/converter/BeanEntityConverter.java | 3 ++- .../ifremer/coselmar/services/v1/UsersWebService.java | 7 +++++-- coselmar-ui/src/main/webapp/views/users/user.html | 9 +++++++-- coselmar-ui/src/main/webapp/views/users/users.html | 3 +++ 6 files changed, 28 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.