- Faxtomail-commits - mailman.cloud.codelutin.com

branch develop updated (9bb7b96 -> af7ab6a)
by codelutin.com scm 04 Apr '17

04 Apr '17

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 9bb7b96 refs #9099 correction du changement de page adds 216e057 refs #9096 ne pas imprimer les pj inline par defaut adds be551e9 refs #9096 #9100 #9104 ajout des configurations adds 975a31d suppression code mort adds 8e7e3b0 refs #9096 #9100 #9104 ajout des configurations dans l'admin adds 08c3256 refs #9096 #9100 #9104 - impression ou non des pièces jointes de type inline - affichage des pj à la suite de l'email - affichage de la pj de conenu du mail dans le men "divers" adds d19e6b3 repositionnement "manuel" du séparateur pour ne pas avoir des positionnements par dossier new af7ab6a fixes #9096 Ne pas imprimer les pièces-jointes "contenu du mail texte" et "contenu du mail html" fixes #9100 Mettre les pièces "contenu du mail texte" et le "contenu du mail html" dans le bouton "Divers" fixes #9104 Afficher la 1ère pièce -jointe dans l'aperçu de l'élément The 1 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 af7ab6a1893f3929988257b5b9a44d81e56fcdb9 Merge: 9bb7b96 d19e6b3 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Apr 4 11:45:43 2017 +0200 fixes #9096 Ne pas imprimer les pièces-jointes "contenu du mail texte" et "contenu du mail html" fixes #9100 Mettre les pièces "contenu du mail texte" et le "contenu du mail html" dans le bouton "Divers" fixes #9104 Afficher la 1ère pièce -jointe dans l'aperçu de l'élément Summary of changes: faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35918 -> 36206 bytes .../services/service/EmailServiceImpl.java | 32 +++++-- ...ttachments_mailContentWithInlineAttachments.sql | 11 +++ .../V2_4_170403_1__add_showAttachmentPreview.sql | 4 + ...ttachments_mailContentWithInlineAttachments.sql | 15 +++ .../V2_4_170403_1__add_showAttachmentPreview.sql | 5 + .../content/attachment/AttachmentCellRenderer.java | 8 -- .../content/attachment/AttachmentEditorUI.jaxx | 10 +- .../attachment/AttachmentEditorUIHandler.java | 26 ++++-- .../attachment/AttachmentEditorUIModel.java | 25 ++++- .../swing/content/attachment/AttachmentItem.jaxx | 2 +- .../content/attachment/AttachmentModelAware.java | 2 + .../swing/content/attachment/ButtonAttachment.java | 10 +- .../content/demande/DemandeListUIHandler.java | 25 +++-- .../ui/swing/content/demande/DemandeUIModel.java | 14 +++ .../demande/actions/LoadFolderEmailsAction.java | 6 ++ .../content/pdfeditor/PDFEditorUIHandler.java | 4 - .../print/AttachmentToPrintChooserUIHandler.java | 20 ++-- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 102 ++++++++++++++++++++- .../WEB-INF/content/admin/configuration-input.jsp | 51 +++++++++++ .../src/main/webapp/js/configuration.js | 9 ++ pom.xml | 2 +- 22 files changed, 328 insertions(+), 55 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170330_2__add_mailContentType_printinlineattachments_mailContentWithInlineAttachments.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170403_1__add_showAttachmentPreview.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170330_2__add_mailContentType_printinlineattachments_mailContentWithInlineAttachments.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170403_1__add_showAttachmentPreview.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/9096_print_only_one_content updated (08c3256 -> d19e6b3)
by codelutin.com scm 04 Apr '17

04 Apr '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/9096_print_only_one_content in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 08c3256 refs #9096 #9100 #9104 - impression ou non des pièces jointes de type inline - affichage des pj à la suite de l'email - affichage de la pj de conenu du mail dans le men "divers" new d19e6b3 repositionnement "manuel" du séparateur pour ne pas avoir des positionnements par dossier The 1 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 d19e6b3c35c9e2e0db32782c25c592a57dfc921c Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Apr 4 11:27:11 2017 +0200 repositionnement "manuel" du séparateur pour ne pas avoir des positionnements par dossier Summary of changes: .../ui/swing/content/demande/actions/LoadFolderEmailsAction.java | 6 ++++++ 1 file changed, 6 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/9096_print_only_one_content updated (216e057 -> 08c3256)
by codelutin.com scm 03 Apr '17

