This is an automated email from the git hooks/post-receive script. New change to branch feature/9101_disable_open_unmodified_attachment in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git discards 2850bc4 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale 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 new eb8efb3 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale new 96e2192 refs #9101 ajout de la conf canViewOriginalAttachments dans les dossiers new 315f884 refs #9101 gestion de la conf canViewOriginalAttachments dans la partie admin new dac305a refs #9101 prise en compte de la conf canViewOriginalAttachments dans la partie cliente 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 (2850bc4) \ N -- N -- N refs/heads/feature/9101_disable_open_unmodified_attachment (dac305a) 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 dac305a08631ea20abb10e14653b37768938740b Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 11:29:39 2017 +0100 refs #9101 prise en compte de la conf canViewOriginalAttachments dans la partie cliente commit 315f88482cb0248f6bcc1e8f59e3d26a057a302e Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 11:29:19 2017 +0100 refs #9101 gestion de la conf canViewOriginalAttachments dans la partie admin commit 96e2192a0db2477015e7b7bb2839db4ad138a7b8 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 11:28:58 2017 +0100 refs #9101 ajout de la conf canViewOriginalAttachments dans les dossiers commit eb8efb321c6d4d193f8a0cd8c49ceabeb7f7b447 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 12:05:09 2017 +0100 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/EmailFilter.java | 13 +++++++++++ .../persistence/entities/EmailTopiaDao.java | 11 +++++++++ .../faxtomail/persistence/entities/MailField.java | 6 +++-- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35274 -> 35417 bytes faxtomail-service/pom.xml | 2 +- .../services/service/EmailServiceImpl.java | 2 ++ .../h2/V2_2_3_170315__add_last_printing_date.sql | 13 +++++++++++ ..._4_170316_1__add_canViewOriginalAttachments.sql | 4 ++++ .../V2_2_3_170315__add_last_printing_date.sql | 14 +++++++++++ ..._4_170316_1__add_canViewOriginalAttachments.sql | 6 +++++ faxtomail-ui-swing/pom.xml | 2 +- .../swing/actions/PrintOnDefaultPrinterAction.java | 1 + .../content/attachment/AttachmentCellEditor.java | 2 +- .../attachment/AttachmentEditorUIHandler.java | 26 +++++++++++++++------ .../attachment/AttachmentEditorUIModel.java | 13 +++++++++++ .../ui/swing/content/attachment/AttachmentItem.css | 10 ++++++-- .../swing/content/attachment/AttachmentItem.jaxx | 6 +++-- .../content/attachment/AttachmentModelAware.java | 2 ++ .../swing/content/attachment/ButtonAttachment.java | 5 ++++ .../content/demande/DemandeListUIHandler.java | 4 ++++ .../ui/swing/content/demande/DemandeUIModel.java | 26 +++++++++++++++++++-- .../util/AbstractFaxToMailDemandListHandler.java | 1 + .../faxtomail/ui/swing/util/DemandeTableModel.java | 6 +++++ .../i18n/faxtomail-ui-swing_fr_FR.properties | 2 ++ 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 | 17 ++++++++++++++ .../src/main/webapp/js/configuration.js | 4 ++++ pom.xml | 2 +- 31 files changed, 190 insertions(+), 21 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/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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.