branch develop updated (4467071 -> c561301)
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 4467071 Use nuitonpom 5.1 (fixes #3851) new 6c6d992 Fix webjar urls new 51c3d0c Fix scmwebeditor url new c561301 Fixes #3867. Merge branch 'feature/3867' into develop The 3 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 c561301b5c9875cc5d1442d1a3befad162ca7672 Merge: 4467071 51c3d0c Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 11 19:20:36 2016 +0100 Fixes #3867. Merge branch 'feature/3867' into develop commit 51c3d0c066dca7dbde747cceab4651efd69cecaf Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 11 19:20:31 2016 +0100 Fix scmwebeditor url commit 6c6d9922bf2a7e14cf21b198f7df1b63723bc7ad Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 11 19:20:22 2016 +0100 Fix webjar urls Summary of changes: .../webapp/WEB-INF/content/badFileRedirect.jsp | 2 +- .../src/main/webapp/WEB-INF/content/badRstFile.jsp | 2 +- .../main/webapp/WEB-INF/content/badUseRedirect.jsp | 2 +- .../src/main/webapp/WEB-INF/content/error.jsp | 2 +- .../src/main/webapp/WEB-INF/content/fileModify.jsp | 2 +- .../webapp/WEB-INF/content/fileNotEditable.jsp | 2 +- .../main/webapp/WEB-INF/content/imageViewer.jsp | 2 +- .../src/main/webapp/WEB-INF/content/logout.jsp | 2 +- .../webapp/WEB-INF/content/modificationViewer.jsp | 26 +++++++++++----------- .../main/webapp/WEB-INF/content/outConnection.jsp | 2 +- .../webapp/WEB-INF/content/privateScmRedirect.jsp | 2 +- .../src/main/webapp/WEB-INF/content/redirect.jsp | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 6c6d9922bf2a7e14cf21b198f7df1b63723bc7ad Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 11 19:20:22 2016 +0100 Fix webjar urls --- .../webapp/WEB-INF/content/modificationViewer.jsp | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp index 15aa762..9539137 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp @@ -62,19 +62,19 @@ <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script> <!-- Code mirror --> - <script src="webjars/codemirror/5.1/lib/codemirror.js" type="text/javascript"></script> - <link rel="stylesheet" href="webjars/codemirror/5.1/lib/codemirror.css"> - <script src="webjars/codemirror/5.1/addon/mode/overlay.js" type="text/javascript"></script> - <script src="webjars/codemirror/5.1/addon/search/searchcursor.js" type="text/javascript"></script> + <script src="webjars/codemirror/5.8/lib/codemirror.js" type="text/javascript"></script> + <link rel="stylesheet" href="webjars/codemirror/5.8/lib/codemirror.css"> + <script src="webjars/codemirror/5.8/addon/mode/overlay.js" type="text/javascript"></script> + <script src="webjars/codemirror/5.8/addon/search/searchcursor.js" type="text/javascript"></script> - <script src="webjars/codemirror/5.1/mode/rst/rst.js"></script> - <script src="webjars/codemirror/5.1/mode/markdown/markdown.js"></script> - <script src="webjars/codemirror/5.1/mode/clike/clike.js"></script> - <script src="webjars/codemirror/5.1/mode/htmlmixed/htmlmixed.js"></script> - <script src="webjars/codemirror/5.1/mode/javascript/javascript.js"></script> - <script src="webjars/codemirror/5.1/mode/css/css.js"></script> - <script src="webjars/codemirror/5.1/mode/xml/xml.js"></script> - <script src="webjars/codemirror/5.1/mode/stex/stex.js"></script> + <script src="webjars/codemirror/5.8/mode/rst/rst.js"></script> + <script src="webjars/codemirror/5.8/mode/markdown/markdown.js"></script> + <script src="webjars/codemirror/5.8/mode/clike/clike.js"></script> + <script src="webjars/codemirror/5.8/mode/htmlmixed/htmlmixed.js"></script> + <script src="webjars/codemirror/5.8/mode/javascript/javascript.js"></script> + <script src="webjars/codemirror/5.8/mode/css/css.js"></script> + <script src="webjars/codemirror/5.8/mode/xml/xml.js"></script> + <script src="webjars/codemirror/5.8/mode/stex/stex.js"></script> <script src="codemirror-ui/js/codemirror-ui.js"></script> @@ -204,7 +204,7 @@ </div> - <!-- <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img width="200" height="160" src="img/editor/machine-a-ecrire.png" alt="ScmWebEditor logo"/></a> --> + <!-- <a title="ScmWebEditor Project Website" target="_blank" href="http://scmwebeditor.nuiton.org/"><img width="200" height="160" src="img/editor/machine-a-ecrire.png" alt="ScmWebEditor logo"/></a> --> <h1 id="editorTitle">SCMWebEditor</h1> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 51c3d0c066dca7dbde747cceab4651efd69cecaf Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 11 19:20:31 2016 +0100 Fix scmwebeditor url --- swe-ui-web/src/main/webapp/WEB-INF/content/badFileRedirect.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/badRstFile.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/badUseRedirect.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/error.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/fileModify.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/fileNotEditable.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/imageViewer.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/outConnection.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/privateScmRedirect.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/redirect.jsp | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/badFileRedirect.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/badFileRedirect.jsp index 4b7d60c..8d5751c 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/badFileRedirect.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/badFileRedirect.jsp @@ -41,7 +41,7 @@ </head> <body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img +<a target="_blank" href="http://scmwebeditor.nuiton.org/"><img src="img/ScmWebEditor_main.png" alt="$alt"/></a> <p><s:text name="scm.badPathOrFileName"/></p> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/badRstFile.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/badRstFile.jsp index 830b9ad..00d1c97 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/badRstFile.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/badRstFile.jsp @@ -32,7 +32,7 @@ <link rel="stylesheet" type="text/css" href="css/main.css"> </head> <body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img +<a target="_blank" href="http://scmwebeditor.nuiton.org"><img src="img/ScmWebEditor_main.png" alt="$alt"/></a> <form id="forceCommitForm" method="POST" action="commit.action"> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/badUseRedirect.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/badUseRedirect.jsp index 2b021f2..fc71f6d 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/badUseRedirect.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/badUseRedirect.jsp @@ -39,7 +39,7 @@ <% } %> </head> <body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img +<a target="_blank" href="http://scmwebeditor.nuiton.org/"><img src="img/ScmWebEditor_main.png" alt="$alt"/></a> <p>Bad Use of ScmWebEditor! Please try again.</p> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/error.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/error.jsp index f54a816..0e2d3c8 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/error.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/error.jsp @@ -40,7 +40,7 @@ <%--%=request.getAttribute("scmEditorUrl")%>?adresse=<%=request.getAttribute("Scmpath_url")%>&file_name=<%=request.getAttribute("Filename_url")%>&project_url=<%=request.getAttribute("Redirection_url")%>&lang=<%=request.getAttribute("Lang")%>&format=<%=request.getAttribute("Format")%>"--%> </head> <body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img +<a target="_blank" href="http://scmwebeditor.nuiton.org/"><img src="img/ScmWebEditor_main.png" alt="$alt"/></a> <p><s:text name="scm.badUsernameOrPassword"/></p> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/fileModify.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/fileModify.jsp index afcee6f..8c5bb32 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/fileModify.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/fileModify.jsp @@ -32,7 +32,7 @@ <link rel="stylesheet" type="text/css" href="css/main.css"> </head> <body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img +<a target="_blank" href="http://scmwebeditor.nuiton.org/"><img src="img/ScmWebEditor_main.png" alt="$alt"/></a> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/fileNotEditable.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/fileNotEditable.jsp index 8a2599c..7894b9f 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/fileNotEditable.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/fileNotEditable.jsp @@ -34,7 +34,7 @@ <link rel="stylesheet" type="text/css" href="css/main.css"> </head> <body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img +<a target="_blank" href="http://scmwebeditor.nuiton.org/"><img src="img/ScmWebEditor_main.png" alt="$alt"/></a> <p><s:text name="scm.file"/> <s:property value="address"/> <s:text name="scm.notEditable"/></p> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/imageViewer.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/imageViewer.jsp index 3bdc0ab..b8ff9fa 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/imageViewer.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/imageViewer.jsp @@ -154,7 +154,7 @@ </div> - <!-- <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img width="200" height="160" src="img/editor/machine-a-ecrire.png" alt="ScmWebEditor logo"/></a> --> + <!-- <a title="ScmWebEditor Project Website" target="_blank" href="http://scmwebeditor.nuiton.org/"><img width="200" height="160" src="img/editor/machine-a-ecrire.png" alt="ScmWebEditor logo"/></a> --> <h1 id="editorTitle">SCMWebEditor</h1> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp index 926067d..956d077 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp @@ -39,7 +39,7 @@ </head> <body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img +<a target="_blank" href="http://scmwebeditor.nuiton.org/"><img src="img/ScmWebEditor_main.png" alt="$alt"/></a> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/outConnection.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/outConnection.jsp index c579a61..271b37e 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/outConnection.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/outConnection.jsp @@ -67,7 +67,7 @@ </head> <body> -<!-- <a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/accueil/machine-a-ecrire.png" alt="$alt" /></a> --> +<!-- <a target="_blank" href="http://scmwebeditor.nuiton.org/"><img src="img/accueil/machine-a-ecrire.png" alt="$alt" /></a> --> <div id="wrapperConfig"> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/privateScmRedirect.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/privateScmRedirect.jsp index e01cf59..bd60a19 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/privateScmRedirect.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/privateScmRedirect.jsp @@ -34,7 +34,7 @@ <link rel="stylesheet" type="text/css" href="css/main.css"> </head> <body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img +<a target="_blank" href="http://scmwebeditor.nuiton.org/"><img src="img/ScmWebEditor_main.png" alt="$alt"/></a> <form method="post" action="edit.action"> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/redirect.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/redirect.jsp index 3e3301d..c24a066 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/redirect.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/redirect.jsp @@ -39,7 +39,7 @@ <% } %> </head> <body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img +<a target="_blank" href="http://scmwebeditor.nuiton.org/"><img src="img/ScmWebEditor_main.png" alt="$alt"/></a> <p><s:text name="scm.thankUsing"/></p> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit c561301b5c9875cc5d1442d1a3befad162ca7672 Merge: 4467071 51c3d0c Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 11 19:20:36 2016 +0100 Fixes #3867. Merge branch 'feature/3867' into develop .../webapp/WEB-INF/content/badFileRedirect.jsp | 2 +- .../src/main/webapp/WEB-INF/content/badRstFile.jsp | 2 +- .../main/webapp/WEB-INF/content/badUseRedirect.jsp | 2 +- .../src/main/webapp/WEB-INF/content/error.jsp | 2 +- .../src/main/webapp/WEB-INF/content/fileModify.jsp | 2 +- .../webapp/WEB-INF/content/fileNotEditable.jsp | 2 +- .../main/webapp/WEB-INF/content/imageViewer.jsp | 2 +- .../src/main/webapp/WEB-INF/content/logout.jsp | 2 +- .../webapp/WEB-INF/content/modificationViewer.jsp | 26 +++++++++++----------- .../main/webapp/WEB-INF/content/outConnection.jsp | 2 +- .../webapp/WEB-INF/content/privateScmRedirect.jsp | 2 +- .../src/main/webapp/WEB-INF/content/redirect.jsp | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm