branch develop updated (730fcb7 -> a6a9df8)
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 730fcb7 [jgitflow-maven-plugin]updating poms for 1.6-SNAPSHOT development new 572ee05 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 20b2200 Fix release new 6e49208 [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions new afc64fc [jgitflow-maven-plugin]merging 'release/1.5' into 'master' new 4b7614e [jgitflow-maven-plugin]merging 'master' into 'develop' new a6a9df8 [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 a6a9df8ee8743299997e36d78f12e84e1ce355cf Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 31 10:15:28 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 4b7614e4e554e3dca0183a9e92d07540f1866ab3 Merge: 572ee05 afc64fc Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 31 10:15:27 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 572ee05fe2047572177c53810086c8aa0acd5506 Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 31 10:15:27 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit afc64fcb74d20cede2988854dd4d861ad566c3d4 Merge: 1c31180 6e49208 Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 31 10:15:23 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' commit 6e492089be53f06543515596aed1bc32e47703d0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 31 10:12:05 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions commit 20b2200ef84747d1b95b1923bee3505be5251cdc Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 31 10:11:37 2015 +0200 Fix release Summary of changes: .../persistence/entities/StampTopiaDao.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- 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 20b2200ef84747d1b95b1923bee3505be5251cdc Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 31 10:11:37 2015 +0200 Fix release --- .../persistence/entities/StampTopiaDao.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/StampTopiaDao.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/StampTopiaDao.java index 01d087f..d4edde7 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/StampTopiaDao.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/StampTopiaDao.java @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.persistence.entities; +/* + * #%L + * FaxToMail :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 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 java.util.Collection; import java.util.HashMap; import java.util.Map; -- 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 6e492089be53f06543515596aed1bc32e47703d0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 31 10:12:05 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.5' 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 5a3a0b9..1e69015 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.5</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index e4b3035..e1918fb 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.5</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index faab3a3..62ce8f4 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.5</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 9be8ad7..d679e11 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.5</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index a961c85..cc2c7b1 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.5</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 afc64fcb74d20cede2988854dd4d861ad566c3d4 Merge: 1c31180 6e49208 Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 31 10:15:23 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/EmailFilter.java | 12 +++ .../persistence/entities/EmailTopiaDao.java | 20 +++- .../faxtomail/persistence/entities/MailField.java | 2 + .../persistence/entities/SearchFilter.java | 18 ++-- .../persistence/entities/StampTopiaDao.java | 51 ++++++++++ faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 32540 -> 32674 bytes faxtomail-service/pom.xml | 2 +- .../faxtomail/services/service/ClientService.java | 7 ++ .../services/service/ClientServiceImpl.java | 39 ++++++++ .../faxtomail/services/service/EmailService.java | 2 +- .../services/service/EmailServiceImpl.java | 41 ++++---- .../services/service/InitFaxToMailServiceImpl.java | 2 +- .../services/service/MailFolderService.java | 2 - .../services/service/MailFolderServiceImpl.java | 19 ---- .../faxtomail/services/service/UserService.java | 3 + .../services/service/UserServiceImpl.java | 11 +++ .../h2/V1_5_0_150828__configure_stamps_by_ldap.sql | 41 ++++++++ .../V1_4_0_150817__add_signings_to_users.sql | 6 +- .../V1_5_0_150828__configure_stamps_by_ldap.sql | 59 ++++++++++++ .../services/service/EmailServiceTest.java | 5 +- .../services/service/InitTestDataImpl.java | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../swing/actions/AbstractChangeScreenAction.java | 18 ---- .../ui/swing/actions/ShowDemandeAction.java | 20 +++- .../ui/swing/actions/ShowDemandeListAction.java | 16 ++++ .../ui/swing/actions/ShowRechercheAction.java | 15 ++- .../faxtomail/ui/swing/content/MainUI.css | 6 +- .../faxtomail/ui/swing/content/MainUI.jaxx | 3 - .../faxtomail/ui/swing/content/MainUIHandler.java | 11 --- .../content/attachment/AttachmentEditorUI.css | 2 +- .../attachment/AttachmentEditorUIHandler.java | 4 +- .../attachment}/actions/AddAttachmentAction.java | 3 +- .../attachment}/actions/EditAttachmentAction.java | 14 +-- .../attachment}/actions/OpenAttachmentAction.java | 3 +- .../content/demande/DemandeListTableFilter.java | 26 +++-- .../ui/swing/content/demande/DemandeListUI.css | 6 +- .../content/demande/DemandeListUIHandler.java | 11 ++- .../ui/swing/content/demande/DemandeUI.css | 10 +- .../ui/swing/content/demande/DemandeUI.jaxx | 50 +++++----- .../ui/swing/content/demande/DemandeUIHandler.java | 25 ++++- .../ui/swing/content/demande/DemandeUIModel.java | 43 ++++----- .../ui/swing/content/demande/DemandesUI.css | 10 ++ .../ui/swing/content/demande/DemandesUI.jaxx | 63 +++++++----- .../swing/content/demande/DemandesUIHandler.java | 31 +++--- .../demande}/actions/ArchiveAction.java | 2 +- .../demande}/actions/ArchiveFromListAction.java | 2 +- .../actions/ComputeQuantitiesByRangeAction.java | 3 +- .../demande}/actions/LoadFolderEmailsAction.java | 3 +- .../OpenMailFolderChooserFromListAction.java | 3 +- .../demande}/actions/OpenReplyFormAction.java | 3 +- .../SaveAndOpenChooseAttachmentToPrintAction.java | 2 +- .../SaveAndOpenMailFolderChooserAction.java | 2 +- .../actions/SaveAndOpenModalFrameAction.java | 2 +- .../actions/SaveAndOpenReplyFormAction.java | 2 +- .../actions/SaveAndOpenSearchToGroupAction.java | 12 ++- .../demande}/actions/SaveDemandeAction.java | 35 ++++--- .../demande}/actions/SaveDemandeAndExitAction.java | 2 +- .../actions/SaveDemandeFromListAction.java | 3 +- .../demande/demandgroup/DemandGroupUIHandler.java | 2 +- .../actions/OpenGroupedDemandAction.java | 16 +++- .../demande/replies/DemandRepliesUIHandler.java | 2 +- .../demande/replies}/actions/OpenReplyAction.java | 3 +- .../ui/swing/content/pdfeditor/PDFEditorUI.css | 2 +- .../content/pdfeditor/PDFEditorUIHandler.java | 2 +- .../actions/GenerateAnnotatedAttachmentAction.java | 3 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 2 +- .../reply}/actions/AddAttachmentToReplyAction.java | 3 +- .../ui/swing/content/search/SearchToGroupUI.css | 7 +- .../ui/swing/content/search/SearchToGroupUI.jaxx | 6 +- .../content/search/SearchToGroupUIHandler.java | 11 ++- .../faxtomail/ui/swing/content/search/SearchUI.css | 5 + .../ui/swing/content/search/SearchUI.jaxx | 6 +- .../ui/swing/content/search/SearchUIHandler.java | 10 +- .../ui/swing/content/search/SearchUIModel.java | 26 +++-- .../{ => content/search}/actions/GroupAction.java | 3 +- .../{ => content/search}/actions/SearchAction.java | 3 +- .../search}/actions/SearchToGroupAction.java | 3 +- .../swing/content/transmit/MailFolderChooserUI.css | 2 +- .../transmit}/actions/TransmitAction.java | 4 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 39 -------- .../ui/swing/util/AbstractToolbarPopupButton.java | 8 +- .../faxtomail/ui/swing/util/DemandeTableModel.java | 10 +- .../demande/DemandeUIModel-error-validation.xml | 6 +- .../i18n/faxtomail-ui-swing_fr_FR.properties | 12 ++- faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/web/action/SearchAction.java | 4 + .../faxtomail/web/job/MailFilterJob.java | 1 - .../i18n/faxtomail-ui-web_fr_FR.properties | 1 + .../WEB-INF/content/admin/configuration-input.jsp | 106 ++++++++++++--------- .../main/webapp/WEB-INF/content/demand-detail.jsp | 34 +++++++ .../src/main/webapp/css/demand-detail.css | 21 +++- .../src/main/webapp/js/configuration.js | 70 +++++++------- .../src/main/webapp/js/demand-detail.js | 2 + pom.xml | 2 +- 95 files changed, 838 insertions(+), 415 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 572ee05fe2047572177c53810086c8aa0acd5506 Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 31 10:15:27 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 d8f90c4..1e69015 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.5</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index dfad657..e1918fb 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.5</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 63fa1e9..62ce8f4 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.5</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 6a9c0ca..d679e11 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.5</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index fb6dd56..cc2c7b1 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.5</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 4b7614e4e554e3dca0183a9e92d07540f1866ab3 Merge: 572ee05 afc64fc Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 31 10:15:27 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../persistence/entities/StampTopiaDao.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- 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 a6a9df8ee8743299997e36d78f12e84e1ce355cf Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 31 10:15:28 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 1e69015..d8f90c4 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</version> + <version>1.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index e1918fb..dfad657 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</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 62ce8f4..63fa1e9 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</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index d679e11..6a9c0ca 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</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index cc2c7b1..fb6dd56 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.5</version> + <version>1.6-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