branch master updated (dd7b442 -> aecf96a)
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 dd7b442 Merge branch 'release/1.2' adds 69bbf29 [jgitflow-maven-plugin]updating poms for 1.3-SNAPSHOT development adds cef9cf3 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 75e53d6 Merge branch 'master' into develop adds 334943b [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds b0ca3da fixes #7076 Ajouter l'heure de livraison dans le fichier EDI adds f9a175e fixes #7077 Affichage d’une infobulle lorsqu’il y a des éléments groupés adds e6e1372 Fix release . add license adds 6021d21 [jgitflow-maven-plugin]updating poms for branch'release/1.3' with non-snapshot versions adds aecf96a Merge branch 'release/1.3' No new revisions were added by this update. Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../faxtomail/FaxToMailConfiguration.java | 12 ++ .../faxtomail/FaxToMailConfigurationOption.java | 18 +++ .../i18n/faxtomail-persistence_fr_FR.properties | 4 + faxtomail-service/pom.xml | 2 +- .../services/service/EmailServiceImpl.java | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/content/demande/DemandesUI.jaxx | 6 +- .../swing/content/demande/DemandesUIHandler.java | 11 +- .../demandgroup/DemandGroupHighlightDialog.java | 162 +++++++++++++++++++++ .../faxtomail/ui/swing/util/CloseButton.java | 92 ++++++++++++ .../i18n/faxtomail-ui-swing_fr_FR.properties | 1 + .../src/main/resources/icons/close-white.png | Bin 0 -> 233 bytes faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 15 files changed, 310 insertions(+), 8 deletions(-) create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CloseButton.java create mode 100644 faxtomail-ui-swing/src/main/resources/icons/close-white.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm