branch develop updated (2ff0787 -> 5197038)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 2ff0787 [jgitflow-maven-plugin]updating poms for 1.4-SNAPSHOT development new eba7b2c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new e6e1372 Fix release . add license new 6021d21 [jgitflow-maven-plugin]updating poms for branch'release/1.3' with non-snapshot versions new aecf96a Merge branch 'release/1.3' new 9249546 Merge branch 'master' into develop new 5197038 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 51970383a064b95de81c7b56e48e9a39f6bc624e Author: Maven Release <maven-release@codelutin.com> Date: Thu May 7 10:57:38 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 9249546b9c569d35ea5d3f199c102d8957c0946d Merge: eba7b2c aecf96a Author: Maven Release <maven-release@codelutin.com> Date: Thu May 7 10:57:38 2015 +0000 Merge branch 'master' into develop commit eba7b2c8fa17cb0d9ed2bb5742bf55b170ee8b6a Author: Maven Release <maven-release@codelutin.com> Date: Thu May 7 10:57:38 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit aecf96a871377e0d650fabad2b0c1b134ace0250 Merge: dd7b442 6021d21 Author: Maven Release <maven-release@codelutin.com> Date: Thu May 7 10:57:36 2015 +0000 Merge branch 'release/1.3' commit 6021d21ca53ef9b743150ed7007ce74b2f63a406 Author: Maven Release <maven-release@codelutin.com> Date: Thu May 7 10:55:22 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.3' with non-snapshot versions commit e6e1372c6b7d43f7d7df276bd5086468a45874ae Author: Maven Release <maven-release@codelutin.com> Date: Thu May 7 10:54:47 2015 +0000 Fix release . add license Summary of changes: .../i18n/faxtomail-persistence_fr_FR.properties | 2 ++ .../demandgroup/DemandGroupHighlightDialog.java | 24 ++++++++++++++++++++++ .../faxtomail/ui/swing/util/CloseButton.java | 24 ++++++++++++++++++++++ 3 files changed, 50 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit e6e1372c6b7d43f7d7df276bd5086468a45874ae Author: Maven Release <maven-release@codelutin.com> Date: Thu May 7 10:54:47 2015 +0000 Fix release . add license --- .../i18n/faxtomail-persistence_fr_FR.properties | 2 ++ .../demandgroup/DemandGroupHighlightDialog.java | 24 ++++++++++++++++++++++ .../faxtomail/ui/swing/util/CloseButton.java | 24 ++++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties b/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties index 82bb308..f226c51 100644 --- a/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties +++ b/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties @@ -49,3 +49,5 @@ faxtomail.service.config.deleteTempDirectory.error= faxtomail.service.mkDir.error= faxtomail.ui.color.delay.groupedDemandWarningDialog.description= faxtomail.ui.color.groupedDemandWarningDialog.description= +faxtomail.ui.delay.groupedDemandWarningDialog.description= +faxtomail.ui.fontSize.groupedDemandWarningDialog.description= diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java index 05c7678..1164a12 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup; +/* + * #%L + * FaxToMail :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 Mac-Groupe, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.util.CloseButton; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CloseButton.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CloseButton.java index 66aa28c..793f2b2 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CloseButton.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CloseButton.java @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.util; +/* + * #%L + * FaxToMail :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 Mac-Groupe, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import jaxx.runtime.SwingUtil; import javax.swing.*; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 6021d21ca53ef9b743150ed7007ce74b2f63a406 Author: Maven Release <maven-release@codelutin.com> Date: Thu May 7 10:55:22 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.3' with non-snapshot versions --- faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/faxtomail-persistence/pom.xml b/faxtomail-persistence/pom.xml index dcc8c26..fa0ce50 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 29ce877..ed761bf 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index ae7571b..dd46380 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index d47a870..9fbae2d 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 5f0c151..1933df0 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> <packaging>pom</packaging> <name>FaxToMail</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit aecf96a871377e0d650fabad2b0c1b134ace0250 Merge: dd7b442 6021d21 Author: Maven Release <maven-release@codelutin.com> Date: Thu May 7 10:57:36 2015 +0000 Merge branch 'release/1.3' 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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit eba7b2c8fa17cb0d9ed2bb5742bf55b170ee8b6a Author: Maven Release <maven-release@codelutin.com> Date: Thu May 7 10:57:38 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/faxtomail-persistence/pom.xml b/faxtomail-persistence/pom.xml index ac99202..fa0ce50 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.4-SNAPSHOT</version> + <version>1.3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index b416199..ed761bf 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.4-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 0be87dc..dd46380 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 92121ab..9fbae2d 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index a2a48dd..1933df0 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3</version> <packaging>pom</packaging> <name>FaxToMail</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 9249546b9c569d35ea5d3f199c102d8957c0946d Merge: eba7b2c aecf96a Author: Maven Release <maven-release@codelutin.com> Date: Thu May 7 10:57:38 2015 +0000 Merge branch 'master' into develop .../i18n/faxtomail-persistence_fr_FR.properties | 2 ++ .../demandgroup/DemandGroupHighlightDialog.java | 24 ++++++++++++++++++++++ .../faxtomail/ui/swing/util/CloseButton.java | 24 ++++++++++++++++++++++ 3 files changed, 50 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 51970383a064b95de81c7b56e48e9a39f6bc624e Author: Maven Release <maven-release@codelutin.com> Date: Thu May 7 10:57:38 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/faxtomail-persistence/pom.xml b/faxtomail-persistence/pom.xml index fa0ce50..ac99202 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index ed761bf..b416199 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index dd46380..0be87dc 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 9fbae2d..92121ab 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 1933df0..a2a48dd 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> <packaging>pom</packaging> <name>FaxToMail</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm