This is an automated email from the git hooks/post-receive script. New change to branch feature/9098_user_trigraph_in_table in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git discards f151590 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente discards 9fcfbfd refs #9098 gestion de la conf displayOnlyUserTrigraphInTables dans la partie admin discards abe072a refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + migration adds 612fdef fixes #9097 ajout de la colonne imprimé le 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 4183bc2 [jgitflow-maven-plugin]updating poms for 2.3 branch with snapshot versions adds 282973c [jgitflow-maven-plugin]updating poms for branch'release/2.3' with non-snapshot versions adds 7febca8 [jgitflow-maven-plugin]merging 'release/2.3' into 'master' 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 new 7bbc801 refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + migration new 8b1fffe refs #9098 gestion de la conf displayOnlyUserTrigraphInTables dans la partie admin new 3b330c4 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente new 5d6d9e3 renommage des scripts de migration This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f151590) \ N -- N -- N refs/heads/feature/9098_user_trigraph_in_table (5d6d9e3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 4 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 5d6d9e313b3e4d757c94f60f465ed01f170ae2a1 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 28 11:37:23 2017 +0200 renommage des scripts de migration commit 3b330c49776b828c32d58d30528e4d80b9a469f8 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 11:11:47 2017 +0100 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente commit 8b1fffe06386d09af0f1e9dfeaeb147ab1ed2a92 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 11:11:15 2017 +0100 refs #9098 gestion de la conf displayOnlyUserTrigraphInTables dans la partie admin commit 7bbc801cb727a201671eb9195cc9fdd5bdf18240 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 11:10:47 2017 +0100 refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + migration Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../faxtomail/beans/QuantitiesByRange.java | 19 +++++- .../persistence/entities/EmailFilter.java | 13 ++++ .../persistence/entities/EmailTopiaDao.java | 57 ++++++++++++++-- .../faxtomail/persistence/entities/MailField.java | 6 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35357 -> 35759 bytes faxtomail-service/pom.xml | 2 +- .../services/service/EmailServiceImpl.java | 33 ++++------ .../h2/V2_2_3_170315__add_last_printing_date.sql | 13 ++++ ..._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 ++ ...328_1__add_displayOnlyUserTrigraphInTables.sql} | 0 .../V2_2_3_170315__add_last_printing_date.sql | 14 ++++ ..._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 ++ ...328_1__add_displayOnlyUserTrigraphInTables.sql} | 0 faxtomail-ui-swing/pom.xml | 2 +- .../swing/actions/PrintOnDefaultPrinterAction.java | 1 + .../ui/swing/actions/ShowDemandeAction.java | 70 ++++++++++++-------- .../content/attachment/AttachmentCellEditor.java | 2 +- .../attachment/AttachmentEditorUIHandler.java | 23 ++++++- .../attachment/AttachmentEditorUIModel.java | 13 ++++ .../ui/swing/content/attachment/AttachmentItem.css | 11 +++- .../swing/content/attachment/AttachmentItem.jaxx | 10 ++- .../content/attachment/AttachmentModelAware.java | 2 + .../swing/content/attachment/ButtonAttachment.java | 5 ++ .../content/demande/DemandeListUIHandler.java | 4 ++ .../ui/swing/content/demande/DemandeUIHandler.java | 40 ++++++------ .../ui/swing/content/demande/DemandeUIModel.java | 26 +++++++- .../actions/ComputeQuantitiesByRangeAction.java | 38 ++++++++--- .../actions/OpenGroupedDemandAction.java | 72 +++++++++++++-------- .../content/pdfeditor/PDFEditorUIHandler.java | 1 + .../util/AbstractFaxToMailDemandListHandler.java | 1 + .../ui/swing/util/AbstractFaxToMailUIHandler.java | 38 +++++++++-- .../faxtomail/ui/swing/util/DemandeTableModel.java | 6 ++ .../i18n/faxtomail-ui-swing_fr_FR.properties | 8 +++ faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/web/action/SearchAction.java | 6 ++ .../i18n/faxtomail-ui-web_fr_FR.properties | 1 + .../WEB-INF/content/admin/configuration-input.jsp | 68 +++++++++++++++++++ .../src/main/webapp/js/configuration.js | 16 +++++ pom.xml | 2 +- 46 files changed, 535 insertions(+), 132 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170315__add_last_printing_date.sql 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 rename faxtomail-service/src/main/resources/db/migration/h2/{V2_2_3_170315_1__add_displayOnlyUserTrigraphInTables.sql => V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql} (100%) create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170315__add_last_printing_date.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 rename faxtomail-service/src/main/resources/db/migration/sqlserver/{V2_2_3_170315_1__add_displayOnlyUserTrigraphInTables.sql => V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql} (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.