branch develop updated (4c0e35d6 -> a1127cac)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 4c0e35d6 [jgitflow-maven-plugin]updating poms for 2.4.17-SNAPSHOT development new bbdeff91 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new d8a10321 Fix release ... new 6052c563 [jgitflow-maven-plugin]updating poms for branch'release/2.4.16' with non-snapshot versions new b06a2a50 [jgitflow-maven-plugin]merging 'release/2.4.16' into 'master' new cd21992d [jgitflow-maven-plugin]merging 'master' into 'develop' new a1127cac [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 a1127cac31f6790c1cff8e93cf6c6a6ac91ea16d Author: Jean Couteau <couteau@codelutin.com> Date: Fri Jun 8 20:39:22 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit cd21992d52174897dfe0b0003ef3983633cd001b Merge: bbdeff91 b06a2a50 Author: Jean Couteau <couteau@codelutin.com> Date: Fri Jun 8 20:39:22 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit bbdeff910ebaf898ad1c902985fd73405623eaa3 Author: Jean Couteau <couteau@codelutin.com> Date: Fri Jun 8 20:39:21 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit b06a2a505085377c6dd295e7bc6becfb2c254ea1 Merge: 5edb4cd1 6052c563 Author: Jean Couteau <couteau@codelutin.com> Date: Fri Jun 8 20:39:20 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.16' into 'master' commit 6052c56312b0446eefea235ff2e2e5ce26e9418b Author: Jean Couteau <couteau@codelutin.com> Date: Fri Jun 8 20:37:37 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.16' with non-snapshot versions commit d8a103216cfd8e1032a752a58978eac827856585 Author: Jean Couteau <couteau@codelutin.com> Date: Fri Jun 8 20:37:24 2018 +0200 Fix release ... Summary of changes: .../pdfeditor/actions/DisplayPageAction.java | 24 ++++++++++++++++++++++ 1 file changed, 24 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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit d8a103216cfd8e1032a752a58978eac827856585 Author: Jean Couteau <couteau@codelutin.com> Date: Fri Jun 8 20:37:24 2018 +0200 Fix release ... --- .../pdfeditor/actions/DisplayPageAction.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/actions/DisplayPageAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/actions/DisplayPageAction.java index 5a106ae3..a7d71426 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/actions/DisplayPageAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/actions/DisplayPageAction.java @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.content.pdfeditor.actions; +/*- + * #%L + * FaxToMail :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2018 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.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorCrossUI; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorHighlighterUI; -- 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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit 6052c56312b0446eefea235ff2e2e5ce26e9418b Author: Jean Couteau <couteau@codelutin.com> Date: Fri Jun 8 20:37:37 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.16' 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 f34d726b..f041be2e 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.4.16-SNAPSHOT</version> + <version>2.4.16</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index f9d6b5ce..61ec9a62 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.4.16-SNAPSHOT</version> + <version>2.4.16</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 69e0f907..7e264e78 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>2.4.16-SNAPSHOT</version> + <version>2.4.16</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 458e9e8a..0fa58162 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>2.4.16-SNAPSHOT</version> + <version>2.4.16</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 38e7086f..319d148e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.16-SNAPSHOT</version> + <version>2.4.16</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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit b06a2a505085377c6dd295e7bc6becfb2c254ea1 Merge: 5edb4cd1 6052c563 Author: Jean Couteau <couteau@codelutin.com> Date: Fri Jun 8 20:39:20 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.16' into 'master' faxtomail-persistence/pom.xml | 2 +- .../faxtomail/FaxToMailConfiguration.java | 4 + .../faxtomail/FaxToMailConfigurationOption.java | 7 + .../i18n/faxtomail-persistence_fr_FR.properties | 1 + faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/content/demande/DemandeUI.css | 6 +- .../ui/swing/content/demande/DemandeUIHandler.java | 2 +- .../demande/replies/ButtonDemandReplies.java | 4 +- .../content/demande/replies/DemandRepliesUI.jaxx | 2 +- .../demande/replies/DemandRepliesUIHandler.java | 10 +- .../content/demande/replies/DemandReplyItem.css | 2 +- .../content/demande/replies/DemandReplyItem.jaxx | 2 +- .../content/demande/replies/RepliesCellEditor.java | 2 +- .../demande/replies/actions/OpenReplyAction.java | 6 +- .../content/pdfeditor/PDFEditorUIHandler.java | 291 ++++---------------- .../pdfeditor/actions/DisplayPageAction.java | 295 +++++++++++++++++++++ .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 25 +- .../faxtomail/ui/swing/util/JImagePanel.java | 6 + .../i18n/faxtomail-ui-swing_fr_FR.properties | 1 + faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 22 files changed, 414 insertions(+), 262 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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit bbdeff910ebaf898ad1c902985fd73405623eaa3 Author: Jean Couteau <couteau@codelutin.com> Date: Fri Jun 8 20:39:21 2018 +0200 [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 d8077550..f041be2e 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.4.17-SNAPSHOT</version> + <version>2.4.16</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 7e467887..61ec9a62 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.4.17-SNAPSHOT</version> + <version>2.4.16</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 3af7f95d..7e264e78 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>2.4.17-SNAPSHOT</version> + <version>2.4.16</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 7d7e6b86..0fa58162 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>2.4.17-SNAPSHOT</version> + <version>2.4.16</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index b722686a..319d148e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.17-SNAPSHOT</version> + <version>2.4.16</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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit cd21992d52174897dfe0b0003ef3983633cd001b Merge: bbdeff91 b06a2a50 Author: Jean Couteau <couteau@codelutin.com> Date: Fri Jun 8 20:39:22 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../pdfeditor/actions/DisplayPageAction.java | 24 ++++++++++++++++++++++ 1 file changed, 24 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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit a1127cac31f6790c1cff8e93cf6c6a6ac91ea16d Author: Jean Couteau <couteau@codelutin.com> Date: Fri Jun 8 20:39:22 2018 +0200 [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 f041be2e..d8077550 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.4.16</version> + <version>2.4.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 61ec9a62..7e467887 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.4.16</version> + <version>2.4.17-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 7e264e78..3af7f95d 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>2.4.16</version> + <version>2.4.17-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 0fa58162..7d7e6b86 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>2.4.16</version> + <version>2.4.17-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 319d148e..b722686a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.16</version> + <version>2.4.17-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