branch develop updated (4c260839 -> 00761b13)
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 4c260839 [jgitflow-maven-plugin]updating poms for 2.4.29-SNAPSHOT development new bd7c58c3 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 3b6cd90f Fix release ... new 076f0479 [jgitflow-maven-plugin]updating poms for branch'release/2.4.28' with non-snapshot versions new ef179cb5 [jgitflow-maven-plugin]merging 'release/2.4.28' into 'master' new 062f7a3a [jgitflow-maven-plugin]merging 'master' into 'develop' new 00761b13 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 00761b135507c1c6936ca1708568fb93c85f23c8 Author: Jean Couteau <couteau@codelutin.com> Date: Wed Apr 24 16:54:02 2019 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 062f7a3a41ee29ae89049e724bf7cb939a8535e0 Merge: bd7c58c3 ef179cb5 Author: Jean Couteau <couteau@codelutin.com> Date: Wed Apr 24 16:54:02 2019 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit bd7c58c3878d4946128f4b951af6885a88743f9f Author: Jean Couteau <couteau@codelutin.com> Date: Wed Apr 24 16:54:02 2019 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit ef179cb5d6c2b88c5c6ef91ada2c2b372cce7381 Merge: 12d2e165 076f0479 Author: Jean Couteau <couteau@codelutin.com> Date: Wed Apr 24 16:54:00 2019 +0200 [jgitflow-maven-plugin]merging 'release/2.4.28' into 'master' commit 076f04791d091b08da648f1b6ac84b891d08e957 Author: Jean Couteau <couteau@codelutin.com> Date: Wed Apr 24 16:51:27 2019 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.28' with non-snapshot versions commit 3b6cd90f09bbd5d19e4d701dc6a96c202c2d1130 Author: Jean Couteau <couteau@codelutin.com> Date: Wed Apr 24 16:50:50 2019 +0200 Fix release ... Summary of changes: .../faxtomail/web/job/MailFilterJobTest.java | 26 +++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) -- 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 3b6cd90f09bbd5d19e4d701dc6a96c202c2d1130 Author: Jean Couteau <couteau@codelutin.com> Date: Wed Apr 24 16:50:50 2019 +0200 Fix release ... --- .../faxtomail/web/job/MailFilterJobTest.java | 26 +++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/faxtomail-ui-web/src/test/java/com/franciaflex/faxtomail/web/job/MailFilterJobTest.java b/faxtomail-ui-web/src/test/java/com/franciaflex/faxtomail/web/job/MailFilterJobTest.java index 4b6769e2..e349edd9 100644 --- a/faxtomail-ui-web/src/test/java/com/franciaflex/faxtomail/web/job/MailFilterJobTest.java +++ b/faxtomail-ui-web/src/test/java/com/franciaflex/faxtomail/web/job/MailFilterJobTest.java @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.web.job; +/*- + * #%L + * FaxToMail :: Web + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2019 Mac-Groupe, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EmailAccountImpl; import com.franciaflex.faxtomail.persistence.entities.EmailProtocol; @@ -73,4 +97,4 @@ public class MailFilterJobTest { return emailAccount; } -} \ No newline at end of file +} -- 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 076f04791d091b08da648f1b6ac84b891d08e957 Author: Jean Couteau <couteau@codelutin.com> Date: Wed Apr 24 16:51:27 2019 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.28' 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 10476c58..360eafd8 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.28-SNAPSHOT</version> + <version>2.4.28</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index f09360a1..69b8128e 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.28-SNAPSHOT</version> + <version>2.4.28</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index a948cf29..597028f1 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.28-SNAPSHOT</version> + <version>2.4.28</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index eda8f7ff..bb067ec1 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.28-SNAPSHOT</version> + <version>2.4.28</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 3412dd2a..7869450f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.28-SNAPSHOT</version> + <version>2.4.28</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 ef179cb5d6c2b88c5c6ef91ada2c2b372cce7381 Merge: 12d2e165 076f0479 Author: Jean Couteau <couteau@codelutin.com> Date: Wed Apr 24 16:54:00 2019 +0200 [jgitflow-maven-plugin]merging 'release/2.4.28' into 'master' .gitlab-ci.yml | 2 +- faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/AttachmentFileImpl.java | 14 +- .../persistence/entities/ClientTopiaDao.java | 4 +- .../persistence/entities/EmailTopiaDao.java | 6 +- .../persistence/entities/SearchFilter.java | 20 +- .../src/main/resources/faxToMail.properties | 2 +- faxtomail-service/pom.xml | 6 +- .../services/service/EmailServiceImpl.java | 144 ++++++------ .../services/service/InitFaxToMailServiceImpl.java | 38 ++-- .../services/service/LdapServiceImpl.java | 58 ++++- .../services/service/EmailServiceTest.java | 11 +- .../faxtomail/services/service/ImageUtilTest.java | 29 ++- .../src/test/resources/emails/test10123.eml | 252 +++++++++++++++++++++ faxtomail-ui-swing/pom.xml | 6 +- .../faxtomail/ui/swing/FaxToMailUIContext.java | 15 -- .../faxtomail/ui/swing/RunFaxToMail.java | 13 +- .../swing/actions/PrintOnDefaultPrinterAction.java | 103 ++++----- .../ui/swing/actions/ShowDemandeAction.java | 61 +++-- .../ui/swing/actions/ShowRechercheAction.java | 7 +- .../content/attachment/AttachmentCellEditor.java | 49 ++-- .../attachment/AttachmentEditorUIModel.java | 6 +- .../attachment/actions/EditAttachmentAction.java | 10 +- .../content/demande/DemandeListTableFilter.java | 155 +++++++------ .../content/demande/DemandeListUIHandler.java | 18 +- .../ui/swing/content/demande/DemandeUIHandler.java | 112 +++++---- .../swing/content/demande/DemandesUIHandler.java | 9 +- .../actions/ComputeQuantitiesByRangeAction.java | 150 ++++++------ .../demande/actions/LoadFolderEmailsAction.java | 69 +++--- .../demande/actions/OpenForwardFormAction.java | 29 +-- .../demande/actions/OpenReplyFormAction.java | 39 ++-- .../demande/actions/OpenTakenByFormAction.java | 11 +- .../actions/SaveAndOpenForwardFormAction.java | 5 +- .../actions/SaveAndOpenReplyFormAction.java | 5 +- .../actions/SaveAndOpenSearchToGroupAction.java | 7 +- .../content/demande/actions/SaveDemandeAction.java | 132 +++++------ .../demande/actions/SaveDemandeFromListAction.java | 19 +- .../actions/OpenGroupedDemandAction.java | 34 +-- .../demande/replies/actions/OpenReplyAction.java | 65 +++--- .../demande/takenby/actions/TakenByAction.java | 29 +-- .../content/pdfeditor/PDFEditorUIHandler.java | 28 ++- .../actions/GenerateAnnotatedAttachmentAction.java | 27 +-- .../print/AttachmentToPrintChooserUIHandler.java | 40 ++-- .../ui/swing/content/reply/ReplyFormUIHandler.java | 9 +- .../reply/actions/AddAttachmentToReplyAction.java | 19 +- .../swing/content/reply/actions/ReplyAction.java | 39 ++-- .../content/reply/actions/SenderChangedAction.java | 9 +- .../ui/swing/content/search/SearchToGroupUI.css | 8 + .../ui/swing/content/search/SearchToGroupUI.jaxx | 6 +- .../content/search/SearchToGroupUIHandler.java | 8 +- .../faxtomail/ui/swing/content/search/SearchUI.css | 8 + .../ui/swing/content/search/SearchUI.jaxx | 6 +- .../ui/swing/content/search/SearchUIHandler.java | 24 +- .../ui/swing/content/search/SearchUIModel.java | 12 +- .../swing/content/search/actions/GroupAction.java | 13 +- .../swing/content/search/actions/SearchAction.java | 39 ++-- .../search/actions/SearchToGroupAction.java | 69 +++--- .../transmit/MailFolderChooserUIHandler.java | 79 ++++--- .../content/transmit/actions/TransmitAction.java | 5 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 16 +- .../faxtomail/ui/swing/util/DemandeTableModel.java | 4 +- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 109 ++++++--- faxtomail-ui-web/pom.xml | 13 +- .../web/action/admin/ImportArchiveAction.java | 8 +- .../faxtomail/web/action/admin/LdapAction.java | 8 +- .../faxtomail/web/job/ClientUpdateJob.java | 17 +- .../faxtomail/web/job/EDIManagementJob.java | 17 +- .../faxtomail/web/job/MailFilterJob.java | 14 +- .../WEB-INF/content/admin/configuration-input.jsp | 22 +- .../faxtomail/web/job/MailFilterJobTest.java | 100 ++++++++ pom.xml | 35 ++- 71 files changed, 1574 insertions(+), 983 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 bd7c58c3878d4946128f4b951af6885a88743f9f Author: Jean Couteau <couteau@codelutin.com> Date: Wed Apr 24 16:54:02 2019 +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 4009975e..360eafd8 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.29-SNAPSHOT</version> + <version>2.4.28</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 0645e24c..69b8128e 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.29-SNAPSHOT</version> + <version>2.4.28</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 607289df..597028f1 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.29-SNAPSHOT</version> + <version>2.4.28</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 3d742147..bb067ec1 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.29-SNAPSHOT</version> + <version>2.4.28</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index fb3e1f2c..7869450f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.29-SNAPSHOT</version> + <version>2.4.28</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 062f7a3a41ee29ae89049e724bf7cb939a8535e0 Merge: bd7c58c3 ef179cb5 Author: Jean Couteau <couteau@codelutin.com> Date: Wed Apr 24 16:54:02 2019 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../faxtomail/web/job/MailFilterJobTest.java | 26 +++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) -- 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 00761b135507c1c6936ca1708568fb93c85f23c8 Author: Jean Couteau <couteau@codelutin.com> Date: Wed Apr 24 16:54:02 2019 +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 360eafd8..4009975e 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.28</version> + <version>2.4.29-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 69b8128e..0645e24c 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.28</version> + <version>2.4.29-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 597028f1..607289df 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.28</version> + <version>2.4.29-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index bb067ec1..3d742147 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.28</version> + <version>2.4.29-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 7869450f..fb3e1f2c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.28</version> + <version>2.4.29-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