This is an automated email from the git hooks/post-receive script. New change to branch faxtomail-2.3.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 02ad8f4 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 2fa81c1 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 404df93 [jgitflow-maven-plugin]updating poms for 2.4-SNAPSHOT development adds 6535bec [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds efb4aad [jgitflow-maven-plugin]merging 'master' into 'develop' adds 4adc0cb [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds eb8efb3 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale adds 96e2192 refs #9101 ajout de la conf canViewOriginalAttachments dans les dossiers adds 315f884 refs #9101 gestion de la conf canViewOriginalAttachments dans la partie admin adds dac305a refs #9101 prise en compte de la conf canViewOriginalAttachments dans la partie cliente adds bd07a3e fixes #9101 Ouvrir les pièces-jointes que en modification adds 2d536bc refs #9094 affichage d'un message de warning et ouverture en edition adds 667f866 refs #9094 ajout de la conf mustTakeToEditDemand dans les dossiers adds a026aa0 refs #9094 gestion de la conf mustTakeToEditDemand dans la partie admin adds 6b1dcef refs #9094 prise en compte de la conf mustTakeToEditDemand dans la partie cliente adds dd3a3cd fixes #9094 Demandes toujours ouvertes en modification adds a6d3711 refs #9094 fix npe adds 52d9074 refs #9109 ajout de la conf displayHelpOnMessages dans les dossiers adds 4c24877 refs #9109 gestion de la conf displayHelpOnMessages dans la partie admin adds 21cd5b7 refs #9109 prise en compte de la conf displayHelpOnMessages dans la partie cliente adds 3ced46d fixes #9109 Simplifier le message pour quitter la demande adds bab2e84 refs #9105 ajout de la conf computeQuantitiesSubtotalsByState dans les dossiers adds 89074c5 refs #9105 gestion de la conf computeQuantitiesSubtotalsByState dans la partie admin adds fe0ebb0 refs #9105 prise en compte de la conf computeQuantitiesSubtotalsByState dans la partie cliente adds 4d97dec fixes #9105 Modifier l'écran des quantités par gamme :ajouter les totaux sur les colonnes en fonction de l'état de la demande. adds ac713b3 fixes #9105 NPE si le dossier est vide adds 7bbc801 refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + migration adds 8b1fffe refs #9098 gestion de la conf displayOnlyUserTrigraphInTables dans la partie admin adds 3b330c4 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente adds 5d6d9e3 renommage des scripts de migration adds 0703d50 fixes #9098 Colonne "Pris par" : n'afficher que le tryptique (gain de place) adds 6ea48a1 refs #9103 ajout de la conf pour afficher ou non les boutons repondre et transférer dans les dossiers adds 27d6a5a refs #9103 gestion de la conf de répondre et transférer dans la partie admin adds 39ab5e9 refs #9103 prise en compte de la conf des fonctions répondre et transférer dans la partie cliente adds bd0dddd fixes #9103 Ajouter une fonction transférer, pour transférer une demande avec toutes les pièces jointes qui ne sont pas dans "Divers" adds 11b71d6 fixes #9095 le pris par n'est pas enregistré quand on imprime depuis la liste adds b7fb956 fix lazy loading adds 77c2b73 suppression code mort adds f339092 fix filter adds abcabd8 refs #9099 ajout de la conf canChangeOrderInTable dans les dossiers adds 79eca5d refs #9099 gestion de la conf canChangeOrderInTable dans la partie admin adds 07601c6 refs #9099 prise en compte de la conf canChangeOrderInTable dans la partie cliente adds 5ace615 add license header adds 0275598 refs #9099 enregistrement du tri pour chaque dossier adds 4247750 ajout du header de license adds 560a494 refs #9099 merge model + change migrtaion file names adds 51154fd fixes #9099 Ajouter le tri sur les colonnes adds 9bb7b96 refs #9099 correction du changement de page adds 216e057 refs #9096 ne pas imprimer les pj inline par defaut adds be551e9 refs #9096 #9100 #9104 ajout des configurations adds 975a31d suppression code mort adds 8e7e3b0 refs #9096 #9100 #9104 ajout des configurations dans l'admin adds 08c3256 refs #9096 #9100 #9104 - impression ou non des pièces jointes de type inline - affichage des pj à la suite de l'email - affichage de la pj de conenu du mail dans le men "divers" adds d19e6b3 repositionnement "manuel" du séparateur pour ne pas avoir des positionnements par dossier adds af7ab6a fixes #9096 Ne pas imprimer les pièces-jointes "contenu du mail texte" et "contenu du mail html" fixes #9100 Mettre les pièces "contenu du mail texte" et le "contenu du mail html" dans le bouton "Divers" fixes #9104 Afficher la 1ère pièce -jointe dans l'aperçu de l'élément adds f965b79 sauvegarde dans la session du separateur hors hierarchie adds d791361 refs #9107 #9108 sauvegarde de l'état de l'arbre dans la session swing et plus dans le contexte adds ab49fc1 fixes #9099 mauvais tri si on affiche le nom entier dans les colonnes representant des utilisateurs + correction sur des requetes qui ne passent pas sur sqlserver adds aeece0d fixes #9103 ne pas ajouter les PJ de contenu du mail adds 9793385 correction du nombre de PJ dans la liste quand il y a des PJ dans divers adds 9d98426 correction du séparateur qui se positionne mal au démarrage adds a472081 fix test adds 47caf2a correction de la position du separateur de l'arbre et la liste adds 7897fb6 fixes #9104 ouvrir la PJ en edition au double clique adds 6b973ee fix typo adds 511972c ajout d'un libellé adds bbc51af mauvaise récursivité adds 23c3f82 use stable version of jaxx new 4eef05e [jgitflow-maven-plugin]updating poms for branch'release/2.4' with non-snapshot versions new f5c4760 bad merge? new bde00c0 [jgitflow-maven-plugin]merging 'master' into 'faxtomail-2.3.x' new 88855bc [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 88855bc19234a6ddacf58f937b721b5dc0bae706 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 20 10:46:49 2017 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit bde00c0e594634e0b12e7604436ac9122bd93860 Merge: 2fa81c1 f5c4760 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 20 10:46:48 2017 +0200 [jgitflow-maven-plugin]merging 'master' into 'faxtomail-2.3.x' commit 2fa81c15286bcabb4197190b1bf635389b549b4d Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 20 10:46:48 2017 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit f5c47607960dd7aa0bc9a1124c4e6865b7fcde49 Merge: d6962e3 4eef05e Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 20 10:44:40 2017 +0200 bad merge? commit 4eef05e11f99606e874baaa52ae0e009c85704bc Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 20 10:38:14 2017 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4' with non-snapshot versions Summary of changes: .../faxtomail/beans/QuantitiesByRange.java | 19 +- .../entities/AbstractFaxToMailTopiaDao.java | 32 ++ .../persistence/entities/EmailFilter.java | 3 +- .../persistence/entities/EmailTopiaDao.java | 446 +++++++++++++-------- .../faxtomail/persistence/entities/MailAction.java | 1 + .../faxtomail/persistence/entities/MailField.java | 68 ++-- .../src/main/resources/faxToMail.properties | 2 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35324 -> 36206 bytes .../faxtomail/services/DecoratorService.java | 1 + .../faxtomail/services/DecoratorServiceImpl.java | 1 + .../services/service/EmailServiceImpl.java | 63 +-- ..._4_170316_1__add_canViewOriginalAttachments.sql | 4 + .../h2/V2_4_170316_2__add_mustTakeToEditDemand.sql | 4 + .../V2_4_170316_3__add_displayHelpOnMessages.sql | 4 + ...17_1__add_computeQuantitiesSubtotalsByState.sql | 4 + ...0328_1__add_displayOnlyUserTrigraphInTables.sql | 4 + .../h2/V2_4_170328_2__add_show_actions_config.sql | 5 + .../V2_4_170330_1__add_canChangeOrderInTable.sql | 4 + ...ttachments_mailContentWithInlineAttachments.sql | 11 + .../V2_4_170403_1__add_showAttachmentPreview.sql | 4 + ..._4_170316_1__add_canViewOriginalAttachments.sql | 6 + .../V2_4_170316_2__add_mustTakeToEditDemand.sql | 6 + .../V2_4_170316_3__add_displayHelpOnMessages.sql | 6 + ...17_1__add_computeQuantitiesSubtotalsByState.sql | 6 + ...0328_1__add_displayOnlyUserTrigraphInTables.sql | 6 + .../V2_4_170328_2__add_show_actions_config.sql | 7 + .../V2_4_170330_1__add_canChangeOrderInTable.sql | 6 + ...ttachments_mailContentWithInlineAttachments.sql | 15 + .../V2_4_170403_1__add_showAttachmentPreview.sql | 5 + .../services/service/EmailServiceTest.java | 2 +- .../faxtomail/ui/swing/FaxToMailUIContext.java | 6 + .../faxtomail/ui/swing/RunFaxToMail.java | 9 +- .../ui/swing/actions/ShowDemandeAction.java | 70 ++-- .../faxtomail/ui/swing/content/MainUIHandler.java | 13 +- .../content/attachment/AttachmentCellEditor.java | 12 +- .../content/attachment/AttachmentCellRenderer.java | 8 - .../content/attachment/AttachmentEditorUI.jaxx | 10 +- .../attachment/AttachmentEditorUIHandler.java | 45 ++- .../attachment/AttachmentEditorUIModel.java | 36 +- .../ui/swing/content/attachment/AttachmentItem.css | 11 +- .../swing/content/attachment/AttachmentItem.jaxx | 8 +- .../content/attachment/AttachmentModelAware.java | 4 + .../swing/content/attachment/ButtonAttachment.java | 9 + .../content/demande/DemandeListTableFilter.java | 4 +- .../ui/swing/content/demande/DemandeListUI.css | 10 + .../ui/swing/content/demande/DemandeListUI.jaxx | 3 +- .../content/demande/DemandeListUIHandler.java | 142 +++++-- .../swing/content/demande/DemandeListUIModel.java | 107 ++++- .../ui/swing/content/demande/DemandeUIHandler.java | 40 +- .../ui/swing/content/demande/DemandeUIModel.java | 28 ++ .../ui/swing/content/demande/DemandesUI.css | 8 + .../ui/swing/content/demande/DemandesUI.jaxx | 38 +- .../swing/content/demande/DemandesUIHandler.java | 30 +- .../ui/swing/content/demande/DemandesUIModel.java | 36 ++ .../actions/ComputeQuantitiesByRangeAction.java | 38 +- .../demande/actions/LoadFolderEmailsAction.java | 32 +- ...yFormAction.java => OpenForwardFormAction.java} | 17 +- .../demande/actions/OpenReplyFormAction.java | 1 + ...tion.java => SaveAndOpenForwardFormAction.java} | 17 +- .../actions/SaveAndOpenReplyFormAction.java | 2 +- .../actions/OpenGroupedDemandAction.java | 72 ++-- .../demande/replies/DemandRepliesUIHandler.java | 1 + .../demande/replies/actions/OpenReplyAction.java | 5 +- .../content/pdfeditor/PDFEditorUIHandler.java | 5 +- .../print/AttachmentToPrintChooserUIHandler.java | 20 +- .../ui/swing/content/reply/ReplyFormUI.css | 10 +- .../ui/swing/content/reply/ReplyFormUI.jaxx | 33 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 67 +++- .../ui/swing/content/reply/ReplyFormUIModel.java | 12 + .../content/search/SearchToGroupUIHandler.java | 5 + .../ui/swing/content/search/SearchUIHandler.java | 5 + .../transmit/MailFolderChooserUIHandler.java | 16 +- .../util/AbstractFaxToMailDemandListHandler.java | 9 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 43 +- .../swing/util/DemandeListUISwingSessionState.java | 99 +++++ .../faxtomail/ui/swing/util/DemandeTableModel.java | 65 +-- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 134 +++++-- .../util/FilterSortableTableHeaderRenderer.java | 97 +++++ .../ui/swing/util/FolderTreeSwingSessionState.java | 106 +++++ .../i18n/faxtomail-ui-swing_fr_FR.properties | 10 + .../src/main/resources/icons/sort_table_asc.png | Bin 0 -> 219 bytes .../src/main/resources/icons/sort_table_desc.png | Bin 0 -> 208 bytes .../i18n/faxtomail-ui-web_fr_FR.properties | 1 + .../WEB-INF/content/admin/configuration-input.jsp | 275 +++++++++++-- .../src/main/webapp/js/configuration.js | 60 ++- pom.xml | 6 +- 86 files changed, 2064 insertions(+), 631 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170316_1__add_canViewOriginalAttachments.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170316_2__add_mustTakeToEditDemand.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170316_3__add_displayHelpOnMessages.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170317_1__add_computeQuantitiesSubtotalsByState.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170328_2__add_show_actions_config.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170330_1__add_canChangeOrderInTable.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170330_2__add_mailContentType_printinlineattachments_mailContentWithInlineAttachments.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170403_1__add_showAttachmentPreview.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_1__add_canViewOriginalAttachments.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_2__add_mustTakeToEditDemand.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_3__add_displayHelpOnMessages.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170317_1__add_computeQuantitiesSubtotalsByState.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170328_2__add_show_actions_config.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170330_1__add_canChangeOrderInTable.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170330_2__add_mailContentType_printinlineattachments_mailContentWithInlineAttachments.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170403_1__add_showAttachmentPreview.sql copy faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/{OpenReplyFormAction.java => OpenForwardFormAction.java} (83%) copy faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/{SaveAndOpenReplyFormAction.java => SaveAndOpenForwardFormAction.java} (77%) create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeListUISwingSessionState.java create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FilterSortableTableHeaderRenderer.java create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeSwingSessionState.java create mode 100644 faxtomail-ui-swing/src/main/resources/icons/sort_table_asc.png create mode 100644 faxtomail-ui-swing/src/main/resources/icons/sort_table_desc.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.