03 Apr '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/9096_print_only_one_content in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 216e057 refs #9096 ne pas imprimer les pj inline par defaut new be551e9 refs #9096 #9100 #9104 ajout des configurations new 975a31d suppression code mort new 8e7e3b0 refs #9096 #9100 #9104 ajout des configurations dans l'admin new 08c3256 refs #9096 #9100 #9104 - impression ou non des pièces jointes de type inline - affichage des pj à la suite de l'email - affichage de la pj de conenu du mail dans le men "divers" The 4 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 08c32567afcb1b617a815f0c82b0cfe249887180 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Apr 3 16:52:09 2017 +0200 refs #9096 #9100 #9104 - impression ou non des pièces jointes de type inline - affichage des pj à la suite de l'email - affichage de la pj de conenu du mail dans le men "divers" commit 8e7e3b09e66516aca790e4e371999acd124cfca1 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Apr 3 16:50:25 2017 +0200 refs #9096 #9100 #9104 ajout des configurations dans l'admin commit 975a31d9c056b6e531e7ff12e9ff9aff4d148c9d Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Apr 3 16:50:03 2017 +0200 suppression code mort commit be551e938bf581f1bde80f7a94f51841e2d50799 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Apr 3 16:48:02 2017 +0200 refs #9096 #9100 #9104 ajout des configurations Summary of changes: faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35918 -> 36206 bytes .../services/service/EmailServiceImpl.java | 32 +++++-- ...ttachments_mailContentWithInlineAttachments.sql | 11 +++ .../V2_4_170403_1__add_showAttachmentPreview.sql | 4 + ...ttachments_mailContentWithInlineAttachments.sql | 15 +++ .../V2_4_170403_1__add_showAttachmentPreview.sql | 5 + .../content/attachment/AttachmentCellRenderer.java | 8 -- .../content/attachment/AttachmentEditorUI.jaxx | 10 +- .../attachment/AttachmentEditorUIHandler.java | 26 ++++-- .../attachment/AttachmentEditorUIModel.java | 25 ++++- .../swing/content/attachment/AttachmentItem.jaxx | 2 +- .../content/attachment/AttachmentModelAware.java | 2 + .../swing/content/attachment/ButtonAttachment.java | 10 +- .../content/demande/DemandeListUIHandler.java | 9 +- .../ui/swing/content/demande/DemandeUIModel.java | 14 +++ .../content/pdfeditor/PDFEditorUIHandler.java | 4 - .../print/AttachmentToPrintChooserUIHandler.java | 13 ++- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 102 ++++++++++++++++++++- .../WEB-INF/content/admin/configuration-input.jsp | 51 +++++++++++ .../src/main/webapp/js/configuration.js | 9 ++ pom.xml | 2 +- 21 files changed, 310 insertions(+), 44 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170330_2__add_mailContentType_printinlineattachments_mailContentWithInlineAttachments.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170403_1__add_showAttachmentPreview.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170330_2__add_mailContentType_printinlineattachments_mailContentWithInlineAttachments.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170403_1__add_showAttachmentPreview.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch feature/9096_print_only_one_content created (now 216e057)
by codelutin.com scm 30 Mar '17

30 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/9096_print_only_one_content in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git at 216e057 refs #9096 ne pas imprimer les pj inline par defaut This branch includes the following new commits: new 216e057 refs #9096 ne pas imprimer les pj inline par defaut The 1 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 216e057837ff7f2a239c36d3c25a4121f4aa6eb6 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 30 15:59:27 2017 +0200 refs #9096 ne pas imprimer les pj inline par defaut -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (51154fd -> 9bb7b96)
by codelutin.com scm 30 Mar '17

