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

branch develop updated (3ced46d -> 4d97dec)
by codelutin.com scm 17 Mar '17

17 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 3ced46d fixes #9109 Simplifier le message pour quitter la demande new bab2e84 refs #9105 ajout de la conf computeQuantitiesSubtotalsByState dans les dossiers new 89074c5 refs #9105 gestion de la conf computeQuantitiesSubtotalsByState dans la partie admin new fe0ebb0 refs #9105 prise en compte de la conf computeQuantitiesSubtotalsByState dans la partie cliente new 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. 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 4d97decb1569ef50cbdfb4d727ce08d101cce1b3 Merge: 3ced46d fe0ebb0 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 17 15:46:32 2017 +0100 fixes #9105 Modifier l'écran des quantités par gamme :ajouter les totaux sur les colonnes en fonction de l'état de la demande. commit fe0ebb0b71e8e82b902e242ecf2018cde2b7358e Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 17 14:38:37 2017 +0100 refs #9105 prise en compte de la conf computeQuantitiesSubtotalsByState dans la partie cliente commit 89074c51f75c50e12ffe9e907ebe6ef1ba6f15b9 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 17 14:38:06 2017 +0100 refs #9105 gestion de la conf computeQuantitiesSubtotalsByState dans la partie admin commit bab2e8406503971362d49ed13710712525dfba29 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 17 14:37:39 2017 +0100 refs #9105 ajout de la conf computeQuantitiesSubtotalsByState dans les dossiers Summary of changes: .../faxtomail/beans/QuantitiesByRange.java | 19 ++++++++++- .../persistence/entities/EmailTopiaDao.java | 37 +++++++++++++++++--- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35540 -> 35628 bytes .../services/service/EmailServiceImpl.java | 12 +++++-- ...17_1__add_computeQuantitiesSubtotalsByState.sql | 4 +++ ...17_1__add_computeQuantitiesSubtotalsByState.sql | 6 ++++ .../actions/ComputeQuantitiesByRangeAction.java | 38 ++++++++++++++++----- .../i18n/faxtomail-ui-swing_fr_FR.properties | 2 ++ .../WEB-INF/content/admin/configuration-input.jsp | 37 ++++++++++++++------ .../src/main/webapp/js/configuration.js | 4 +++ 10 files changed, 133 insertions(+), 26 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_4_170317_1__add_computeQuantitiesSubtotalsByState.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170317_1__add_computeQuantitiesSubtotalsByState.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch faxtomail-2.3.x updated (a21a77e -> ccdf794)
by codelutin.com scm 17 Mar '17

17 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch faxtomail-2.3.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from a21a77e fixes #9095 le pris par n'est pas enregistré quand on imprime depuis la liste new ccdf794 versions snaphsot 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 ccdf794d17ead96bef4a693a724b18e2d1a3d3ea Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 17 15:29:45 2017 +0100 versions snaphsot Summary of changes: 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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch faxtomail-2.3.x created (now a21a77e)
by codelutin.com scm 17 Mar '17

17 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch faxtomail-2.3.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git at a21a77e fixes #9095 le pris par n'est pas enregistré quand on imprime depuis la liste This branch includes the following new commits: new e83eb03 fix lazy loading new 2950458 suppression code mort new f1cf122 fix filter new a21a77e fixes #9095 le pris par n'est pas enregistré quand on imprime depuis la liste 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 a21a77e9e4deee58039b64c4419744095882b52b 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 commit f1cf12245362a4127c0e13f7f74373f6fa71d0b6 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 17 15:19:02 2017 +0100 fix filter commit 2950458f5b8c21d1dad32f79df014321d9165233 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 17 15:18:47 2017 +0100 suppression code mort commit e83eb03efd9f39da2ba8d02074c5f6c61b607c8e Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 17 15:18:17 2017 +0100 fix lazy loading -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (dd3a3cd -> 3ced46d)
by codelutin.com scm 17 Mar '17

