branch develop updated (f95389b -> 0749a8e)
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 f95389b [jgitflow-maven-plugin]updating poms for 1.5-SNAPSHOT development new 0069c48 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new bdb7ca5 [jgitflow-maven-plugin]updating poms for branch'release/1.4' with non-snapshot versions new 1c31180 [jgitflow-maven-plugin]merging 'release/1.4' into 'master' new 0dde669 [jgitflow-maven-plugin]merging 'master' into 'develop' new 0749a8e [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 0749a8e2be259a107549e318bc8066c28cf5fe72 Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 26 15:57:46 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 0dde6698a847955f8d49bc3939f84f37ab290522 Merge: 0069c48 1c31180 Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 26 15:57:46 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 0069c48e1fd1b25b0e4ef253851d123b3f21ca4b Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 26 15:57:46 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 1c3118017a31b268028d6a492732dcd4fa7402c8 Merge: 37dbae6 bdb7ca5 Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 26 15:57:43 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.4' into 'master' commit bdb7ca53f658d7efdcb435f3773691db454d82f6 Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 26 15:53:47 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.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 bdb7ca53f658d7efdcb435f3773691db454d82f6 Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 26 15:53:47 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.4' 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 ac99202..0c3ba5b 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.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index b416199..ec4732c 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.4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 27ba12e..8166ed6 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.4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 92121ab..5021d33 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.4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index f04deea..08bc621 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.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 1c3118017a31b268028d6a492732dcd4fa7402c8 Merge: 37dbae6 bdb7ca5 Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 26 15:57:43 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.4' into 'master' faxtomail-persistence/pom.xml | 2 +- .../faxtomail/FaxToMailConfiguration.java | 17 +- .../faxtomail/FaxToMailConfigurationOption.java | 17 +- .../i18n/faxtomail-persistence_fr_FR.properties | 1 + .../src/main/xmi/faxtomail.properties | 5 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 31055 -> 32540 bytes faxtomail-service/pom.xml | 2 +- .../services/service/ConfigurationService.java | 11 +- .../services/service/ConfigurationServiceImpl.java | 72 ++-- .../faxtomail/services/service/EmailService.java | 3 +- .../services/service/EmailServiceImpl.java | 14 +- .../services/service/InitFaxToMailServiceImpl.java | 29 +- .../services/service/LdapServiceImpl.java | 1 + .../services/service/MailFolderService.java | 3 + .../services/service/MailFolderServiceImpl.java | 20 +- .../services/service/ReferentielService.java | 4 + .../services/service/ReferentielServiceImpl.java | 15 + .../faxtomail/services/service/UserService.java | 5 + .../services/service/UserServiceImpl.java | 55 +++ .../services/service/ldap/LdapServiceMock.java | 2 + .../h2/V1_4_0_150811__add_pdf_editor_stamps.sql | 36 ++ .../h2/V1_4_0_150817__add_signings_to_users.sql | 19 + .../V1_4_0_150811__add_pdf_editor_stamps.sql | 39 ++ .../V1_4_0_150817__add_signings_to_users.sql | 19 + faxtomail-ui-swing/pom.xml | 7 +- .../faxtomail/ui/swing/FaxToMailScreen.java | 2 - .../faxtomail/ui/swing/FaxToMailUIContext.java | 11 + .../ui/swing/actions/EditAttachmentAction.java | 23 +- .../actions/GenerateAnnotatedAttachmentAction.java | 318 ++++++++++------ .../ui/swing/actions/LoadFolderEmailsAction.java | 4 +- .../ui/swing/actions/OpenGroupedDemandAction.java | 13 +- .../ui/swing/actions/SaveDemandeAndExitAction.java | 4 +- .../ui/swing/actions/ShowDemandeAction.java | 56 ++- .../faxtomail/ui/swing/content/MainUIHandler.java | 28 +- .../content/attachment/AttachmentEditorUI.jaxx | 9 + .../swing/content/attachment/ButtonAttachment.java | 5 +- .../content/demande/DemandeListUIHandler.java | 31 +- .../ui/swing/content/demande/DemandeUIHandler.java | 22 +- .../ui/swing/content/demande/DemandesUI.css | 6 +- .../ui/swing/content/demande/DemandesUI.jaxx | 41 ++- .../swing/content/demande/DemandesUIHandler.java | 14 +- .../demande/demandgroup/ButtonEmailGroup.java | 5 +- .../demandgroup/DemandGroupHighlightDialog.java | 3 +- .../content/demande/demandgroup/DemandGroupUI.jaxx | 9 + .../content/demande/history/ButtonHistory.java | 5 +- .../content/demande/history/HistoryListUI.jaxx | 9 + .../demande/replies/ButtonDemandReplies.java | 5 +- .../content/demande/replies/DemandRepliesUI.jaxx | 9 + .../pdfeditor/PDFEditorStampImageUI.css} | 26 +- .../PDFEditorStampImageUI.jaxx} | 39 +- .../pdfeditor/PDFEditorStampTextUI.css} | 32 +- .../content/pdfeditor/PDFEditorStampTextUI.jaxx | 74 ++++ .../ui/swing/content/pdfeditor/PDFEditorUI.jaxx | 2 +- .../content/pdfeditor/PDFEditorUIHandler.java | 406 +++++++++++++++------ .../swing/content/pdfeditor/PDFEditorUIModel.java | 64 +++- .../ui/swing/content/reply/ReplyFormUI.css | 41 ++- .../ui/swing/content/reply/ReplyFormUI.jaxx | 43 ++- .../ui/swing/content/reply/ReplyFormUIHandler.java | 15 +- .../ui/swing/content/reply/ReplyFormUIModel.java | 13 + .../ui/swing/content/reply/SigningSettingsUI.css | 95 +++++ .../ui/swing/content/reply/SigningSettingsUI.jaxx | 101 +++++ .../content/reply/SigningSettingsUIHandler.java | 178 +++++++++ .../content/reply/SigningSettingsUIModel.java | 152 ++++++++ .../content/reply/actions/DeleteSigningAction.java | 94 +++++ .../content/reply/actions/NewSigningAction.java | 84 +++++ .../reply/actions/OpenSigningSettingsAction.java | 72 ++++ .../{ => content/reply}/actions/ReplyAction.java | 4 +- .../content/reply/actions/SaveSigningAction.java | 74 ++++ .../reply/actions/SetDefaultSigningAction.java | 74 ++++ .../content/search/SearchToGroupUIHandler.java | 5 + .../ui/swing/content/search/SearchUIHandler.java | 6 + .../util/AbstractFaxToMailDemandListHandler.java | 4 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 29 +- .../ui/swing/util/AbstractToolbarPopupButton.java | 45 +++ .../ui/swing/util/AbstractToolbarPopupHandler.java | 4 + .../ui/swing/util/AbstractToolbarPopupUI.jaxx | 4 +- .../ReloadableListUI.java} | 18 +- .../SigningSettingsUIModel-error-validation.xml} | 34 +- .../i18n/faxtomail-ui-swing_fr_FR.properties | 23 ++ .../src/main/resources/icons/action-default.png | Bin 0 -> 670 bytes .../src/main/resources/icons/action-settings.png | Bin 0 -> 512 bytes .../src/main/resources/icons/stamp.png | Bin 0 -> 588 bytes faxtomail-ui-swing/src/main/resources/log4j2.xml | 1 + faxtomail-ui-web/pom.xml | 2 +- .../web/action/admin/ConfigurationAction.java | 31 +- .../WEB-INF/content/admin/configuration-input.jsp | 202 +++++++--- .../src/main/webapp/js/configuration.js | 106 +++++- pom.xml | 18 +- 88 files changed, 2684 insertions(+), 561 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 0069c48e1fd1b25b0e4ef253851d123b3f21ca4b Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 26 15:57:46 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 5a3a0b9..0c3ba5b 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.5-SNAPSHOT</version> + <version>1.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index e4b3035..ec4732c 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.5-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index faab3a3..8166ed6 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.5-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 9be8ad7..5021d33 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.5-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index a961c85..08bc621 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.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 0dde6698a847955f8d49bc3939f84f37ab290522 Merge: 0069c48 1c31180 Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 26 15:57:46 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 0749a8e2be259a107549e318bc8066c28cf5fe72 Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 26 15:57:46 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 0c3ba5b..5a3a0b9 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</version> + <version>1.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index ec4732c..e4b3035 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</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 8166ed6..faab3a3 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</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 5021d33..9be8ad7 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</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 08bc621..a961c85 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.4</version> + <version>1.5-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