This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit f25551a68d8a25151066ca92f745d4934b40542b Merge: b6698e5 72ad43b Author: Kevin Morin <morin@codelutin.com> Date: Mon Aug 31 09:56:16 2015 +0200 fixes #7492 Configurer les tampons par utilisateur/groupe LDAP, pas par dossier .../persistence/entities/StampTopiaDao.java | 27 ++++++ faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 32540 -> 32674 bytes .../services/service/MailFolderService.java | 2 - .../services/service/MailFolderServiceImpl.java | 19 ---- .../faxtomail/services/service/UserService.java | 3 + .../services/service/UserServiceImpl.java | 11 +++ .../h2/V1_5_0_150828__configure_stamps_by_ldap.sql | 41 ++++++++ .../V1_5_0_150828__configure_stamps_by_ldap.sql | 59 ++++++++++++ .../attachment/actions/EditAttachmentAction.java | 11 ++- .../ui/swing/util/AbstractToolbarPopupButton.java | 8 +- .../WEB-INF/content/admin/configuration-input.jsp | 106 ++++++++++++--------- .../src/main/webapp/js/configuration.js | 70 +++++++------- 12 files changed, 251 insertions(+), 106 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.