This is an automated email from the git hooks/post-receive script. New change to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git from 636ced4 Fixes #3878 Merge branch 'feature/3878' into develop new 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) new e05fc51 Fixes #1696 Merge branch 'feature/1696' into develop The 2 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 e05fc5128087cc9f9de56865075d2f19d49f4451 Merge: 636ced4 7f01014 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 13 10:13:19 2016 +0100 Fixes #1696 Merge branch 'feature/1696' into develop commit 7f010143f9a6b3c9f5793bb20a773eef550698c7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 13 10:13:16 2016 +0100 Ajout de liens dans le pied de page et utilisation d'une seule jsp pour faire le rendu du pied de page (See #1696) Summary of changes: .../main/webapp/WEB-INF/content/badFileRedirect.jsp | 4 +++- .../src/main/webapp/WEB-INF/content/badUseRedirect.jsp | 4 +++- swe-ui-web/src/main/webapp/WEB-INF/content/error.jsp | 4 +++- .../main/webapp/WEB-INF/content/fileNotEditable.jsp | 4 +++- swe-ui-web/src/main/webapp/WEB-INF/content/footer.jsp | 18 ++++++++++++++++++ .../src/main/webapp/WEB-INF/content/imageViewer.jsp | 5 +++-- swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp | 4 +++- .../main/webapp/WEB-INF/content/modificationViewer.jsp | 8 +++----- .../src/main/webapp/WEB-INF/content/outConnection.jsp | 4 +++- .../main/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 +- 12 files changed, 49 insertions(+), 16 deletions(-) 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>.