30 Mar '17

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 51154fd fixes #9099 Ajouter le tri sur les colonnes new 9bb7b96 refs #9099 correction du changement de page The 1 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 9bb7b96c23d9e75c30e1d57cca97d95d5b0c01e5 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 30 15:13:58 2017 +0200 refs #9099 correction du changement de page Summary of changes: .../ui/swing/content/attachment/AttachmentEditorUIModel.java | 2 +- .../faxtomail/ui/swing/content/demande/DemandeListUIModel.java | 4 ++++ .../ui/swing/content/demande/actions/LoadFolderEmailsAction.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (bd0dddd -> 51154fd)
by codelutin.com scm 30 Mar '17

30 Mar '17

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 bd0dddd fixes #9103 Ajouter une fonction transférer, pour transférer une demande avec toutes les pièces jointes qui ne sont pas dans "Divers" adds 11b71d6 fixes #9095 le pris par n'est pas enregistré quand on imprime depuis la liste adds b7fb956 fix lazy loading adds 77c2b73 suppression code mort adds f339092 fix filter adds abcabd8 refs #9099 ajout de la conf canChangeOrderInTable dans les dossiers adds 79eca5d refs #9099 gestion de la conf canChangeOrderInTable dans la partie admin adds 07601c6 refs #9099 prise en compte de la conf canChangeOrderInTable dans la partie cliente adds 5ace615 add license header adds 0275598 refs #9099 enregistrement du tri pour chaque dossier adds 4247750 ajout du header de license adds 560a494 refs #9099 merge model + change migrtaion file names new 51154fd fixes #9099 Ajouter le tri sur les colonnes The 1 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 51154fddcaa28bfdb571e2587885ac543aef08d6 Merge: bd0dddd 560a494 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 30 11:32:11 2017 +0200 fixes #9099 Ajouter le tri sur les colonnes Summary of changes: .../entities/AbstractFaxToMailTopiaDao.java | 32 ++ .../persistence/entities/EmailFilter.java | 3 +- .../persistence/entities/EmailTopiaDao.java | 375 +++++++++++---------- .../faxtomail/persistence/entities/MailField.java | 68 ++-- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35847 -> 35918 bytes .../services/service/EmailServiceImpl.java | 1 + .../V2_4_170330_1__add_canChangeOrderInTable.sql | 4 + .../V2_4_170330_1__add_canChangeOrderInTable.sql | 6 + .../faxtomail/ui/swing/FaxToMailUIContext.java | 3 + .../swing/actions/PrintOnDefaultPrinterAction.java | 15 +- .../content/demande/DemandeListTableFilter.java | 12 +- .../content/demande/DemandeListUIHandler.java | 62 +++- .../swing/content/demande/DemandeListUIModel.java | 48 ++- .../demande/actions/LoadFolderEmailsAction.java | 13 +- .../swing/util/DemandeListUISwingSessionState.java | 99 ++++++ .../faxtomail/ui/swing/util/DemandeTableModel.java | 65 ++-- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 4 - .../util/FilterSortableTableHeaderRenderer.java | 97 ++++++ .../src/main/resources/icons/sort_table_asc.png | Bin 0 -> 219 bytes .../src/main/resources/icons/sort_table_desc.png | Bin 0 -> 208 bytes .../WEB-INF/content/admin/configuration-input.jsp | 18 + .../src/main/webapp/js/configuration.js | 6 +- pom.xml | 4 +- 23 files changed, 666 insertions(+), 269 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170330_1__add_canChangeOrderInTable.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170330_1__add_canChangeOrderInTable.sql create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeListUISwingSessionState.java create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FilterSortableTableHeaderRenderer.java create mode 100644 faxtomail-ui-swing/src/main/resources/icons/sort_table_asc.png create mode 100644 faxtomail-ui-swing/src/main/resources/icons/sort_table_desc.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/9099_order_on_columns updated (2458ea5 -> 560a494)
by codelutin.com scm 30 Mar '17

