This is an automated email from the git hooks/post-receive script. New change to branch master in repository scmwebeditor. See https://gitlab.nuiton.org/nuiton/scmwebeditor.git from 05b2a27 [jgitflow-maven-plugin]merging 'release/0.7' into 'master' adds 5b8218e [jgitflow-maven-plugin]updating poms for 0.8-SNAPSHOT development adds 711b3a6 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 701bcba [jgitflow-maven-plugin]merging 'master' into 'develop' adds 3971eba [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds fd3f3a2 Mise à jour des versions des librairies et introduction de la propriété dans le pom codeMirrorVersion (See #3877) adds 3503c19 Ajout dans la configuration de l'application d'une propriété pour récupérer la version de la librairie codeMirror et utilisation au niveau de la jsp incriminée (See #3877) adds 4ac3bfe Fixes #3877 Merge branch 'feature/3877' into develop adds 8ae9f9a Nettoyage code html (See #3878) adds 636ced4 Fixes #3878 Merge branch 'feature/3878' into develop adds 7f01014 Ajout de liens dans le pied de page et utilisation d'une seule jsp pour faire le rendu du pied de page (See #1696) adds e05fc51 Fixes #1696 Merge branch 'feature/1696' into develop adds 9dafbb0 Update parent pom adds df41700 Fix build adds 8d3953c Update parent pom adds ff1496c fixes #71: Update to struts 2.3.32 adds 4e21db1 Update headers adds 19a82c2 [jgitflow-maven-plugin]updating poms for branch'release/0.8' with non-snapshot versions adds 932958e [jgitflow-maven-plugin]merging 'release/0.8' into 'master' No new revisions were added by this update. Summary of changes: README.txt => README.md | 0 pom.xml | 65 ++++++++++++++-------- swe-git/{README.txt => README.md} | 0 swe-git/pom.xml | 24 +++++++- swe-scm-api/{README.txt => README.md} | 0 swe-scm-api/pom.xml | 24 +++++++- swe-svn/{README.txt => README.md} | 0 swe-svn/pom.xml | 24 +++++++- swe-ui-web/{README.txt => README.md} | 0 swe-ui-web/pom.xml | 24 +++++++- .../scmwebeditor/uiweb/ScmWebEditorConfig.java | 5 ++ .../scmwebeditor/uiweb/actions/EditAction.java | 2 + .../src/main/resources/scmwebeditor.properties | 3 +- .../webapp/WEB-INF/content/badFileRedirect.jsp | 4 +- .../main/webapp/WEB-INF/content/badUseRedirect.jsp | 4 +- .../src/main/webapp/WEB-INF/content/error.jsp | 4 +- .../webapp/WEB-INF/content/fileNotEditable.jsp | 4 +- .../src/main/webapp/WEB-INF/content/footer.jsp | 39 +++++++++++++ .../main/webapp/WEB-INF/content/imageViewer.jsp | 7 ++- .../src/main/webapp/WEB-INF/content/logout.jsp | 4 +- .../webapp/WEB-INF/content/modificationViewer.jsp | 51 ++++++++--------- .../main/webapp/WEB-INF/content/outConnection.jsp | 4 +- .../WEB-INF/content/popups/createDirectoryForm.jsp | 4 +- .../webapp/WEB-INF/content/popups/moveFileForm.jsp | 4 +- .../WEB-INF/content/popups/removeDirectoryForm.jsp | 4 +- .../WEB-INF/content/popups/removeFileForm.jsp | 4 +- .../WEB-INF/content/popups/uploadFileForm.jsp | 4 +- .../webapp/WEB-INF/content/privateScmRedirect.jsp | 4 +- .../src/main/webapp/WEB-INF/content/redirect.jsp | 4 +- swe-ui-web/src/main/webapp/css/main.css | 2 +- 30 files changed, 244 insertions(+), 78 deletions(-) rename README.txt => README.md (100%) rename swe-git/{README.txt => README.md} (100%) rename swe-scm-api/{README.txt => README.md} (100%) rename swe-svn/{README.txt => README.md} (100%) rename swe-ui-web/{README.txt => README.md} (100%) create mode 100644 swe-ui-web/src/main/webapp/WEB-INF/content/footer.jsp -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.