This is an automated email from the git hooks/post-receive script. New change to branch feature/7421 in repository faxtomail. See http://git.codelutin.com/faxtomail.git discards fbe4783 ajout d'un bouton pour cacher ou afficher les pj moins importantes (refs #7421) adds 02c1513 modification du modèle pour configurer les tmapons par utilisateur et groupe ldap (refs #7492) adds 7fe4e3f ajout de la conf par ldap des tampons dans l'admin (refs #7492) adds a1e24dc récupération des tampons pour l'utilisateur (refs #7492) adds 72ad43b fix NPE adds f25551a fixes #7492 Configurer les tampons par utilisateur/groupe LDAP, pas par dossier 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 20b2200 Fix release adds 6e49208 [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions adds afc64fc [jgitflow-maven-plugin]merging 'release/1.5' into 'master' adds 4b7614e [jgitflow-maven-plugin]merging 'master' into 'develop' adds a6a9df8 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 3781652 ajout d'un bouton pour cacher ou afficher les pj moins importantes (refs #7421) new 171e9e2 ajout des attributs sur les attachments pour marquer les pj internes à l'email et les pj moins importantes pour l'utilisateur (refs #7421) new 55ff993 migration #7421 new 7ab85c3 ui pour marque les pj comme non importantes (refs #7421) new b6b6713 Affichage des pj inline dans une liste séparée, affcihée ou non grâce à un bouton (refs #7421) 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 (fbe4783) \ N -- N -- N refs/heads/feature/7421 (b6b6713) 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 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 b6b6713a243f59b48dc138a315d2e7324d611d05 Author: Kevin Morin <morin@codelutin.com> Date: Mon Aug 31 18:12:36 2015 +0200 Affichage des pj inline dans une liste séparée, affcihée ou non grâce à un bouton (refs #7421) commit 7ab85c3f2fe50e8905afa478d6d3e81f32a5c43a Author: Kevin Morin <morin@codelutin.com> Date: Mon Aug 31 17:08:07 2015 +0200 ui pour marque les pj comme non importantes (refs #7421) commit 55ff99356243391cef694189cf60b907069922da Author: Kevin Morin <morin@codelutin.com> Date: Mon Aug 31 17:07:53 2015 +0200 migration #7421 commit 171e9e27b9de7824857b7436f6ac3ac57d037d28 Author: Kevin Morin <morin@codelutin.com> Date: Mon Aug 31 10:51:08 2015 +0200 ajout des attributs sur les attachments pour marquer les pj internes à l'email et les pj moins importantes pour l'utilisateur (refs #7421) commit 3781652a643c2062f755b1f1468444c4023e2507 Author: Kevin Morin <morin@codelutin.com> Date: Fri Aug 28 13:32:38 2015 +0200 ajout d'un bouton pour cacher ou afficher les pj moins importantes (refs #7421) Summary of changes: faxtomail-persistence/pom.xml | 2 +- ...sionCommandTopiaDao.java => StampTopiaDao.java} | 33 ++++--- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 32540 -> 32762 bytes faxtomail-service/pom.xml | 2 +- .../services/service/ConfigurationServiceImpl.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 ++++++++ ...d_attributes_for_less_important_attachments.sql | 5 + .../V1_5_0_150828__configure_stamps_by_ldap.sql | 59 ++++++++++++ ...d_attributes_for_less_important_attachments.sql | 6 ++ faxtomail-ui-swing/pom.xml | 2 +- .../content/attachment/AttachmentEditorUI.css | 31 ++++++ .../content/attachment/AttachmentEditorUI.jaxx | 18 +++- .../attachment/AttachmentEditorUIHandler.java | 52 +++++++++- .../attachment/AttachmentEditorUIModel.java | 81 +++++++++++++++- .../ui/swing/content/attachment/AttachmentItem.css | 1 + .../swing/content/attachment/AttachmentItem.jaxx | 3 + .../attachment/actions/EditAttachmentAction.java | 11 ++- .../ui/swing/util/AbstractToolbarPopupButton.java | 8 +- .../i18n/faxtomail-ui-swing_fr_FR.properties | 8 ++ .../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 +- .../WEB-INF/content/admin/configuration-input.jsp | 106 ++++++++++++--------- .../src/main/webapp/js/configuration.js | 70 +++++++------- pom.xml | 2 +- 29 files changed, 445 insertions(+), 135 deletions(-) copy faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/{ExtensionCommandTopiaDao.java => StampTopiaDao.java} (54%) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V1_5_0_150828__configure_stamps_by_ldap.sql 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_5_0_150828__configure_stamps_by_ldap.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>.