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 6f93a2b fixes #6205 Merge branch 'feature/6205-improve-user-search' into develop new 993c889 fix error on user search with active, inactive, both new 4c5b6ed change 'Deleted' label to 'disable' for users, and redirect to users list after modify new e24edc0 review data encoding with POST method new ea8bffd change way to create document with file, in order to have metadata in utf-8 : split into to ways : first create document and then attach file new 924395d Fixes #6438 Merge branch 'feature/6438-improve-user-management' into develop 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 924395d7384b36fa35eb4ea4f1e9043abdb17ae2 Merge: 993c889 ea8bffd Author: Yannick Martel <martel@©odelutin.com> Date: Fri Jan 16 12:49:37 2015 +0100 Fixes #6438 Merge branch 'feature/6438-improve-user-management' into develop commit ea8bffd280ceb0cec0403d8a6d281966ed82584e Author: Yannick Martel <martel@©odelutin.com> Date: Fri Jan 16 12:49:10 2015 +0100 change way to create document with file, in order to have metadata in utf-8 : split into to ways : first create document and then attach file commit e24edc0cb9cc21ee243d3cfc81114c95a96736ea Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 15 18:09:26 2015 +0100 review data encoding with POST method commit 4c5b6ed017870c908ea47035f6111d9da5509747 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 15 15:11:18 2015 +0100 change 'Deleted' label to 'disable' for users, and redirect to users list after modify commit 993c8895145b30b256fa66bf427180a8dcb0556f Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 15 11:37:28 2015 +0100 fix error on user search with active, inactive, both Summary of changes: .../persistence/entity/CoselmarUserTopiaDao.java | 2 +- .../src/main/xmi/coselmar-model.zargo | Bin 10322 -> 10390 bytes .../fr/ifremer/coselmar/beans/DocumentBean.java | 12 ++++- .../coselmar/converter/BeanEntityConverter.java | 3 +- .../coselmar/services/v1/DocumentsWebService.java | 54 +++++++++++++++++++- coselmar-rest/src/main/resources/mapping | 3 +- coselmar-ui/src/main/webapp/index.html | 2 + .../src/main/webapp/js/coselmar-controllers.js | 56 ++++++++++++--------- .../main/webapp/js/coselmar-questions-services.js | 14 ++---- .../src/main/webapp/js/coselmar-services.js | 45 +++++++++++++++-- .../src/main/webapp/js/coselmar-user-services.js | 15 ++---- coselmar-ui/src/main/webapp/js/coselmar.js | 3 ++ .../src/main/webapp/views/documents/document.html | 4 ++ coselmar-ui/src/main/webapp/views/users/user.html | 2 +- coselmar-ui/src/main/webapp/views/users/users.html | 2 +- 15 files changed, 161 insertions(+), 56 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.