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 37dbae6 Merge branch 'release/1.3.1' adds f03a275 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 210e919 Merge branch 'master' into develop adds 01d1d93 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 035fcea Ouverture simultanée de plusieurs éléments (fixes #7332) adds 2e7b255 update pom version adds 90837aa fixes #7414 Erreur quand on veut créer une nouvelle demande dans un dossier adds ccc25c7 Mettre à jour la liste dans le dossier quand on quitte l'édition d'une demande fixes #7415 adds df5ead2 fixes #7417 [Liste des demandes] Erreur quand on clique sur une cellule de pj, puis ailleurs adds 6fd8dce fixes #7418 Ouverture de l'éditeur de PJ sur le même écran que lors du dernier traitement adds 7603abb fix NPE adds 62c4ef1 modification du modèle (ajout des tampons) (refs #7424) adds a7a1c9e ajout de la migration pour sqlserver (refs #7424) adds fd1d108 début de l'interface d'admin (possibilité de créer des tampons texte seulement) (refs #7424) adds 37d8f5b Ajout des tampons dans l'éditeur de pdf (seulement type texte) (refs #7424) adds addb08a - finalisation de l'interface d'admin - ajout des tampons dans l'éditeur de PDF (fixes #7424) adds 642f7df Merge branch 'feature/7424' into develop adds 0803608 ajout des signatures dans le modèle + migration (refs #7419) adds 53ec3ff ajout de la signature dans le formulaire de réponse + début d'écran de configuration des signatures (refs #7419) adds 0810bf0 - modif du modèle de signatures (plus de Signing, directement des stamp et un lien entre le stamp et le user pour le default) - enregistrement des signatures et mise par défaut refs #7419 adds 9d34a5b - Envoi de la signature dans la réponse - mise en page refs #7419 adds 0dd9e95 fixes #7419 adds 533f73d add license adds 1d2a7cb add missing dependency adds 99e0b81 ajout de la suppression des signatures + validators adds 140416b ajout de la suppression des signatures + validators adds d216c2a test de timer adds 07be950 raffraichissement automatique fixes #7420 adds 78572e2 Merge branch 'feature/7420' into develop adds 11b6145 upgrade version adds bdb7ca5 [jgitflow-maven-plugin]updating poms for branch'release/1.4' with non-snapshot versions adds 1c31180 [jgitflow-maven-plugin]merging 'release/1.4' into 'master' No new revisions were added by this update. Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../faxtomail/FaxToMailConfiguration.java | 17 +- .../faxtomail/FaxToMailConfigurationOption.java | 17 +- .../i18n/faxtomail-persistence_fr_FR.properties | 1 + .../src/main/xmi/faxtomail.properties | 5 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 31055 -> 32540 bytes faxtomail-service/pom.xml | 2 +- .../services/service/ConfigurationService.java | 11 +- .../services/service/ConfigurationServiceImpl.java | 72 ++-- .../faxtomail/services/service/EmailService.java | 3 +- .../services/service/EmailServiceImpl.java | 14 +- .../services/service/InitFaxToMailServiceImpl.java | 29 +- .../services/service/LdapServiceImpl.java | 1 + .../services/service/MailFolderService.java | 3 + .../services/service/MailFolderServiceImpl.java | 20 +- .../services/service/ReferentielService.java | 4 + .../services/service/ReferentielServiceImpl.java | 15 + .../faxtomail/services/service/UserService.java | 5 + .../services/service/UserServiceImpl.java | 55 +++ .../services/service/ldap/LdapServiceMock.java | 2 + .../h2/V1_4_0_150811__add_pdf_editor_stamps.sql | 36 ++ .../h2/V1_4_0_150817__add_signings_to_users.sql | 19 + .../V1_4_0_150811__add_pdf_editor_stamps.sql | 39 ++ .../V1_4_0_150817__add_signings_to_users.sql | 19 + faxtomail-ui-swing/pom.xml | 7 +- .../faxtomail/ui/swing/FaxToMailScreen.java | 2 - .../faxtomail/ui/swing/FaxToMailUIContext.java | 11 + .../ui/swing/actions/EditAttachmentAction.java | 23 +- .../actions/GenerateAnnotatedAttachmentAction.java | 318 ++++++++++------ .../ui/swing/actions/LoadFolderEmailsAction.java | 4 +- .../ui/swing/actions/OpenGroupedDemandAction.java | 13 +- .../ui/swing/actions/SaveDemandeAndExitAction.java | 4 +- .../ui/swing/actions/ShowDemandeAction.java | 56 ++- .../faxtomail/ui/swing/content/MainUIHandler.java | 28 +- .../content/attachment/AttachmentEditorUI.jaxx | 9 + .../swing/content/attachment/ButtonAttachment.java | 5 +- .../content/demande/DemandeListUIHandler.java | 31 +- .../ui/swing/content/demande/DemandeUIHandler.java | 22 +- .../ui/swing/content/demande/DemandesUI.css | 6 +- .../ui/swing/content/demande/DemandesUI.jaxx | 41 ++- .../swing/content/demande/DemandesUIHandler.java | 14 +- .../demande/demandgroup/ButtonEmailGroup.java | 5 +- .../demandgroup/DemandGroupHighlightDialog.java | 3 +- .../content/demande/demandgroup/DemandGroupUI.jaxx | 9 + .../content/demande/history/ButtonHistory.java | 5 +- .../content/demande/history/HistoryListUI.jaxx | 9 + .../demande/replies/ButtonDemandReplies.java | 5 +- .../content/demande/replies/DemandRepliesUI.jaxx | 9 + ...FEditorLineUI.css => PDFEditorStampImageUI.css} | 11 +- ...ghlighterUI.jaxx => PDFEditorStampImageUI.jaxx} | 18 +- ...DFEditorNoteUI.css => PDFEditorStampTextUI.css} | 23 +- ...EditorNoteUI.jaxx => PDFEditorStampTextUI.jaxx} | 28 +- .../ui/swing/content/pdfeditor/PDFEditorUI.jaxx | 2 +- .../content/pdfeditor/PDFEditorUIHandler.java | 406 +++++++++++++++------ .../swing/content/pdfeditor/PDFEditorUIModel.java | 64 +++- .../ui/swing/content/reply/ReplyFormUI.css | 41 ++- .../ui/swing/content/reply/ReplyFormUI.jaxx | 43 ++- .../ui/swing/content/reply/ReplyFormUIHandler.java | 15 +- .../ui/swing/content/reply/ReplyFormUIModel.java | 13 + .../ui/swing/content/reply/SigningSettingsUI.css | 95 +++++ .../ui/swing/content/reply/SigningSettingsUI.jaxx | 101 +++++ .../content/reply/SigningSettingsUIHandler.java | 178 +++++++++ .../content/reply/SigningSettingsUIModel.java | 152 ++++++++ .../content/reply/actions/DeleteSigningAction.java | 94 +++++ .../content/reply/actions/NewSigningAction.java | 84 +++++ .../reply/actions/OpenSigningSettingsAction.java | 72 ++++ .../{ => content/reply}/actions/ReplyAction.java | 4 +- .../content/reply/actions/SaveSigningAction.java | 74 ++++ .../reply/actions/SetDefaultSigningAction.java | 74 ++++ .../content/search/SearchToGroupUIHandler.java | 5 + .../ui/swing/content/search/SearchUIHandler.java | 6 + .../util/AbstractFaxToMailDemandListHandler.java | 4 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 29 +- .../ui/swing/util/AbstractToolbarPopupButton.java | 45 +++ .../ui/swing/util/AbstractToolbarPopupHandler.java | 4 + .../ui/swing/util/AbstractToolbarPopupUI.jaxx | 4 +- ...IMessageNotifier.java => ReloadableListUI.java} | 14 +- .../SigningSettingsUIModel-error-validation.xml | 21 +- .../i18n/faxtomail-ui-swing_fr_FR.properties | 23 ++ .../src/main/resources/icons/action-default.png | Bin 0 -> 670 bytes .../src/main/resources/icons/action-settings.png | Bin 0 -> 512 bytes .../src/main/resources/icons/stamp.png | Bin 0 -> 588 bytes faxtomail-ui-swing/src/main/resources/log4j2.xml | 1 + faxtomail-ui-web/pom.xml | 2 +- .../web/action/admin/ConfigurationAction.java | 31 +- .../WEB-INF/content/admin/configuration-input.jsp | 202 +++++++--- .../src/main/webapp/js/configuration.js | 106 +++++- pom.xml | 18 +- 88 files changed, 2573 insertions(+), 564 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V1_4_0_150811__add_pdf_editor_stamps.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V1_4_0_150817__add_signings_to_users.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V1_4_0_150811__add_pdf_editor_stamps.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V1_4_0_150817__add_signings_to_users.sql copy faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/{PDFEditorLineUI.css => PDFEditorStampImageUI.css} (87%) copy faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/{PDFEditorHighlighterUI.jaxx => PDFEditorStampImageUI.jaxx} (72%) copy faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/{PDFEditorNoteUI.css => PDFEditorStampTextUI.css} (76%) copy faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/{PDFEditorNoteUI.jaxx => PDFEditorStampTextUI.jaxx} (69%) create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/SigningSettingsUI.css create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/SigningSettingsUI.jaxx create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/SigningSettingsUIHandler.java create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/SigningSettingsUIModel.java create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/DeleteSigningAction.java create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/NewSigningAction.java create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/OpenSigningSettingsAction.java rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/reply}/actions/ReplyAction.java (94%) create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/SaveSigningAction.java create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/SetDefaultSigningAction.java copy faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/{UIMessageNotifier.java => ReloadableListUI.java} (79%) copy faxtomail-service/src/main/resources/com/franciaflex/faxtomail/persistence/entities/Email-error-validation.xml => faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/SigningSettingsUIModel-error-validation.xml (68%) create mode 100644 faxtomail-ui-swing/src/main/resources/icons/action-default.png create mode 100644 faxtomail-ui-swing/src/main/resources/icons/action-settings.png create mode 100644 faxtomail-ui-swing/src/main/resources/icons/stamp.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.