branch develop updated (d333980 -> 75bc8f3)
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 d333980 Les demandes s'ouvrent derrière la fenêtre principale (fixes #7518) new 1a08ea7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds aa82fac [jgitflow-maven-plugin]updating poms for 1.6.4 branch with snapshot versions new 746d277 [jgitflow-maven-plugin]updating poms for branch'release/1.6.4' with non-snapshot versions new 016a451 [jgitflow-maven-plugin]merging 'release/1.6.4' into 'master' new 2e16a90 [jgitflow-maven-plugin]merging 'master' into 'develop' new 75bc8f3 [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 75bc8f3348b66596ca84bc5074f77e2049d37ceb Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 8 16:04:51 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 2e16a90b6e47852def1b4d8dad642d65214fa6f1 Merge: 1a08ea7 016a451 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 8 16:04:50 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 1a08ea7481b36fce4dc2201c7b4bc8aabe91e271 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 8 16:04:49 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 016a451f037fcb365eac99c30d9358a009e7c0e1 Merge: fef7b08 746d277 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 8 16:04:45 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.6.4' into 'master' commit 746d2778ca5b5da661e4e913806c4c25cf010aaa Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 8 16:00:12 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.6.4' 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 http://git.codelutin.com/faxtomail.git commit 016a451f037fcb365eac99c30d9358a009e7c0e1 Merge: fef7b08 746d277 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 8 16:04:45 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.6.4' into 'master' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/actions/ShowDemandeAction.java | 36 +++++++++++++--------- .../faxtomail/ui/swing/content/MainUIHandler.java | 8 +++++ .../attachment/actions/EditAttachmentAction.java | 32 +++++++++++++------ .../OpenMailFolderChooserFromListAction.java | 28 +++++++++++------ .../demande/actions/OpenReplyFormAction.java | 28 +++++++++++------ .../actions/SaveAndOpenModalFrameAction.java | 28 +++++++++++------ .../demande/replies/actions/OpenReplyAction.java | 26 ++++++++++------ .../search/actions/SearchToGroupAction.java | 31 ++++++++++--------- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 17 ++++++++++ faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 14 files changed, 165 insertions(+), 79 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 1a08ea7481b36fce4dc2201c7b4bc8aabe91e271 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 8 16:04:49 2015 +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 aaa9083..a70568a 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.0-SNAPSHOT</version> + <version>1.6.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index d8828b2..32ca16a 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.0-SNAPSHOT</version> + <version>1.6.4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index a995ce8..1401717 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.0-SNAPSHOT</version> + <version>1.6.4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 0c9bb52..db7d7e4 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.0-SNAPSHOT</version> + <version>1.6.4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 9548890..3affb38 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.0-SNAPSHOT</version> + <version>1.6.4</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 2e16a90b6e47852def1b4d8dad642d65214fa6f1 Merge: 1a08ea7 016a451 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 8 16:04:50 2015 +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 http://git.codelutin.com/faxtomail.git commit 75bc8f3348b66596ca84bc5074f77e2049d37ceb Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 8 16:04:51 2015 +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 a70568a..aaa9083 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.6.4</version> + <version>2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 32ca16a..d8828b2 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.6.4</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 1401717..a995ce8 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.6.4</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index db7d7e4..0c9bb52 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.6.4</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 3affb38..9548890 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.6.4</version> + <version>2.0-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