17 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 dd3a3cd fixes #9094 Demandes toujours ouvertes en modification new a6d3711 refs #9094 fix npe new 52d9074 refs #9109 ajout de la conf displayHelpOnMessages dans les dossiers new 4c24877 refs #9109 gestion de la conf displayHelpOnMessages dans la partie admin new 21cd5b7 refs #9109 prise en compte de la conf displayHelpOnMessages dans la partie cliente new 3ced46d fixes #9109 Simplifier le message pour quitter la demande 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 3ced46d131b9d11f36f4284dbbce64867a88ab1d Merge: dd3a3cd 21cd5b7 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 17 09:41:49 2017 +0100 fixes #9109 Simplifier le message pour quitter la demande commit 21cd5b7a2a376c0c07b689461d7853f5b24f23e8 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 16 15:08:18 2017 +0100 refs #9109 prise en compte de la conf displayHelpOnMessages dans la partie cliente commit 4c24877333730733bd28bbb5298e3aafbb89e4a8 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 16 15:07:53 2017 +0100 refs #9109 gestion de la conf displayHelpOnMessages dans la partie admin commit 52d907448bc866ce614b2bf9dbc95b7b39704395 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 16 15:07:33 2017 +0100 refs #9109 ajout de la conf displayHelpOnMessages dans les dossiers commit a6d3711c2d2a48abb67baf9e12dc6ae8f514f165 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 16 14:54:11 2017 +0100 refs #9094 fix npe Summary of changes: faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35474 -> 35540 bytes .../V2_4_170316_3__add_displayHelpOnMessages.sql | 4 +++ .../V2_4_170316_3__add_displayHelpOnMessages.sql | 6 ++++ .../ui/swing/actions/ShowDemandeAction.java | 38 ++++++++++---------- .../ui/swing/content/demande/DemandeUIHandler.java | 40 ++++++++++----------- .../actions/OpenGroupedDemandAction.java | 32 +++++++++-------- .../content/pdfeditor/PDFEditorUIHandler.java | 1 + .../ui/swing/util/AbstractFaxToMailUIHandler.java | 38 +++++++++++++++++--- .../i18n/faxtomail-ui-swing_fr_FR.properties | 4 +++ .../WEB-INF/content/admin/configuration-input.jsp | 17 +++++++++ .../src/main/webapp/js/configuration.js | 4 +++ 11 files changed, 125 insertions(+), 59 deletions(-) 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/sqlserver/V2_4_170316_3__add_displayHelpOnMessages.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch develop updated (bd07a3e -> dd3a3cd)
by codelutin.com scm 16 Mar '17

16 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 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 new dd3a3cd fixes #9094 Demandes toujours ouvertes en modification 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 dd3a3cd82175e0df701802c5f84d4d1cb716e9c3 Merge: bd07a3e 6b1dcef Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 16 11:56:12 2017 +0100 fixes #9094 Demandes toujours ouvertes en modification Summary of changes: faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35417 -> 35474 bytes .../services/service/EmailServiceImpl.java | 19 ------ .../h2/V2_4_170316_2__add_mustTakeToEditDemand.sql | 4 ++ .../V2_4_170316_2__add_mustTakeToEditDemand.sql | 6 ++ .../ui/swing/actions/ShowDemandeAction.java | 74 ++++++++++++-------- .../actions/OpenGroupedDemandAction.java | 76 ++++++++++++--------- .../WEB-INF/content/admin/configuration-input.jsp | 17 +++++ .../src/main/webapp/js/configuration.js | 4 ++ 8 files changed, 120 insertions(+), 80 deletions(-) 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/sqlserver/V2_4_170316_2__add_mustTakeToEditDemand.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/9094_always_open_demand_in_edition updated (2d536bc -> 6b1dcef)
by codelutin.com scm 16 Mar '17