30 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/9099_order_on_columns in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git discards 2458ea5 ajout du header de license discards 2714984 refs #9099 enregistrement du tri pour chaque dossier discards f1e01ea add license header discards b10475f refs #9099 prise en compte de la conf canChangeOrderInTable dans la partie cliente discards 3e42c20 refs #9099 gestion de la conf canChangeOrderInTable dans la partie admin discards 8a4d54a refs #9099 ajout de la conf canChangeOrderInTable dans les dossiers discards f38d01e fix filter discards 4dc19e1 suppression code mort discards dbccb2f fix lazy loading discards a3de618 fixes #9095 le pris par n'est pas enregistré quand on imprime depuis la liste adds 7bbc801 refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + migration adds 8b1fffe refs #9098 gestion de la conf displayOnlyUserTrigraphInTables dans la partie admin adds 3b330c4 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente adds 5d6d9e3 renommage des scripts de migration adds 0703d50 fixes #9098 Colonne "Pris par" : n'afficher que le tryptique (gain de place) adds 6ea48a1 refs #9103 ajout de la conf pour afficher ou non les boutons repondre et transférer dans les dossiers adds 27d6a5a refs #9103 gestion de la conf de répondre et transférer dans la partie admin adds 39ab5e9 refs #9103 prise en compte de la conf des fonctions répondre et transférer dans la partie cliente adds bd0dddd fixes #9103 Ajouter une fonction transférer, pour transférer une demande avec toutes les pièces jointes qui ne sont pas dans "Divers" new 11b71d6 fixes #9095 le pris par n'est pas enregistré quand on imprime depuis la liste new b7fb956 fix lazy loading new 77c2b73 suppression code mort new f339092 fix filter new abcabd8 refs #9099 ajout de la conf canChangeOrderInTable dans les dossiers new 79eca5d refs #9099 gestion de la conf canChangeOrderInTable dans la partie admin new 07601c6 refs #9099 prise en compte de la conf canChangeOrderInTable dans la partie cliente new 5ace615 add license header new 0275598 refs #9099 enregistrement du tri pour chaque dossier new 4247750 ajout du header de license new 560a494 refs #9099 merge model + change migrtaion file names This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2458ea5) \ N -- N -- N refs/heads/feature/9099_order_on_columns (560a494) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 11 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 560a49475a97a4c17f5367c275664d2cb4d9007d Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 30 11:31:26 2017 +0200 refs #9099 merge model + change migrtaion file names commit 4247750f730338d1dcc2d0b7cb85348bfbdd84b7 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 28 11:13:19 2017 +0200 ajout du header de license commit 027559885ecf9f7869d67baac0e65f3507c02818 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 28 11:06:13 2017 +0200 refs #9099 enregistrement du tri pour chaque dossier commit 5ace615b669f062e776f5476ccbcac5c90c95687 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 24 15:44:59 2017 +0100 add license header commit 07601c60417c8ce9ea1839d95825709e953b43c3 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 24 15:39:24 2017 +0100 refs #9099 prise en compte de la conf canChangeOrderInTable dans la partie cliente commit 79eca5d292aa4401bf3b97c3058efb49b1279db8 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 24 15:38:00 2017 +0100 refs #9099 gestion de la conf canChangeOrderInTable dans la partie admin commit abcabd83317df2f6fbf74435862f615d5963457a Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 24 15:37:35 2017 +0100 refs #9099 ajout de la conf canChangeOrderInTable dans les dossiers commit f339092591d6635fec97819871be79cdd6b82ea6 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 17 15:19:02 2017 +0100 fix filter commit 77c2b731afb9953d76533ff7709e7d974db113bd Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 17 15:18:47 2017 +0100 suppression code mort commit b7fb9560474b6e4a3010d7172a75e0467006a359 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 17 15:18:17 2017 +0100 fix lazy loading commit 11b71d6b4c603a85ac4fd5457b93f763d99f0dfa Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 17 15:20:06 2017 +0100 fixes #9095 le pris par n'est pas enregistré quand on imprime depuis la liste Summary of changes: .../faxtomail/persistence/entities/MailAction.java | 1 + faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35710 -> 35918 bytes .../faxtomail/services/DecoratorService.java | 1 + .../faxtomail/services/DecoratorServiceImpl.java | 1 + ...0328_1__add_displayOnlyUserTrigraphInTables.sql | 4 ++ .../h2/V2_4_170328_2__add_show_actions_config.sql | 5 ++ ...> V2_4_170330_1__add_canChangeOrderInTable.sql} | 0 ...0328_1__add_displayOnlyUserTrigraphInTables.sql | 6 +++ .../V2_4_170328_2__add_show_actions_config.sql | 7 +++ ...> V2_4_170330_1__add_canChangeOrderInTable.sql} | 0 .../ui/swing/content/demande/DemandeListUI.css | 10 ++++ .../ui/swing/content/demande/DemandeListUI.jaxx | 1 + .../content/demande/DemandeListUIHandler.java | 23 ++++++++ .../swing/content/demande/DemandeListUIModel.java | 55 +++++++++++++++++++ .../ui/swing/content/demande/DemandesUI.css | 8 +++ .../ui/swing/content/demande/DemandesUI.jaxx | 38 +++++++++---- .../swing/content/demande/DemandesUIHandler.java | 30 ++++++++++- .../ui/swing/content/demande/DemandesUIModel.java | 36 +++++++++++++ ...yFormAction.java => OpenForwardFormAction.java} | 17 ++---- .../demande/actions/OpenReplyFormAction.java | 1 + ...tion.java => SaveAndOpenForwardFormAction.java} | 17 ++---- .../actions/SaveAndOpenReplyFormAction.java | 2 +- .../demande/replies/DemandRepliesUIHandler.java | 1 + .../demande/replies/actions/OpenReplyAction.java | 5 +- .../ui/swing/content/reply/ReplyFormUI.css | 10 ++-- .../ui/swing/content/reply/ReplyFormUI.jaxx | 33 ++++++------ .../ui/swing/content/reply/ReplyFormUIHandler.java | 59 ++++++++++++++++----- .../ui/swing/content/reply/ReplyFormUIModel.java | 12 +++++ .../content/search/SearchToGroupUIHandler.java | 5 ++ .../ui/swing/content/search/SearchUIHandler.java | 5 ++ .../util/AbstractFaxToMailDemandListHandler.java | 9 +++- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 5 +- .../i18n/faxtomail-ui-swing_fr_FR.properties | 4 ++ .../i18n/faxtomail-ui-web_fr_FR.properties | 1 + .../WEB-INF/content/admin/configuration-input.jsp | 56 ++++++++++++++++++- .../src/main/webapp/js/configuration.js | 20 ++++--- 36 files changed, 399 insertions(+), 89 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170328_2__add_show_actions_config.sql rename faxtomail-service/src/main/resources/db/migration/h2/{V2_4_170317_2__add_canChangeOrderInTable.sql => V2_4_170330_1__add_canChangeOrderInTable.sql} (100%) create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170328_2__add_show_actions_config.sql rename faxtomail-service/src/main/resources/db/migration/sqlserver/{V2_4_170317_2__add_canChangeOrderInTable.sql => V2_4_170330_1__add_canChangeOrderInTable.sql} (100%) copy faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/{OpenReplyFormAction.java => OpenForwardFormAction.java} (83%) copy faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/{SaveAndOpenReplyFormAction.java => SaveAndOpenForwardFormAction.java} (77%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 11

branch develop updated (0703d50 -> bd0dddd)
by codelutin.com scm 30 Mar '17

30 Mar '17

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 0703d50 fixes #9098 Colonne "Pris par" : n'afficher que le tryptique (gain de place) new 6ea48a1 refs #9103 ajout de la conf pour afficher ou non les boutons repondre et transférer dans les dossiers new 27d6a5a refs #9103 gestion de la conf de répondre et transférer dans la partie admin new 39ab5e9 refs #9103 prise en compte de la conf des fonctions répondre et transférer dans la partie cliente new bd0dddd fixes #9103 Ajouter une fonction transférer, pour transférer une demande avec toutes les pièces jointes qui ne sont pas dans "Divers" The 4 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 bd0dddd7babaa1c5e34e815cf7ca8696da88ed56 Merge: 0703d50 39ab5e9 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 30 11:09:45 2017 +0200 fixes #9103 Ajouter une fonction transférer, pour transférer une demande avec toutes les pièces jointes qui ne sont pas dans "Divers" commit 39ab5e9dcfc3a010664281bc73c21764e5df44e8 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 30 11:09:18 2017 +0200 refs #9103 prise en compte de la conf des fonctions répondre et transférer dans la partie cliente commit 27d6a5aaa1d782b41b2f6742ebcf359bc87553ef Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 30 11:08:19 2017 +0200 refs #9103 gestion de la conf de répondre et transférer dans la partie admin commit 6ea48a1b20339edc842a1d6a036f72cc5e9492b1 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 30 11:07:22 2017 +0200 refs #9103 ajout de la conf pour afficher ou non les boutons repondre et transférer dans les dossiers Summary of changes: .../faxtomail/persistence/entities/MailAction.java | 1 + faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35759 -> 35847 bytes .../h2/V2_4_170328_2__add_show_actions_config.sql | 5 ++ .../V2_4_170328_2__add_show_actions_config.sql | 7 +++ .../ui/swing/content/demande/DemandeListUI.css | 10 ++++ .../ui/swing/content/demande/DemandeListUI.jaxx | 1 + .../content/demande/DemandeListUIHandler.java | 24 +++++++-- .../swing/content/demande/DemandeListUIModel.java | 39 ++++++++++++++ .../ui/swing/content/demande/DemandesUI.css | 8 +++ .../ui/swing/content/demande/DemandesUI.jaxx | 38 +++++++++---- .../swing/content/demande/DemandesUIHandler.java | 30 ++++++++++- .../ui/swing/content/demande/DemandesUIModel.java | 36 +++++++++++++ ...yFormAction.java => OpenForwardFormAction.java} | 17 ++---- .../demande/actions/OpenReplyFormAction.java | 1 + ...tion.java => SaveAndOpenForwardFormAction.java} | 17 ++---- .../actions/SaveAndOpenReplyFormAction.java | 2 +- .../demande/replies/DemandRepliesUIHandler.java | 1 + .../demande/replies/actions/OpenReplyAction.java | 5 +- .../ui/swing/content/reply/ReplyFormUI.css | 10 ++-- .../ui/swing/content/reply/ReplyFormUI.jaxx | 33 ++++++------ .../ui/swing/content/reply/ReplyFormUIHandler.java | 59 ++++++++++++++++----- .../ui/swing/content/reply/ReplyFormUIModel.java | 12 +++++ .../ui/swing/util/AbstractFaxToMailUIHandler.java | 5 +- .../i18n/faxtomail-ui-swing_fr_FR.properties | 4 ++ .../i18n/faxtomail-ui-web_fr_FR.properties | 1 + .../WEB-INF/content/admin/configuration-input.jsp | 39 +++++++++++++- .../src/main/webapp/js/configuration.js | 8 +++ 27 files changed, 326 insertions(+), 87 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170328_2__add_show_actions_config.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170328_2__add_show_actions_config.sql copy faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/{OpenReplyFormAction.java => OpenForwardFormAction.java} (83%) copy faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/{SaveAndOpenReplyFormAction.java => SaveAndOpenForwardFormAction.java} (77%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (ac713b3 -> 0703d50)
by codelutin.com scm 28 Mar '17

