This is an automated email from the git hooks/post-receive script. New change to branch master in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 1c31180 [jgitflow-maven-plugin]merging 'release/1.4' into 'master' adds f95389b [jgitflow-maven-plugin]updating poms for 1.5-SNAPSHOT development adds 0069c48 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 0dde669 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 0749a8e [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 1ce94f6 move reply actions adds 0f68eed move reply actions adds 892445e move attachment actions adds f36f643 move demand actions adds 2b893c7 move search actions adds 83dbf52 move pdfeditor actions adds 45f2923 move pdfeditor actions adds 5048719 move demandgroup actions adds d43b575 move transmit actions adds d756fd8 remplacement du champ code client par une combobox de clients (refs #7422) adds 42eed45 déplacmeent du widget de validation de la main ui vers l'ui des demandes adds b13274a Correction de validation (refs #7422) adds 4f0a02c fix compilation error adds 00dd680 remplacement du champ code client par une combo avec les clients dans la recherche (refs #7422) adds 97d630d remplacement du champ code client par une combo avec les clients dans la recherche pour grouper (fixes #7422) adds 5915299 Ajout d’une colonne « Nom du client » pour les listes et la recherche (fixes #7423) adds 299b632 Lorsqu'on ouvre une réponse d'un élément dans le consultation des archives sur la partie web, et qu'on imprime, la réponse et le contenu de la demande se superposent à l'impression. fixes #7485 adds 1e0b8e0 suppression de la barre de mémoire dans la barre du bas adds 8ff61c7 alignement à droite du bouton de la popup de validation adds b6698e5 fix migration script adds 02c1513 modification du modèle pour configurer les tmapons par utilisateur et groupe ldap (refs #7492) adds 7fe4e3f ajout de la conf par ldap des tampons dans l'admin (refs #7492) adds a1e24dc récupération des tampons pour l'utilisateur (refs #7492) adds 72ad43b fix NPE adds f25551a fixes #7492 Configurer les tampons par utilisateur/groupe LDAP, pas par dossier adds 20b2200 Fix release adds 6e49208 [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions adds afc64fc [jgitflow-maven-plugin]merging 'release/1.5' into 'master' No new revisions were added by this update. Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/EmailFilter.java | 12 +++ .../persistence/entities/EmailTopiaDao.java | 20 +++- .../faxtomail/persistence/entities/MailField.java | 2 + .../persistence/entities/SearchFilter.java | 18 ++-- ...sionCommandTopiaDao.java => StampTopiaDao.java} | 33 ++++--- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 32540 -> 32674 bytes faxtomail-service/pom.xml | 2 +- .../faxtomail/services/service/ClientService.java | 7 ++ .../services/service/ClientServiceImpl.java | 39 ++++++++ .../faxtomail/services/service/EmailService.java | 2 +- .../services/service/EmailServiceImpl.java | 41 ++++---- .../services/service/InitFaxToMailServiceImpl.java | 2 +- .../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_4_0_150817__add_signings_to_users.sql | 6 +- .../V1_5_0_150828__configure_stamps_by_ldap.sql | 59 ++++++++++++ .../services/service/EmailServiceTest.java | 5 +- .../services/service/InitTestDataImpl.java | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../swing/actions/AbstractChangeScreenAction.java | 18 ---- .../ui/swing/actions/ShowDemandeAction.java | 20 +++- .../ui/swing/actions/ShowDemandeListAction.java | 16 ++++ .../ui/swing/actions/ShowRechercheAction.java | 15 ++- .../faxtomail/ui/swing/content/MainUI.css | 6 +- .../faxtomail/ui/swing/content/MainUI.jaxx | 3 - .../faxtomail/ui/swing/content/MainUIHandler.java | 11 --- .../content/attachment/AttachmentEditorUI.css | 2 +- .../attachment/AttachmentEditorUIHandler.java | 4 +- .../attachment}/actions/AddAttachmentAction.java | 3 +- .../attachment}/actions/EditAttachmentAction.java | 14 +-- .../attachment}/actions/OpenAttachmentAction.java | 3 +- .../content/demande/DemandeListTableFilter.java | 26 +++-- .../ui/swing/content/demande/DemandeListUI.css | 6 +- .../content/demande/DemandeListUIHandler.java | 11 ++- .../ui/swing/content/demande/DemandeUI.css | 10 +- .../ui/swing/content/demande/DemandeUI.jaxx | 50 +++++----- .../ui/swing/content/demande/DemandeUIHandler.java | 25 ++++- .../ui/swing/content/demande/DemandeUIModel.java | 43 ++++----- .../ui/swing/content/demande/DemandesUI.css | 10 ++ .../ui/swing/content/demande/DemandesUI.jaxx | 63 +++++++----- .../swing/content/demande/DemandesUIHandler.java | 31 +++--- .../demande}/actions/ArchiveAction.java | 2 +- .../demande}/actions/ArchiveFromListAction.java | 2 +- .../actions/ComputeQuantitiesByRangeAction.java | 3 +- .../demande}/actions/LoadFolderEmailsAction.java | 3 +- .../OpenMailFolderChooserFromListAction.java | 3 +- .../demande}/actions/OpenReplyFormAction.java | 3 +- .../SaveAndOpenChooseAttachmentToPrintAction.java | 2 +- .../SaveAndOpenMailFolderChooserAction.java | 2 +- .../actions/SaveAndOpenModalFrameAction.java | 2 +- .../actions/SaveAndOpenReplyFormAction.java | 2 +- .../actions/SaveAndOpenSearchToGroupAction.java | 12 ++- .../demande}/actions/SaveDemandeAction.java | 35 ++++--- .../demande}/actions/SaveDemandeAndExitAction.java | 2 +- .../actions/SaveDemandeFromListAction.java | 3 +- .../demande/demandgroup/DemandGroupUIHandler.java | 2 +- .../actions/OpenGroupedDemandAction.java | 16 +++- .../demande/replies/DemandRepliesUIHandler.java | 2 +- .../demande/replies}/actions/OpenReplyAction.java | 3 +- .../ui/swing/content/pdfeditor/PDFEditorUI.css | 2 +- .../content/pdfeditor/PDFEditorUIHandler.java | 2 +- .../actions/GenerateAnnotatedAttachmentAction.java | 3 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 2 +- .../reply}/actions/AddAttachmentToReplyAction.java | 3 +- .../ui/swing/content/search/SearchToGroupUI.css | 7 +- .../ui/swing/content/search/SearchToGroupUI.jaxx | 6 +- .../content/search/SearchToGroupUIHandler.java | 11 ++- .../faxtomail/ui/swing/content/search/SearchUI.css | 5 + .../ui/swing/content/search/SearchUI.jaxx | 6 +- .../ui/swing/content/search/SearchUIHandler.java | 10 +- .../ui/swing/content/search/SearchUIModel.java | 26 +++-- .../{ => content/search}/actions/GroupAction.java | 3 +- .../{ => content/search}/actions/SearchAction.java | 3 +- .../search}/actions/SearchToGroupAction.java | 3 +- .../swing/content/transmit/MailFolderChooserUI.css | 2 +- .../transmit}/actions/TransmitAction.java | 4 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 39 -------- .../ui/swing/util/AbstractToolbarPopupButton.java | 8 +- .../faxtomail/ui/swing/util/DemandeTableModel.java | 10 +- .../demande/DemandeUIModel-error-validation.xml | 6 +- .../i18n/faxtomail-ui-swing_fr_FR.properties | 12 ++- faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/web/action/SearchAction.java | 4 + .../faxtomail/web/job/MailFilterJob.java | 1 - .../i18n/faxtomail-ui-web_fr_FR.properties | 1 + .../WEB-INF/content/admin/configuration-input.jsp | 106 ++++++++++++--------- .../main/webapp/WEB-INF/content/demand-detail.jsp | 34 +++++++ .../src/main/webapp/css/demand-detail.css | 21 +++- .../src/main/webapp/js/configuration.js | 70 +++++++------- .../src/main/webapp/js/demand-detail.js | 2 + pom.xml | 2 +- 95 files changed, 808 insertions(+), 427 deletions(-) copy faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/{ExtensionCommandTopiaDao.java => StampTopiaDao.java} (54%) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V1_5_0_150828__configure_stamps_by_ldap.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V1_5_0_150828__configure_stamps_by_ldap.sql rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/attachment}/actions/AddAttachmentAction.java (95%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/attachment}/actions/EditAttachmentAction.java (88%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/attachment}/actions/OpenAttachmentAction.java (94%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/ArchiveAction.java (98%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/ArchiveFromListAction.java (98%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/ComputeQuantitiesByRangeAction.java (95%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/LoadFolderEmailsAction.java (98%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/OpenMailFolderChooserFromListAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/OpenReplyFormAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/SaveAndOpenChooseAttachmentToPrintAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/SaveAndOpenMailFolderChooserAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/SaveAndOpenModalFrameAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/SaveAndOpenReplyFormAction.java (97%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/SaveAndOpenSearchToGroupAction.java (70%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/SaveDemandeAction.java (86%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/SaveDemandeAndExitAction.java (95%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/SaveDemandeFromListAction.java (94%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande/demandgroup}/actions/OpenGroupedDemandAction.java (93%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande/replies}/actions/OpenReplyAction.java (97%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/pdfeditor}/actions/GenerateAnnotatedAttachmentAction.java (98%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/reply}/actions/AddAttachmentToReplyAction.java (94%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/search}/actions/GroupAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/search}/actions/SearchAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/search}/actions/SearchToGroupAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/transmit}/actions/TransmitAction.java (96%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.