branch develop updated (10da865 -> 5f014fa)
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 10da865 [jgitflow-maven-plugin]updating poms for 1.7-SNAPSHOT development new b38a9e4 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 20654c9 [jgitflow-maven-plugin]updating poms for branch'release/1.6' with non-snapshot versions new 757658a [jgitflow-maven-plugin]merging 'release/1.6' into 'master' new 0c044da [jgitflow-maven-plugin]merging 'master' into 'develop' new 5f014fa [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 5f014fa0310764820fd59a0403ed135639a4289b Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 2 16:21:03 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 0c044da94a10bfb43684514dd64ed20ee6888747 Merge: b38a9e4 757658a Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 2 16:21:03 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit b38a9e4c533ff9b3f0756c7b2d92ead70179868f Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 2 16:21:03 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 757658af0dac682b4402eab05c3d37b214139689 Merge: afc64fc 20654c9 Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 2 16:20:59 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.6' into 'master' commit 20654c9416d0308c6b8f7e78b0bc6c0c69273215 Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 2 16:18:05 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.6' 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 20654c9416d0308c6b8f7e78b0bc6c0c69273215 Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 2 16:18:05 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.6' 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 d8f90c4..3249835 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-SNAPSHOT</version> + <version>1.6</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index dfad657..b1fd5ae 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-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 63fa1e9..45d8f35 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-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 6a9c0ca..689454c 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-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 3f007e3..86d729e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</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 757658af0dac682b4402eab05c3d37b214139689 Merge: afc64fc 20654c9 Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 2 16:20:59 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.6' into 'master' faxtomail-persistence/pom.xml | 2 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 32674 -> 32762 bytes faxtomail-service/pom.xml | 2 +- .../services/service/ConfigurationServiceImpl.java | 2 + .../services/service/EmailServiceImpl.java | 4 +- ...d_attributes_for_less_important_attachments.sql | 5 ++ ...d_attributes_for_less_important_attachments.sql | 6 ++ faxtomail-ui-swing/pom.xml | 2 +- .../content/attachment/AttachmentEditorUI.css | 32 ++++++++ .../content/attachment/AttachmentEditorUI.jaxx | 34 ++++++++- .../attachment/AttachmentEditorUIHandler.java | 52 ++++++++++++- .../attachment/AttachmentEditorUIModel.java | 81 ++++++++++++++++++++- .../ui/swing/content/attachment/AttachmentItem.css | 1 + .../swing/content/attachment/AttachmentItem.jaxx | 3 + .../ui/swing/content/demande/DemandeUIModel.java | 2 +- .../i18n/faxtomail-ui-swing_fr_FR.properties | 7 ++ .../src/main/resources/icons/action-important.png | Bin 0 -> 672 bytes .../main/resources/icons/action-not-important.png | Bin 0 -> 671 bytes faxtomail-ui-web/pom.xml | 2 +- pom.xml | 4 +- src/site/rst/import.rst | 14 ++-- src/site/rst/index.rst | 2 +- src/site/rst/install.rst | 2 +- 23 files changed, 234 insertions(+), 25 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 b38a9e4c533ff9b3f0756c7b2d92ead70179868f Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 2 16:21:03 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 29b7ad9..3249835 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.7-SNAPSHOT</version> + <version>1.6</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 06484a6..b1fd5ae 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.7-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index c7a2f43..45d8f35 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.7-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 511372a..689454c 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.7-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index e232a5f..86d729e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.7-SNAPSHOT</version> + <version>1.6</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 0c044da94a10bfb43684514dd64ed20ee6888747 Merge: b38a9e4 757658a Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 2 16:21:03 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 5f014fa0310764820fd59a0403ed135639a4289b Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 2 16:21:03 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 3249835..29b7ad9 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</version> + <version>1.7-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index b1fd5ae..06484a6 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</version> + <version>1.7-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 45d8f35..c7a2f43 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</version> + <version>1.7-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 689454c..511372a 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</version> + <version>1.7-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 86d729e..e232a5f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.6</version> + <version>1.7-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