28 Mar '17

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 ac713b3 fixes #9105 NPE si le dossier est vide adds 7bbc801 refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + migration adds 8b1fffe refs #9098 gestion de la conf displayOnlyUserTrigraphInTables dans la partie admin adds 3b330c4 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente adds 5d6d9e3 renommage des scripts de migration new 0703d50 fixes #9098 Colonne "Pris par" : n'afficher que le tryptique (gain de place) The 1 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 0703d50dc192ce9afcc60d9d8ae0fe90eb71c073 Merge: ac713b3 5d6d9e3 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 28 11:37:57 2017 +0200 fixes #9098 Colonne "Pris par" : n'afficher que le tryptique (gain de place) Summary of changes: faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35628 -> 35759 bytes .../faxtomail/services/DecoratorService.java | 1 + .../faxtomail/services/DecoratorServiceImpl.java | 1 + ...0328_1__add_displayOnlyUserTrigraphInTables.sql | 4 + ...0328_1__add_displayOnlyUserTrigraphInTables.sql | 6 ++ .../content/demande/DemandeListUIHandler.java | 5 + .../swing/content/demande/DemandeListUIModel.java | 16 ++++ .../content/search/SearchToGroupUIHandler.java | 5 + .../ui/swing/content/search/SearchUIHandler.java | 5 + .../util/AbstractFaxToMailDemandListHandler.java | 9 +- .../WEB-INF/content/admin/configuration-input.jsp | 101 ++++++++++++--------- .../src/main/webapp/js/configuration.js | 10 +- 12 files changed, 115 insertions(+), 48 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/9098_user_trigraph_in_table updated (f151590 -> 5d6d9e3)
by codelutin.com scm 28 Mar '17

