This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit e22af4eff1a78eabebe0bb77e1d32968d7cf2d5e Merge: 0af01c54 381df58c Author: Jean Couteau <couteau@codelutin.com> Date: Fri Dec 15 08:45:09 2017 +0100 Merge branch 'feature/9526' into 'develop' Feature/9526 See merge request codelutin/faxtomail!4 .../faxtomail/persistence/entities/MailAction.java | 3 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 36206 -> 36261 bytes .../faxtomail/services/service/LdapService.java | 3 + .../services/service/LdapServiceImpl.java | 8 ++ .../services/service/MailFolderService.java | 2 + .../services/service/MailFolderServiceImpl.java | 27 +++++++ .../h2/V2_4_171128_1__add_showTakenByAction.sql | 4 + .../V2_4_171128_1__add_showTakenByAction.sql | 6 ++ .../ui/swing/content/demande/DemandeListUI.css | 8 ++ .../ui/swing/content/demande/DemandeListUI.jaxx | 1 + .../content/demande/DemandeListUIHandler.java | 9 +++ .../swing/content/demande/DemandeListUIModel.java | 26 ++++++ .../ui/swing/content/demande/TakenByFormUI.css | 40 +++++---- .../ui/swing/content/demande/TakenByFormUI.jaxx | 89 +++++++++++++++++++++ .../content/demande/TakenByFormUIHandler.java | 89 +++++++++++++++++++++ .../swing/content/demande/TakenByFormUIModel.java | 66 +++++++++++++++ .../demande/actions/OpenTakenByFormAction.java | 85 ++++++++++++++++++++ .../ui/swing/content/reply/ReplyFormUIHandler.java | 2 +- .../TakenByFormUIModel-error-validation.xml | 39 +++++++++ .../i18n/faxtomail-ui-swing_fr_FR.properties | 10 +++ .../WEB-INF/content/admin/configuration-input.jsp | 16 ++++ .../src/main/webapp/js/configuration.js | 4 + 22 files changed, 520 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.