branch develop updated (62fef3cd -> c812cb88)
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 62fef3cd [jgitflow-maven-plugin]updating poms for 2.4.23-SNAPSHOT development new a929c6c4 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new fde2d2b4 [jgitflow-maven-plugin]updating poms for branch'release/2.4.22' with non-snapshot versions new 827de030 [jgitflow-maven-plugin]merging 'release/2.4.22' into 'master' new 2fac51d9 [jgitflow-maven-plugin]merging 'master' into 'develop' new c812cb88 [jgitflow-maven-plugin]Updating develop poms back to pre merge state 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 c812cb88e84b483e917a5f50418b8bbdfb9ee50c Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 25 21:24:39 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 2fac51d9d520c6bc7a1268222d0e467fb225f3e6 Merge: a929c6c4 827de030 Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 25 21:24:38 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit a929c6c494e3ceef128cc6393b43df49d4dbd651 Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 25 21:24:38 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 827de030b930ca66026437c37416eb58e5fb5695 Merge: b327202c fde2d2b4 Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 25 21:24:37 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.22' into 'master' commit fde2d2b40d1228bf4e232a4d48a044a1f53cf6c6 Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 25 21:22:54 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.22' with non-snapshot versions Summary of changes: -- 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 fde2d2b40d1228bf4e232a4d48a044a1f53cf6c6 Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 25 21:22:54 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.22' 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 b5fc7846..346bba07 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.22-SNAPSHOT</version> + <version>2.4.22</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index d9c10747..0f2b6feb 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.22-SNAPSHOT</version> + <version>2.4.22</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 4d8b254f..5320cb5d 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.22-SNAPSHOT</version> + <version>2.4.22</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index a75091fd..cf426371 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.22-SNAPSHOT</version> + <version>2.4.22</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 65723860..3f0b7702 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.22-SNAPSHOT</version> + <version>2.4.22</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 827de030b930ca66026437c37416eb58e5fb5695 Merge: b327202c fde2d2b4 Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 25 21:24:37 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.22' into 'master' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../faxtomail/ui/swing/FaxToMailUIContext.java | 16 ++++- .../ui/swing/actions/ShowDemandeAction.java | 4 ++ .../attachment/AttachmentEditorUIHandler.java | 1 - .../attachment/actions/EditAttachmentAction.java | 74 +++++++++++++--------- .../content/demande/DemandeListUIHandler.java | 2 +- .../demande/actions/OpenForwardFormAction.java | 1 + .../actions/SaveAndOpenForwardFormAction.java | 1 + .../demande/replies/DemandRepliesUIHandler.java | 4 +- .../content/pdfeditor/PDFEditorUIHandler.java | 47 +++++++++----- .../pdfeditor/actions/DisplayPageAction.java | 7 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 9 ++- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 16 files changed, 117 insertions(+), 59 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 a929c6c494e3ceef128cc6393b43df49d4dbd651 Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 25 21:24:38 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 a2b4530b..346bba07 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.23-SNAPSHOT</version> + <version>2.4.22</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 9f712831..0f2b6feb 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.23-SNAPSHOT</version> + <version>2.4.22</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 535fe33f..5320cb5d 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.23-SNAPSHOT</version> + <version>2.4.22</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 15df0b13..cf426371 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.23-SNAPSHOT</version> + <version>2.4.22</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 3da7b379..3f0b7702 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.23-SNAPSHOT</version> + <version>2.4.22</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 2fac51d9d520c6bc7a1268222d0e467fb225f3e6 Merge: a929c6c4 827de030 Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 25 21:24:38 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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 c812cb88e84b483e917a5f50418b8bbdfb9ee50c Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 25 21:24:39 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 346bba07..a2b4530b 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.22</version> + <version>2.4.23-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 0f2b6feb..9f712831 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.22</version> + <version>2.4.23-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 5320cb5d..535fe33f 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.22</version> + <version>2.4.23-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index cf426371..15df0b13 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.22</version> + <version>2.4.23-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 3f0b7702..3da7b379 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.22</version> + <version>2.4.23-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