This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 6fd8dce fixes #7418 Ouverture de l'éditeur de PJ sur le même écran que lors du dernier traitement new 7603abb fix NPE new 62c4ef1 modification du modèle (ajout des tampons) (refs #7424) new a7a1c9e ajout de la migration pour sqlserver (refs #7424) new fd1d108 début de l'interface d'admin (possibilité de créer des tampons texte seulement) (refs #7424) new 37d8f5b Ajout des tampons dans l'éditeur de pdf (seulement type texte) (refs #7424) new addb08a - finalisation de l'interface d'admin - ajout des tampons dans l'éditeur de PDF (fixes #7424) new 642f7df Merge branch 'feature/7424' into develop new 0803608 ajout des signatures dans le modèle + migration (refs #7419) new 53ec3ff ajout de la signature dans le formulaire de réponse + début d'écran de configuration des signatures (refs #7419) new 0810bf0 - modif du modèle de signatures (plus de Signing, directement des stamp et un lien entre le stamp et le user pour le default) - enregistrement des signatures et mise par défaut refs #7419 new 9d34a5b - Envoi de la signature dans la réponse - mise en page refs #7419 new 0dd9e95 fixes #7419 new 533f73d add license new 1d2a7cb add missing dependency The 14 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 1d2a7cb63000f2a6caea5612dba3ce96a427bc5d Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 10:41:15 2015 +0200 add missing dependency commit 533f73dd67825e77e1111ef0938578ba2f75dc0d Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 10:35:36 2015 +0200 add license commit 0dd9e9537972124a7edcf2d87f57e5401c5468be Merge: 642f7df 9d34a5b Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 10:35:00 2015 +0200 fixes #7419 commit 9d34a5bd21b62a3c30705673b4155c488c6d8e4e Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 10:27:59 2015 +0200 - Envoi de la signature dans la réponse - mise en page refs #7419 commit 0810bf027973d5c82750fa6d6e67e35624d7024a Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 25 18:29:50 2015 +0200 - modif du modèle de signatures (plus de Signing, directement des stamp et un lien entre le stamp et le user pour le default) - enregistrement des signatures et mise par défaut refs #7419 commit 53ec3ff53c139b8363c2ae40b3ada55243d3385a Author: Kevin Morin <morin@codelutin.com> Date: Mon Aug 24 18:20:32 2015 +0200 ajout de la signature dans le formulaire de réponse + début d'écran de configuration des signatures (refs #7419) commit 08036089b41387ce8ba1508728c6a83e730e63ed Author: Kevin Morin <morin@codelutin.com> Date: Mon Aug 17 10:47:04 2015 +0200 ajout des signatures dans le modèle + migration (refs #7419) commit 642f7dfa28a0d7e662dd4f335a8b57e372d84131 Merge: 7603abb addb08a Author: Kevin Morin <morin@codelutin.com> Date: Mon Aug 17 07:56:55 2015 +0200 Merge branch 'feature/7424' into develop commit addb08a9f37064335721d15b478799ab19550c40 Author: Kevin Morin <morin@codelutin.com> Date: Sat Aug 15 07:34:08 2015 +0200 - finalisation de l'interface d'admin - ajout des tampons dans l'éditeur de PDF (fixes #7424) commit 37d8f5bc7e5faf3c28a89a03b4b29e5b7282dd14 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 12 18:03:17 2015 +0200 Ajout des tampons dans l'éditeur de pdf (seulement type texte) (refs #7424) commit fd1d1085e3e53745a2eab50ceec04e19ba2d6291 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 12 14:55:38 2015 +0200 début de l'interface d'admin (possibilité de créer des tampons texte seulement) (refs #7424) commit a7a1c9eb1bdb40a769dfe38a2fc956a8d45c20d5 Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 11 18:39:25 2015 +0200 ajout de la migration pour sqlserver (refs #7424) commit 62c4ef1c6c3602c8fe6b6133d73090d08b35e175 Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 11 18:29:06 2015 +0200 modification du modèle (ajout des tampons) (refs #7424) commit 7603abb10e6ae5877e6c819db74baa17b33abe6c Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 11 15:45:26 2015 +0200 fix NPE Summary of changes: .../src/main/xmi/faxtomail.properties | 5 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 31055 -> 32540 bytes .../services/service/ConfigurationService.java | 11 +- .../services/service/ConfigurationServiceImpl.java | 72 ++-- .../faxtomail/services/service/EmailService.java | 3 +- .../services/service/EmailServiceImpl.java | 14 +- .../services/service/InitFaxToMailServiceImpl.java | 29 +- .../services/service/LdapServiceImpl.java | 1 + .../services/service/MailFolderService.java | 3 + .../services/service/MailFolderServiceImpl.java | 20 +- .../services/service/ReferentielService.java | 4 + .../services/service/ReferentielServiceImpl.java | 15 + .../faxtomail/services/service/UserService.java | 4 + .../services/service/UserServiceImpl.java | 31 ++ .../services/service/ldap/LdapServiceMock.java | 2 + .../h2/V1_4_0_150811__add_pdf_editor_stamps.sql | 36 ++ .../h2/V1_4_0_150817__add_signings_to_users.sql | 19 + .../V1_4_0_150811__add_pdf_editor_stamps.sql | 39 ++ .../V1_4_0_150817__add_signings_to_users.sql | 19 + faxtomail-ui-swing/pom.xml | 5 + .../ui/swing/actions/EditAttachmentAction.java | 23 +- .../actions/GenerateAnnotatedAttachmentAction.java | 318 ++++++++++------ .../ui/swing/actions/OpenGroupedDemandAction.java | 13 +- ...FEditorLineUI.css => PDFEditorStampImageUI.css} | 11 +- ...ghlighterUI.jaxx => PDFEditorStampImageUI.jaxx} | 18 +- ...DFEditorNoteUI.css => PDFEditorStampTextUI.css} | 23 +- ...EditorNoteUI.jaxx => PDFEditorStampTextUI.jaxx} | 28 +- .../ui/swing/content/pdfeditor/PDFEditorUI.jaxx | 2 +- .../content/pdfeditor/PDFEditorUIHandler.java | 406 +++++++++++++++------ .../swing/content/pdfeditor/PDFEditorUIModel.java | 64 +++- .../ui/swing/content/reply/ReplyFormUI.css | 41 ++- .../ui/swing/content/reply/ReplyFormUI.jaxx | 43 ++- .../ui/swing/content/reply/ReplyFormUIHandler.java | 15 +- .../ui/swing/content/reply/ReplyFormUIModel.java | 13 + .../ui/swing/content/reply/SigningSettingsUI.css | 85 +++++ .../ui/swing/content/reply/SigningSettingsUI.jaxx | 100 +++++ .../content/reply/SigningSettingsUIHandler.java | 171 +++++++++ .../content/reply/SigningSettingsUIModel.java | 147 ++++++++ .../content/reply/actions/NewSigningAction.java | 84 +++++ .../reply/actions/OpenSigningSettingsAction.java | 72 ++++ .../{ => content/reply}/actions/ReplyAction.java | 4 +- .../content/reply/actions/SaveSigningAction.java | 73 ++++ .../reply/actions/SetDefaultSigningAction.java | 74 ++++ .../ui/swing/util/AbstractFaxToMailUIHandler.java | 2 +- .../i18n/faxtomail-ui-swing_fr_FR.properties | 16 + .../src/main/resources/icons/action-default.png | Bin 0 -> 670 bytes .../src/main/resources/icons/action-settings.png | Bin 0 -> 512 bytes .../src/main/resources/icons/stamp.png | Bin 0 -> 588 bytes .../web/action/admin/ConfigurationAction.java | 31 +- .../WEB-INF/content/admin/configuration-input.jsp | 202 +++++++--- .../src/main/webapp/js/configuration.js | 106 +++++- pom.xml | 8 +- 52 files changed, 2088 insertions(+), 437 deletions(-) create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V1_4_0_150811__add_pdf_editor_stamps.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V1_4_0_150817__add_signings_to_users.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V1_4_0_150811__add_pdf_editor_stamps.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V1_4_0_150817__add_signings_to_users.sql copy faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/{PDFEditorLineUI.css => PDFEditorStampImageUI.css} (87%) copy faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/{PDFEditorHighlighterUI.jaxx => PDFEditorStampImageUI.jaxx} (72%) copy faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/{PDFEditorNoteUI.css => PDFEditorStampTextUI.css} (76%) copy faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/{PDFEditorNoteUI.jaxx => PDFEditorStampTextUI.jaxx} (69%) create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/SigningSettingsUI.css create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/SigningSettingsUI.jaxx create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/SigningSettingsUIHandler.java create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/SigningSettingsUIModel.java create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/NewSigningAction.java create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/OpenSigningSettingsAction.java rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/reply}/actions/ReplyAction.java (94%) create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/SaveSigningAction.java create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/SetDefaultSigningAction.java create mode 100644 faxtomail-ui-swing/src/main/resources/icons/action-default.png create mode 100644 faxtomail-ui-swing/src/main/resources/icons/action-settings.png create mode 100644 faxtomail-ui-swing/src/main/resources/icons/stamp.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.