branch develop updated (404df93 -> 4adc0cb)
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 404df93 [jgitflow-maven-plugin]updating poms for 2.4-SNAPSHOT development new 6535bec [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4183bc2 [jgitflow-maven-plugin]updating poms for 2.3 branch with snapshot versions new 282973c [jgitflow-maven-plugin]updating poms for branch'release/2.3' with non-snapshot versions new 7febca8 [jgitflow-maven-plugin]merging 'release/2.3' into 'master' new efb4aad [jgitflow-maven-plugin]merging 'master' into 'develop' new 4adc0cb [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 4adc0cb858b12b833b620c24b2f648331cff0278 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 16 09:50:26 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit efb4aadab04ba78f45e59c6adee344cd070da363 Merge: 6535bec 7febca8 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 16 09:50:19 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 6535bec2e691d88b47d2479fb5a881311215b1ab Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 16 09:50:19 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 7febca8f599bf537d4e7840a09c0ff993329af3d Merge: 92b4a8a 282973c Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 16 09:50:17 2017 +0100 [jgitflow-maven-plugin]merging 'release/2.3' into 'master' commit 282973c3e207372ee9abe10dde9650a86e60bc05 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 16 09:48:06 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.3' 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 282973c3e207372ee9abe10dde9650a86e60bc05 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 16 09:48:06 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.3' 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 6e74ae4..c6670d9 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.3-SNAPSHOT</version> + <version>2.3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 5bfb4df..6b066cc 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.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 45adaf1..7258e28 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.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 7f6a9b8..5a90319 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.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index a82721b..43c95cc 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</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 7febca8f599bf537d4e7840a09c0ff993329af3d Merge: 92b4a8a 282973c Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 16 09:50:17 2017 +0100 [jgitflow-maven-plugin]merging 'release/2.3' into 'master' faxtomail-persistence/pom.xml | 2 +- .../franciaflex/faxtomail/beans/Quantities.java | 57 +++++ .../faxtomail/beans/QuantitiesByRange.java | 56 +++++ .../persistence/entities/EmailFilter.java | 27 +++ .../persistence/entities/EmailTopiaDao.java | 83 ++++++- .../faxtomail/persistence/entities/MailField.java | 8 +- .../src/main/xmi/faxtomail.properties | 4 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 33422 -> 35324 bytes faxtomail-service/pom.xml | 2 +- .../faxtomail/services/FaxToMailServiceUtils.java | 13 ++ .../faxtomail/services/service/EmailService.java | 5 +- .../services/service/EmailServiceImpl.java | 38 ++-- .../exceptions/AlreadyLockedMailException.java | 10 +- ...14__add_colorize_invalid_demands_on_folders.sql | 7 + .../h2/V2_2_3_170313_1__add_last_printing_user.sql | 18 ++ ...3_2__add_printActionEqualTakeOnlyIfNotTaken.sql | 4 + ..._170314__move_invalidformactions_to_folders.sql | 10 + .../h2/V2_2_3_170315__add_last_printing_date.sql | 13 ++ ...14__add_colorize_invalid_demands_on_folders.sql | 12 + .../V2_2_3_170313_1__add_last_printing_user.sql | 19 ++ ...3_2__add_printActionEqualTakeOnlyIfNotTaken.sql | 6 + ..._170314__move_invalidformactions_to_folders.sql | 15 ++ .../V2_2_3_170315__add_last_printing_date.sql | 14 ++ .../services/service/EmailServiceTest.java | 13 +- faxtomail-ui-swing/pom.xml | 2 +- .../swing/actions/PrintOnDefaultPrinterAction.java | 22 +- .../ui/swing/actions/ShowDemandeAction.java | 25 ++- .../content/demande/DemandeListUIHandler.java | 39 +++- .../ui/swing/content/demande/DemandeUIHandler.java | 1 + .../ui/swing/content/demande/DemandeUIModel.java | 91 ++++---- .../swing/content/demande/DemandesUIHandler.java | 10 +- .../demande/QuantitiesByRangeUIHandler.java | 2 +- .../demande/actions/ArchiveFromListAction.java | 2 +- .../actions/ComputeQuantitiesByRangeAction.java | 27 ++- .../demande/actions/LoadFolderEmailsAction.java | 2 + .../OpenMailFolderChooserFromListAction.java | 2 +- .../demande/replies/DemandRepliesUIHandler.java | 18 +- .../ui/swing/content/pdfeditor/PDFEditorUI.jaxx | 2 +- .../content/pdfeditor/PDFEditorUIHandler.java | 10 +- .../print/AttachmentToPrintChooserUIHandler.java | 1 + .../ui/swing/content/reply/ReplyFormUIHandler.java | 17 +- .../content/reply/actions/SenderChangedAction.java | 2 +- .../content/search/SearchToGroupUIHandler.java | 12 +- .../util/AbstractFaxToMailDemandListHandler.java | 17 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 27 ++- .../faxtomail/ui/swing/util/DemandeTableModel.java | 12 + .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 47 +++- .../i18n/faxtomail-ui-swing_fr_FR.properties | 6 + faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/web/action/DemandDetailAction.java | 17 +- .../faxtomail/web/action/SearchAction.java | 6 + .../faxtomail/web/job/MailFilterJob.java | 32 +-- .../i18n/faxtomail-ui-web_fr_FR.properties | 2 + faxtomail-ui-web/src/main/resources/log4j2.xml | 2 +- .../WEB-INF/content/admin/configuration-input.jsp | 246 +++++++++++++++------ faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml | 2 +- faxtomail-ui-web/src/main/webapp/css/faxtomail.css | 4 + .../src/main/webapp/js/configuration.js | 99 +++++++-- pom.xml | 2 +- 59 files changed, 970 insertions(+), 276 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 6535bec2e691d88b47d2479fb5a881311215b1ab Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 16 09:50:19 2017 +0100 [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 fb3dd38..c6670d9 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-SNAPSHOT</version> + <version>2.3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 653ce1d..6b066cc 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-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index a97ffe4..7258e28 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-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index b4c3977..5a90319 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-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 238475f..43c95cc 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3</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 efb4aadab04ba78f45e59c6adee344cd070da363 Merge: 6535bec 7febca8 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 16 09:50:19 2017 +0100 [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 4adc0cb858b12b833b620c24b2f648331cff0278 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 16 09:50:26 2017 +0100 [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 c6670d9..fb3dd38 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.3</version> + <version>2.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 6b066cc..653ce1d 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.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 7258e28..a97ffe4 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.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 5a90319..b4c3977 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.3</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 43c95cc..238475f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.3</version> + <version>2.4-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