branch develop updated (7d897d9 -> 1efed16)
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 7d897d9 [jgitflow-maven-plugin]updating poms for 2.2-SNAPSHOT development new e812ac5 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 84c3588 [jgitflow-maven-plugin]updating poms for 2.1 branch with snapshot versions new 924d70c [jgitflow-maven-plugin]updating poms for branch'release/2.1' with non-snapshot versions new 86bf18c [jgitflow-maven-plugin]merging 'release/2.1' into 'master' new 66f6d3d [jgitflow-maven-plugin]merging 'master' into 'develop' new 1efed16 [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 1efed16baf6463dcc7f1bdcfe6fb2b1f7f1ba442 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 15:12:48 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 66f6d3df091a1d6c2835583fa04f858a1c3985ff Merge: e812ac5 86bf18c Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 15:12:47 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit e812ac500bf2deb0730b12f6420c84f338dfa587 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 15:12:47 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 86bf18c971a2db0506b3350a872fd473b48c642b Merge: 952abfb 924d70c Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 15:12:45 2016 +0200 [jgitflow-maven-plugin]merging 'release/2.1' into 'master' commit 924d70ccf8be39b466e6bdb3148bf0426f106a20 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 15:10:15 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.1' 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 924d70ccf8be39b466e6bdb3148bf0426f106a20 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 15:10:15 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.1' 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 88b7680..ca5f38d 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.1-SNAPSHOT</version> + <version>2.1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 7373cd3..3f799ec 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.1-SNAPSHOT</version> + <version>2.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 434e00a..851f123 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.1-SNAPSHOT</version> + <version>2.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index edf72a0..1298395 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.1-SNAPSHOT</version> + <version>2.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 49c7741..66bbdcb 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</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 86bf18c971a2db0506b3350a872fd473b48c642b Merge: 952abfb 924d70c Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 15:12:45 2016 +0200 [jgitflow-maven-plugin]merging 'release/2.1' into 'master' faxtomail-ui-web/README.txt => README.md | 0 .../README.txt => faxtomail-persistence/README.md | 0 faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/EmailFilter.java | 14 ++ .../persistence/entities/EmailTopiaDao.java | 11 ++ .../faxtomail/persistence/entities/MailField.java | 4 +- .../src/main/resources/faxToMail.properties | 3 +- .../src/main/xmi/faxtomail.properties | 5 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 32762 -> 32715 bytes faxtomail-service/{README.txt => README.md} | 0 faxtomail-service/pom.xml | 2 +- .../faxtomail/services/DecoratorServiceImpl.java | 19 +++ .../faxtomail/services/FaxToMailServiceUtils.java | 19 +++ .../services/service/ConfigurationService.java | 13 +- .../services/service/ConfigurationServiceImpl.java | 89 ++++++++++- .../faxtomail/services/service/EmailService.java | 3 +- .../services/service/EmailServiceImpl.java | 58 +++++-- .../services/service/LdapServiceImpl.java | 1 - .../services/service/ReferentielServiceImpl.java | 2 +- .../faxtomail/services/service/UserService.java | 4 - .../services/service/UserServiceImpl.java | 52 ------ .../services/service/ldap/LdapServiceMock.java | 1 - .../h2/V1_1_10_735__subject_migration.java | 120 ++++++++++++++ .../sqlserver/V1_1_10_735__subject_migration.java | 119 ++++++++++++++ .../h2/V1_1_10_734__add_subject_field_to_email.sql | 2 + ..._user_signings_and_add_signings_for_domains.sql | 16 ++ .../V1_1_10_734__add_subject_field_to_email.sql | 2 + ..._user_signings_and_add_signings_for_domains.sql | 18 +++ .../services/FaxToMailServiceUtilsTest.java | 68 ++++++++ .../services/service/ClientServiceTest.java | 4 +- .../service/migration/FlywayMigrationTest.java | 4 +- .../README.txt => faxtomail-ui-swing/README.md | 0 faxtomail-ui-swing/pom.xml | 2 +- .../faxtomail/ui/swing/FaxToMailUIContext.java | 10 +- .../ui/swing/actions/ShowDemandeAction.java | 2 +- .../content/attachment/AttachmentEditorUI.jaxx | 4 +- .../attachment/AttachmentEditorUIHandler.java | 2 +- .../swing/content/attachment/ButtonAttachment.java | 2 +- .../content/demande/DemandeListTableFilter.java | 4 + .../content/demande/DemandeListUIHandler.java | 4 + .../ui/swing/content/demande/DemandeUIModel.java | 32 +++- .../actions/SaveAndOpenReplyFormAction.java | 10 +- .../demande/demandgroup/ButtonEmailGroup.java | 2 +- .../content/demande/demandgroup/DemandGroupUI.jaxx | 4 +- .../demande/demandgroup/DemandGroupUIHandler.java | 2 +- .../actions/OpenGroupedDemandAction.java | 2 +- .../content/demande/history/ButtonHistory.java | 2 +- .../content/demande/history/HistoryListUI.jaxx | 4 +- .../demande/history/HistoryListUIHandler.java | 2 +- .../demande/replies/ButtonDemandReplies.java | 2 +- .../content/demande/replies/DemandRepliesUI.jaxx | 4 +- .../demande/replies/DemandRepliesUIHandler.java | 2 +- .../ui/swing/content/reply/ReplyFormUI.css | 42 +---- .../ui/swing/content/reply/ReplyFormUI.jaxx | 47 +----- .../ui/swing/content/reply/ReplyFormUIHandler.java | 129 +++++++++++---- .../ui/swing/content/reply/ReplyFormUIModel.java | 28 ++-- .../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 ---------- .../swing/content/reply/actions/ReplyAction.java | 17 +- .../content/reply/actions/SaveSigningAction.java | 74 --------- ...ettingsAction.java => SenderChangedAction.java} | 49 +++--- .../reply/actions/SetDefaultSigningAction.java | 74 --------- .../faxtomail/ui/swing/util/DemandeTableModel.java | 6 + .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 3 - .../ui/swing/util/data/DataConnection.java | 57 +++++++ .../faxtomail/ui/swing/util/data/Handler.java | 58 +++++++ .../{ => toolbar}/AbstractToolbarPopupButton.java | 3 +- .../{ => toolbar}/AbstractToolbarPopupHandler.java | 3 +- .../util/{ => toolbar}/AbstractToolbarPopupUI.css | 0 .../util/{ => toolbar}/AbstractToolbarPopupUI.jaxx | 0 .../i18n/faxtomail-ui-swing_fr_FR.properties | 25 +-- README.txt => faxtomail-ui-web/README.md | 0 faxtomail-ui-web/pom.xml | 2 +- .../web/action/admin/ConfigurationAction.java | 16 +- .../faxtomail/web/job/MailFilterJob.java | 5 +- .../i18n/faxtomail-ui-web_fr_FR.properties | 1 + .../WEB-INF/content/admin/configuration-input.jsp | 64 +++++++- .../src/main/webapp/js/configuration.js | 103 ++++++++++++ pom.xml | 14 +- 83 files changed, 1130 insertions(+), 1147 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 e812ac500bf2deb0730b12f6420c84f338dfa587 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 15:12:47 2016 +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 3801dfe..ca5f38d 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.2-SNAPSHOT</version> + <version>2.1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index c53c027..3f799ec 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.2-SNAPSHOT</version> + <version>2.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index e54a1ea..851f123 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.2-SNAPSHOT</version> + <version>2.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 1dca0da..1298395 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.2-SNAPSHOT</version> + <version>2.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index c534a94..66bbdcb 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1</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 66f6d3df091a1d6c2835583fa04f858a1c3985ff Merge: e812ac5 86bf18c Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 15:12:47 2016 +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 1efed16baf6463dcc7f1bdcfe6fb2b1f7f1ba442 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 15:12:48 2016 +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 ca5f38d..3801dfe 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.1</version> + <version>2.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 3f799ec..c53c027 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.1</version> + <version>2.2-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 851f123..e54a1ea 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.1</version> + <version>2.2-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 1298395..1dca0da 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.1</version> + <version>2.2-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 66bbdcb..c534a94 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.1</version> + <version>2.2-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