branch master updated (b06a2a50 -> 86ebd74b)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from b06a2a50 [jgitflow-maven-plugin]merging 'release/2.4.16' into 'master' adds 4c0e35d6 [jgitflow-maven-plugin]updating poms for 2.4.17-SNAPSHOT development adds bbdeff91 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds cd21992d [jgitflow-maven-plugin]merging 'master' into 'develop' adds a1127cac [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 5a0cceaa refs #9937 : limité la taille des PJ de type TIFF (comme les images) adds 700f201c Merge branch 'feature/9937_zoon_TIFF' into 'develop' adds a36e8ae8 en cas d'erteur au chargemenr d'une page d'un pièce joint, la remplacer par une page d'erreur sans bloquer l'ouverture du mail adds 9ffeb71e Merge branch 'feature/erreur_au_chargement_des_PJ' into 'develop' adds b8a4d40b refs #9962 : Erreur rotation des documents adds 11a8e5c0 Merge branch 'feature/9962_Erreur_rotation_des_documents' into 'develop' adds 4cb02014 erreur sur notre référence si le numéro de commande est null adds 89e01beb [jgitflow-maven-plugin]updating poms for branch'release/2.4.17' with non-snapshot versions adds 86ebd74b [jgitflow-maven-plugin]merging 'release/2.4.17' into 'master' No new revisions were added by this update. Summary of changes: faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 7 ++- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 61 +++++++++++++++++++--- .../faxtomail/ui/swing/util/JImagePanel.java | 16 ++++-- .../i18n/faxtomail-ui-swing_fr_FR.properties | 3 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 79 insertions(+), 18 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm