This is an automated email from the git hooks/post-receive script. New change to branch master in repository faxtomail. See http://git.codelutin.com/faxtomail.git from afc64fc [jgitflow-maven-plugin]merging 'release/1.5' into 'master' adds 730fcb7 [jgitflow-maven-plugin]updating poms for 1.6-SNAPSHOT development adds 572ee05 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4b7614e [jgitflow-maven-plugin]merging 'master' into 'develop' adds a6a9df8 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 3781652 ajout d'un bouton pour cacher ou afficher les pj moins importantes (refs #7421) adds 171e9e2 ajout des attributs sur les attachments pour marquer les pj internes à l'email et les pj moins importantes pour l'utilisateur (refs #7421) adds 55ff993 migration #7421 adds 7ab85c3 ui pour marque les pj comme non importantes (refs #7421) adds b6b6713 Affichage des pj inline dans une liste séparée, affcihée ou non grâce à un bouton (refs #7421) adds a0d223a détermination de la propriété inline des pj à la réception (refs #7421) adds 99c2c9d fixes #7421 gestion des pj internes à l'email adds 5e85d64 correction orthographe et conjugaison dans la doc adds 20654c9 [jgitflow-maven-plugin]updating poms for branch'release/1.6' with non-snapshot versions adds 757658a [jgitflow-maven-plugin]merging 'release/1.6' into 'master' No new revisions were added by this update. Summary of changes: faxtomail-persistence/pom.xml | 2 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 32674 -> 32762 bytes faxtomail-service/pom.xml | 2 +- .../services/service/ConfigurationServiceImpl.java | 2 + .../services/service/EmailServiceImpl.java | 4 +- ...d_attributes_for_less_important_attachments.sql | 5 ++ ...d_attributes_for_less_important_attachments.sql | 6 ++ faxtomail-ui-swing/pom.xml | 2 +- .../content/attachment/AttachmentEditorUI.css | 32 ++++++++ .../content/attachment/AttachmentEditorUI.jaxx | 34 ++++++++- .../attachment/AttachmentEditorUIHandler.java | 52 ++++++++++++- .../attachment/AttachmentEditorUIModel.java | 81 ++++++++++++++++++++- .../ui/swing/content/attachment/AttachmentItem.css | 1 + .../swing/content/attachment/AttachmentItem.jaxx | 3 + .../ui/swing/content/demande/DemandeUIModel.java | 2 +- .../i18n/faxtomail-ui-swing_fr_FR.properties | 7 ++ .../src/main/resources/icons/action-important.png | Bin 0 -> 672 bytes .../main/resources/icons/action-not-important.png | Bin 0 -> 671 bytes faxtomail-ui-web/pom.xml | 2 +- pom.xml | 4 +- src/site/rst/import.rst | 14 ++-- src/site/rst/index.rst | 2 +- src/site/rst/install.rst | 2 +- 23 files changed, 234 insertions(+), 25 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V1_6_0_150831__add_attributes_for_less_important_attachments.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V1_6_0_150831__add_attributes_for_less_important_attachments.sql create mode 100644 faxtomail-ui-swing/src/main/resources/icons/action-important.png create mode 100644 faxtomail-ui-swing/src/main/resources/icons/action-not-important.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.