16 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/9094_always_open_demand_in_edition in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 2d536bc refs #9094 affichage d'un message de warning et ouverture en edition new 667f866 refs #9094 ajout de la conf mustTakeToEditDemand dans les dossiers new a026aa0 refs #9094 gestion de la conf mustTakeToEditDemand dans la partie admin new 6b1dcef refs #9094 prise en compte de la conf mustTakeToEditDemand dans la partie cliente The 3 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 6b1dcefd2a3be79c814353652716e43b1d0a38e9 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 16 11:55:38 2017 +0100 refs #9094 prise en compte de la conf mustTakeToEditDemand dans la partie cliente commit a026aa098fc91302fcea4c8de0a14880711de1e3 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 16 11:55:22 2017 +0100 refs #9094 gestion de la conf mustTakeToEditDemand dans la partie admin commit 667f86636e3ed94c9335644c089beb9f59cce800 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 16 11:55:03 2017 +0100 refs #9094 ajout de la conf mustTakeToEditDemand dans les dossiers Summary of changes: faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35417 -> 35474 bytes .../h2/V2_4_170316_2__add_mustTakeToEditDemand.sql | 4 ++++ .../V2_4_170316_2__add_mustTakeToEditDemand.sql | 6 ++++++ .../ui/swing/actions/ShowDemandeAction.java | 23 +++++++++++--------- .../actions/OpenGroupedDemandAction.java | 24 ++++++++++++--------- .../WEB-INF/content/admin/configuration-input.jsp | 17 +++++++++++++++ .../src/main/webapp/js/configuration.js | 4 ++++ 7 files changed, 58 insertions(+), 20 deletions(-) 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/sqlserver/V2_4_170316_2__add_mustTakeToEditDemand.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/9094_always_open_demand_in_edition updated (9d244a8 -> 2d536bc)
by codelutin.com scm 16 Mar '17

16 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/9094_always_open_demand_in_edition in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git discards 9d244a8 refs #9094 affichage d'un message de warning et ouverture en edition 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 new 2d536bc refs #9094 affichage d'un message de warning et ouverture en edition 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 (9d244a8) \ N -- N -- N refs/heads/feature/9094_always_open_demand_in_edition (2d536bc) 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 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 2d536bcce5342c2fa85eb57b752534bf14a885f0 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 15 11:48:09 2017 +0100 refs #9094 affichage d'un message de warning et ouverture en edition Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/EmailFilter.java | 13 +++++++++++ .../persistence/entities/EmailTopiaDao.java | 11 +++++++++ .../faxtomail/persistence/entities/MailField.java | 6 +++-- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35274 -> 35417 bytes faxtomail-service/pom.xml | 2 +- .../services/service/EmailServiceImpl.java | 2 ++ .../h2/V2_2_3_170315__add_last_printing_date.sql | 13 +++++++++++ ..._4_170316_1__add_canViewOriginalAttachments.sql | 4 ++++ .../V2_2_3_170315__add_last_printing_date.sql | 14 +++++++++++ ..._4_170316_1__add_canViewOriginalAttachments.sql | 6 +++++ faxtomail-ui-swing/pom.xml | 2 +- .../swing/actions/PrintOnDefaultPrinterAction.java | 1 + .../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/DemandeUIModel.java | 26 +++++++++++++++++++-- .../util/AbstractFaxToMailDemandListHandler.java | 1 + .../faxtomail/ui/swing/util/DemandeTableModel.java | 6 +++++ .../i18n/faxtomail-ui-swing_fr_FR.properties | 2 ++ 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 | 17 ++++++++++++++ .../src/main/webapp/js/configuration.js | 4 ++++ pom.xml | 2 +- 31 files changed, 197 insertions(+), 16 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/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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (4adc0cb -> bd07a3e)
by codelutin.com scm 16 Mar '17

