This is an automated email from the git hooks/post-receive script. New change to branch master in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 92b4a8a [jgitflow-maven-plugin]merging 'release/2.2.2' into 'master' adds 6d8d0e7 [jgitflow-maven-plugin]updating poms for 2.2.3-SNAPSHOT development adds 9884b0e [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds ee10ecc [jgitflow-maven-plugin]merging 'master' into 'develop' adds c0811eb [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds ae907e6 fixes #9033 Administration : Filtre des mails mal ordonnés adds f51476e fixes #9031 Administration :Liste déroulante des groupes et utilisateurs non filtrable adds 92566c5 fixes #9031 correction des sélections des listes adds 89fdce0 fixes #9041 Listes de mails : le filtre sur le nom des clients n'est pas supprimé quand on supprime tous les filtres adds e7bb5a6 fixes #9042 Impression : les éléments ne sont pas imprimés dans l'ordre chronologique adds c92c6f0 fixes #9043 Contenu du mail : si le mail est long, on affiche le bas du mail adds 9789fd7 fixes #9048 Le scroll est lent dans le contenu du mail adds 2a02ea0 fixes #9050 Liste des éléments : permettre de ne pas afficher les lignes non valides en rouge adds 43271c8 fixes #9052 Ajouter une ligne "Totaux" dans le tableau des quantités par gamme sur les dossiers adds ad15ae4 fixes #9054 Pouvoir consulter en lecture seule un mail bloqué par un autre utilisateur adds 5ff7966 fixes #9057 Transfert de réponse : il manque le destinataire de la réponse initiale adds 0d472af add license headers adds 95a0a05 fixes #9047 Contenu du mail : le mail est éditable quand on affiche la version texte adds 124839b fix migration on sqlserver adds 009f175 fixes #9052 pbm group by on sql server adds 75ad610 fixes #9102 Accélérer le scroll adds e8d3a93 fixes #9097 créer la colonne "Imprimé Le" adds fa12f50 refs #9097 ajout de la migration sqlserver adds e3f2f18 fixes #9095 L'impression doit mettre à jour le champ "Pris par" (sans l'ouvris, via le clic droit) sauf si la demande est déjà prise. adds 78af899 fixes #9095 adds 1a99011 refs #9106 migration des actions inactives de la conf générale à l'arborescence adds b13b6b1 refs #9106 modif partie admin des actions inactives de la conf générale à l'arborescence adds 2bc31a1 refs #9106 modif partie cliente des actions inactives de la conf générale à l'arborescence adds dee3815 Merge branch 'feature/9106_deplacement_parametrage_actions_invalides_dans_arborescence' into develop adds 48905b7 fix migration adds 612fdef fixes #9097 ajout de la colonne imprimé le 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' No new revisions were added by this update. Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../AttachmentImpl.java => beans/Quantities.java} | 48 ++-- .../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, 942 insertions(+), 295 deletions(-) copy faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/{persistence/entities/AttachmentImpl.java => beans/Quantities.java} (51%) create mode 100644 faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/beans/QuantitiesByRange.java create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170214__add_colorize_invalid_demands_on_folders.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170313_1__add_last_printing_user.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170313_2__add_printActionEqualTakeOnlyIfNotTaken.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170314__move_invalidformactions_to_folders.sql 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/sqlserver/V2_2_3_170214__add_colorize_invalid_demands_on_folders.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170313_1__add_last_printing_user.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170313_2__add_printActionEqualTakeOnlyIfNotTaken.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170314__move_invalidformactions_to_folders.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170315__add_last_printing_date.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.