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 afc64fcb74d20cede2988854dd4d861ad566c3d4 Merge: 1c31180 6e49208 Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 31 10:15:23 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' 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 ++-- .../persistence/entities/StampTopiaDao.java | 51 ++++++++++ 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, 838 insertions(+), 415 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.