This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git 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 faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 31055 -> 32016 bytes .../services/service/ConfigurationService.java | 11 +- .../services/service/ConfigurationServiceImpl.java | 72 ++-- .../services/service/MailFolderService.java | 3 + .../services/service/MailFolderServiceImpl.java | 20 +- .../services/service/ReferentielService.java | 4 + .../services/service/ReferentielServiceImpl.java | 8 + .../h2/V1_4_0_150811__add_pdf_editor_stamps.sql | 36 ++ .../V1_4_0_150811__add_pdf_editor_stamps.sql | 39 ++ .../ui/swing/actions/EditAttachmentAction.java | 23 +- .../actions/GenerateAnnotatedAttachmentAction.java | 318 ++++++++++------ .../content/pdfeditor/PDFEditorStampImageUI.css | 35 ++ .../content/pdfeditor/PDFEditorStampImageUI.jaxx | 53 +++ .../content/pdfeditor/PDFEditorStampTextUI.css | 47 +++ .../content/pdfeditor/PDFEditorStampTextUI.jaxx | 74 ++++ .../ui/swing/content/pdfeditor/PDFEditorUI.jaxx | 2 +- .../content/pdfeditor/PDFEditorUIHandler.java | 406 +++++++++++++++------ .../swing/content/pdfeditor/PDFEditorUIModel.java | 64 +++- .../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 | 2 +- 23 files changed, 1218 insertions(+), 338 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.