16 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 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 new bd07a3e fixes #9101 Ouvrir les pièces-jointes que en modification 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 bd07a3eced03cc87a0483075012a90300d0c161f Merge: 4adc0cb dac305a Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 16 11:32:20 2017 +0100 fixes #9101 Ouvrir les pièces-jointes que en modification Summary of changes: faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35324 -> 35417 bytes ..._4_170316_1__add_canViewOriginalAttachments.sql | 4 ++++ ..._4_170316_1__add_canViewOriginalAttachments.sql | 6 ++++++ .../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 +++++ .../ui/swing/content/demande/DemandeUIModel.java | 14 +++++++++++++ .../WEB-INF/content/admin/configuration-input.jsp | 17 +++++++++++++++ .../src/main/webapp/js/configuration.js | 4 ++++ 13 files changed, 104 insertions(+), 7 deletions(-) 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/sqlserver/V2_4_170316_1__add_canViewOriginalAttachments.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/9101_disable_open_unmodified_attachment updated (2850bc4 -> dac305a)
by codelutin.com scm 16 Mar '17

16 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/9101_disable_open_unmodified_attachment in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git discards 2850bc4 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale 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 new eb8efb3 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale new 96e2192 refs #9101 ajout de la conf canViewOriginalAttachments dans les dossiers new 315f884 refs #9101 gestion de la conf canViewOriginalAttachments dans la partie admin new dac305a refs #9101 prise en compte de la conf canViewOriginalAttachments dans la partie cliente 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 (2850bc4) \ N -- N -- N refs/heads/feature/9101_disable_open_unmodified_attachment (dac305a) 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 dac305a08631ea20abb10e14653b37768938740b Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 16 11:29:39 2017 +0100 refs #9101 prise en compte de la conf canViewOriginalAttachments dans la partie cliente commit 315f88482cb0248f6bcc1e8f59e3d26a057a302e Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 16 11:29:19 2017 +0100 refs #9101 gestion de la conf canViewOriginalAttachments dans la partie admin commit 96e2192a0db2477015e7b7bb2839db4ad138a7b8 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 16 11:28:58 2017 +0100 refs #9101 ajout de la conf canViewOriginalAttachments dans les dossiers commit eb8efb321c6d4d193f8a0cd8c49ceabeb7f7b447 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 15 12:05:09 2017 +0100 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/EmailFilter.java | 13 +++++++++++ .../persistence/entities/EmailTopiaDao.java | 11 +++++++++ .../faxtomail/persistence/entities/MailField.java | 6 +++-- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35274 -> 35417 bytes faxtomail-service/pom.xml | 2 +- .../services/service/EmailServiceImpl.java | 2 ++ .../h2/V2_2_3_170315__add_last_printing_date.sql | 13 +++++++++++ ..._4_170316_1__add_canViewOriginalAttachments.sql | 4 ++++ .../V2_2_3_170315__add_last_printing_date.sql | 14 +++++++++++ ..._4_170316_1__add_canViewOriginalAttachments.sql | 6 +++++ faxtomail-ui-swing/pom.xml | 2 +- .../swing/actions/PrintOnDefaultPrinterAction.java | 1 + .../content/attachment/AttachmentCellEditor.java | 2 +- .../attachment/AttachmentEditorUIHandler.java | 26 +++++++++++++++------ .../attachment/AttachmentEditorUIModel.java | 13 +++++++++++ .../ui/swing/content/attachment/AttachmentItem.css | 10 ++++++-- .../swing/content/attachment/AttachmentItem.jaxx | 6 +++-- .../content/attachment/AttachmentModelAware.java | 2 ++ .../swing/content/attachment/ButtonAttachment.java | 5 ++++ .../content/demande/DemandeListUIHandler.java | 4 ++++ .../ui/swing/content/demande/DemandeUIModel.java | 26 +++++++++++++++++++-- .../util/AbstractFaxToMailDemandListHandler.java | 1 + .../faxtomail/ui/swing/util/DemandeTableModel.java | 6 +++++ .../i18n/faxtomail-ui-swing_fr_FR.properties | 2 ++ 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 | 17 ++++++++++++++ .../src/main/webapp/js/configuration.js | 4 ++++ pom.xml | 2 +- 31 files changed, 190 insertions(+), 21 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/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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch release/2.3 deleted (was 282973c)
by codelutin.com scm 16 Mar '17

16 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch release/2.3 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git was 282973c [jgitflow-maven-plugin]updating poms for branch'release/2.3' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0