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@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@codelutin.com> Date: Tue Mar 28 11:13:19 2017 +0200 ajout du header de license commit 027559885ecf9f7869d67baac0e65f3507c02818 Author: Kevin Morin <morin@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@codelutin.com> Date: Fri Mar 24 15:44:59 2017 +0100 add license header commit 07601c60417c8ce9ea1839d95825709e953b43c3 Author: Kevin Morin <morin@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@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@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@codelutin.com> Date: Fri Mar 17 15:19:02 2017 +0100 fix filter commit 77c2b731afb9953d76533ff7709e7d974db113bd Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 15:18:47 2017 +0100 suppression code mort commit b7fb9560474b6e4a3010d7172a75e0467006a359 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 15:18:17 2017 +0100 fix lazy loading commit 11b71d6b4c603a85ac4fd5457b93f763d99f0dfa Author: Kevin Morin <morin@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@codelutin.com>.