This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit dee381539edf7eff5665f16c3264489932e09991 Merge: 78af899 2bc31a1 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 14 16:32:16 2017 +0100 Merge branch 'feature/9106_deplacement_parametrage_actions_invalides_dans_arborescence' into develop .../src/main/xmi/faxtomail.properties | 4 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 33882 -> 35274 bytes ..._170314__move_invalidformactions_to_folders.sql | 10 ++++ ..._170314__move_invalidformactions_to_folders.sql | 10 ++++ .../swing/actions/PrintOnDefaultPrinterAction.java | 2 +- .../content/demande/DemandeListUIHandler.java | 2 +- .../swing/content/demande/DemandesUIHandler.java | 10 ++-- .../demande/actions/ArchiveFromListAction.java | 2 +- .../OpenMailFolderChooserFromListAction.java | 2 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 27 ++++++++-- .../WEB-INF/content/admin/configuration-input.jsp | 57 ++++++++++++++++----- .../src/main/webapp/js/configuration.js | 43 ++++++++++------ 12 files changed, 126 insertions(+), 43 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.