28 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/9098_user_trigraph_in_table in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git discards f151590 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente discards 9fcfbfd refs #9098 gestion de la conf displayOnlyUserTrigraphInTables dans la partie admin discards abe072a refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + migration adds 612fdef fixes #9097 ajout de la colonne imprimé le adds 404df93 [jgitflow-maven-plugin]updating poms for 2.4-SNAPSHOT development adds 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 adds 282973c [jgitflow-maven-plugin]updating poms for branch'release/2.3' with non-snapshot versions adds 7febca8 [jgitflow-maven-plugin]merging 'release/2.3' into 'master' adds efb4aad [jgitflow-maven-plugin]merging 'master' into 'develop' adds 4adc0cb [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds eb8efb3 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale adds 96e2192 refs #9101 ajout de la conf canViewOriginalAttachments dans les dossiers adds 315f884 refs #9101 gestion de la conf canViewOriginalAttachments dans la partie admin adds dac305a refs #9101 prise en compte de la conf canViewOriginalAttachments dans la partie cliente adds bd07a3e fixes #9101 Ouvrir les pièces-jointes que en modification adds 2d536bc refs #9094 affichage d'un message de warning et ouverture en edition adds 667f866 refs #9094 ajout de la conf mustTakeToEditDemand dans les dossiers adds a026aa0 refs #9094 gestion de la conf mustTakeToEditDemand dans la partie admin adds 6b1dcef refs #9094 prise en compte de la conf mustTakeToEditDemand dans la partie cliente adds dd3a3cd fixes #9094 Demandes toujours ouvertes en modification adds a6d3711 refs #9094 fix npe adds 52d9074 refs #9109 ajout de la conf displayHelpOnMessages dans les dossiers adds 4c24877 refs #9109 gestion de la conf displayHelpOnMessages dans la partie admin adds 21cd5b7 refs #9109 prise en compte de la conf displayHelpOnMessages dans la partie cliente adds 3ced46d fixes #9109 Simplifier le message pour quitter la demande adds bab2e84 refs #9105 ajout de la conf computeQuantitiesSubtotalsByState dans les dossiers adds 89074c5 refs #9105 gestion de la conf computeQuantitiesSubtotalsByState dans la partie admin adds fe0ebb0 refs #9105 prise en compte de la conf computeQuantitiesSubtotalsByState dans la partie cliente adds 4d97dec fixes #9105 Modifier l'écran des quantités par gamme :ajouter les totaux sur les colonnes en fonction de l'état de la demande. adds ac713b3 fixes #9105 NPE si le dossier est vide new 7bbc801 refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + migration new 8b1fffe refs #9098 gestion de la conf displayOnlyUserTrigraphInTables dans la partie admin new 3b330c4 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente new 5d6d9e3 renommage des scripts de migration This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f151590) \ N -- N -- N refs/heads/feature/9098_user_trigraph_in_table (5d6d9e3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 4 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 5d6d9e313b3e4d757c94f60f465ed01f170ae2a1 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 28 11:37:23 2017 +0200 renommage des scripts de migration commit 3b330c49776b828c32d58d30528e4d80b9a469f8 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 15 11:11:47 2017 +0100 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente commit 8b1fffe06386d09af0f1e9dfeaeb147ab1ed2a92 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 15 11:11:15 2017 +0100 refs #9098 gestion de la conf displayOnlyUserTrigraphInTables dans la partie admin commit 7bbc801cb727a201671eb9195cc9fdd5bdf18240 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 15 11:10:47 2017 +0100 refs #9098 ajout de la configuration displayOnlyUserTrigraphInTables + migration Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../faxtomail/beans/QuantitiesByRange.java | 19 +++++- .../persistence/entities/EmailFilter.java | 13 ++++ .../persistence/entities/EmailTopiaDao.java | 57 ++++++++++++++-- .../faxtomail/persistence/entities/MailField.java | 6 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35357 -> 35759 bytes faxtomail-service/pom.xml | 2 +- .../services/service/EmailServiceImpl.java | 33 ++++------ .../h2/V2_2_3_170315__add_last_printing_date.sql | 13 ++++ ..._4_170316_1__add_canViewOriginalAttachments.sql | 4 ++ .../h2/V2_4_170316_2__add_mustTakeToEditDemand.sql | 4 ++ .../V2_4_170316_3__add_displayHelpOnMessages.sql | 4 ++ ...17_1__add_computeQuantitiesSubtotalsByState.sql | 4 ++ ...328_1__add_displayOnlyUserTrigraphInTables.sql} | 0 .../V2_2_3_170315__add_last_printing_date.sql | 14 ++++ ..._4_170316_1__add_canViewOriginalAttachments.sql | 6 ++ .../V2_4_170316_2__add_mustTakeToEditDemand.sql | 6 ++ .../V2_4_170316_3__add_displayHelpOnMessages.sql | 6 ++ ...17_1__add_computeQuantitiesSubtotalsByState.sql | 6 ++ ...328_1__add_displayOnlyUserTrigraphInTables.sql} | 0 faxtomail-ui-swing/pom.xml | 2 +- .../swing/actions/PrintOnDefaultPrinterAction.java | 1 + .../ui/swing/actions/ShowDemandeAction.java | 70 ++++++++++++-------- .../content/attachment/AttachmentCellEditor.java | 2 +- .../attachment/AttachmentEditorUIHandler.java | 23 ++++++- .../attachment/AttachmentEditorUIModel.java | 13 ++++ .../ui/swing/content/attachment/AttachmentItem.css | 11 +++- .../swing/content/attachment/AttachmentItem.jaxx | 10 ++- .../content/attachment/AttachmentModelAware.java | 2 + .../swing/content/attachment/ButtonAttachment.java | 5 ++ .../content/demande/DemandeListUIHandler.java | 4 ++ .../ui/swing/content/demande/DemandeUIHandler.java | 40 ++++++------ .../ui/swing/content/demande/DemandeUIModel.java | 26 +++++++- .../actions/ComputeQuantitiesByRangeAction.java | 38 ++++++++--- .../actions/OpenGroupedDemandAction.java | 72 +++++++++++++-------- .../content/pdfeditor/PDFEditorUIHandler.java | 1 + .../util/AbstractFaxToMailDemandListHandler.java | 1 + .../ui/swing/util/AbstractFaxToMailUIHandler.java | 38 +++++++++-- .../faxtomail/ui/swing/util/DemandeTableModel.java | 6 ++ .../i18n/faxtomail-ui-swing_fr_FR.properties | 8 +++ faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/web/action/SearchAction.java | 6 ++ .../i18n/faxtomail-ui-web_fr_FR.properties | 1 + .../WEB-INF/content/admin/configuration-input.jsp | 68 +++++++++++++++++++ .../src/main/webapp/js/configuration.js | 16 +++++ pom.xml | 2 +- 46 files changed, 535 insertions(+), 132 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170315__add_last_printing_date.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170316_1__add_canViewOriginalAttachments.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170316_2__add_mustTakeToEditDemand.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170316_3__add_displayHelpOnMessages.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170317_1__add_computeQuantitiesSubtotalsByState.sql rename faxtomail-service/src/main/resources/db/migration/h2/{V2_2_3_170315_1__add_displayOnlyUserTrigraphInTables.sql => V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql} (100%) create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170315__add_last_printing_date.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_1__add_canViewOriginalAttachments.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_2__add_mustTakeToEditDemand.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170316_3__add_displayHelpOnMessages.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170317_1__add_computeQuantitiesSubtotalsByState.sql rename faxtomail-service/src/main/resources/db/migration/sqlserver/{V2_2_3_170315_1__add_displayOnlyUserTrigraphInTables.sql => V2_4_170328_1__add_displayOnlyUserTrigraphInTables.sql} (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4