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 1c3118017a31b268028d6a492732dcd4fa7402c8 Merge: 37dbae6 bdb7ca5 Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 26 15:57:43 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.4' into 'master' 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 + .../pdfeditor/PDFEditorStampImageUI.css} | 26 +- .../PDFEditorStampImageUI.jaxx} | 39 +- .../pdfeditor/PDFEditorStampTextUI.css} | 32 +- .../content/pdfeditor/PDFEditorStampTextUI.jaxx | 74 ++++ .../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 +- .../ReloadableListUI.java} | 18 +- .../SigningSettingsUIModel-error-validation.xml} | 34 +- .../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, 2684 insertions(+), 561 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.