branch develop updated (4fd52e9 -> 3206e6a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository scmwebeditor. See https://gitlab.nuiton.org/nuiton/scmwebeditor.git from 4fd52e9 [jgitflow-maven-plugin]updating poms for 0.9-SNAPSHOT development new e76d525 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 19a82c2 [jgitflow-maven-plugin]updating poms for branch'release/0.8' with non-snapshot versions new 932958e [jgitflow-maven-plugin]merging 'release/0.8' into 'master' new c91f49c [jgitflow-maven-plugin]merging 'master' into 'develop' new 3206e6a [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 3206e6a6ba084ab5ff74bb3d92185031d9ce1b66 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 11:41:08 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit c91f49ca90d99da425c4cdb3447c0b958daabda9 Merge: e76d525 932958e Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 11:41:08 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit e76d52519ae0d13e4d5954388a6e7243537169f4 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 11:41:08 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 932958e3bac68216c98bc32472ce3a05e07114bb Merge: 05b2a27 19a82c2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 11:41:07 2017 +0100 [jgitflow-maven-plugin]merging 'release/0.8' into 'master' commit 19a82c2c6b2d93b5c0299e514af99c084a0b1ce0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 11:40:20 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/0.8' with non-snapshot versions Summary of changes: -- 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 https://gitlab.nuiton.org/nuiton/scmwebeditor.git commit 19a82c2c6b2d93b5c0299e514af99c084a0b1ce0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 11:40:20 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/0.8' with non-snapshot versions --- pom.xml | 2 +- swe-git/pom.xml | 2 +- swe-scm-api/pom.xml | 2 +- swe-svn/pom.xml | 2 +- swe-ui-web/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index c91d4a7..745fd0e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.8</version> <packaging>pom</packaging> <name>ScmWebEditor</name> diff --git a/swe-git/pom.xml b/swe-git/pom.xml index 1830fbe..d756cbc 100644 --- a/swe-git/pom.xml +++ b/swe-git/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.8</version> </parent> <artifactId>scmwebeditor-git</artifactId> diff --git a/swe-scm-api/pom.xml b/swe-scm-api/pom.xml index 0a2785d..4e6ab16 100644 --- a/swe-scm-api/pom.xml +++ b/swe-scm-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.8</version> </parent> <artifactId>scmwebeditor-scm-api</artifactId> diff --git a/swe-svn/pom.xml b/swe-svn/pom.xml index 8d7c75a..42bb229 100644 --- a/swe-svn/pom.xml +++ b/swe-svn/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.8</version> </parent> <artifactId>scmwebeditor-svn</artifactId> diff --git a/swe-ui-web/pom.xml b/swe-ui-web/pom.xml index 4a8612c..007213d 100644 --- a/swe-ui-web/pom.xml +++ b/swe-ui-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.8</version> </parent> <artifactId>scmwebeditor-ui-web</artifactId> -- 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 https://gitlab.nuiton.org/nuiton/scmwebeditor.git commit 932958e3bac68216c98bc32472ce3a05e07114bb Merge: 05b2a27 19a82c2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 11:41:07 2017 +0100 [jgitflow-maven-plugin]merging 'release/0.8' into 'master' 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(-) -- 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 https://gitlab.nuiton.org/nuiton/scmwebeditor.git commit e76d52519ae0d13e4d5954388a6e7243537169f4 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 11:41:08 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- swe-git/pom.xml | 2 +- swe-scm-api/pom.xml | 2 +- swe-svn/pom.xml | 2 +- swe-ui-web/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index b9b2b18..745fd0e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.9-SNAPSHOT</version> + <version>0.8</version> <packaging>pom</packaging> <name>ScmWebEditor</name> diff --git a/swe-git/pom.xml b/swe-git/pom.xml index 5b97607..d756cbc 100644 --- a/swe-git/pom.xml +++ b/swe-git/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.9-SNAPSHOT</version> + <version>0.8</version> </parent> <artifactId>scmwebeditor-git</artifactId> diff --git a/swe-scm-api/pom.xml b/swe-scm-api/pom.xml index 85afad2..4e6ab16 100644 --- a/swe-scm-api/pom.xml +++ b/swe-scm-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.9-SNAPSHOT</version> + <version>0.8</version> </parent> <artifactId>scmwebeditor-scm-api</artifactId> diff --git a/swe-svn/pom.xml b/swe-svn/pom.xml index 0690b66..42bb229 100644 --- a/swe-svn/pom.xml +++ b/swe-svn/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.9-SNAPSHOT</version> + <version>0.8</version> </parent> <artifactId>scmwebeditor-svn</artifactId> diff --git a/swe-ui-web/pom.xml b/swe-ui-web/pom.xml index 60a01ef..007213d 100644 --- a/swe-ui-web/pom.xml +++ b/swe-ui-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.9-SNAPSHOT</version> + <version>0.8</version> </parent> <artifactId>scmwebeditor-ui-web</artifactId> -- 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 https://gitlab.nuiton.org/nuiton/scmwebeditor.git commit c91f49ca90d99da425c4cdb3447c0b958daabda9 Merge: e76d525 932958e Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 11:41:08 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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 https://gitlab.nuiton.org/nuiton/scmwebeditor.git commit 3206e6a6ba084ab5ff74bb3d92185031d9ce1b66 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 11:41:08 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- swe-git/pom.xml | 2 +- swe-scm-api/pom.xml | 2 +- swe-svn/pom.xml | 2 +- swe-ui-web/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 745fd0e..b9b2b18 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.8</version> + <version>0.9-SNAPSHOT</version> <packaging>pom</packaging> <name>ScmWebEditor</name> diff --git a/swe-git/pom.xml b/swe-git/pom.xml index d756cbc..5b97607 100644 --- a/swe-git/pom.xml +++ b/swe-git/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.8</version> + <version>0.9-SNAPSHOT</version> </parent> <artifactId>scmwebeditor-git</artifactId> diff --git a/swe-scm-api/pom.xml b/swe-scm-api/pom.xml index 4e6ab16..85afad2 100644 --- a/swe-scm-api/pom.xml +++ b/swe-scm-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.8</version> + <version>0.9-SNAPSHOT</version> </parent> <artifactId>scmwebeditor-scm-api</artifactId> diff --git a/swe-svn/pom.xml b/swe-svn/pom.xml index 42bb229..0690b66 100644 --- a/swe-svn/pom.xml +++ b/swe-svn/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.8</version> + <version>0.9-SNAPSHOT</version> </parent> <artifactId>scmwebeditor-svn</artifactId> diff --git a/swe-ui-web/pom.xml b/swe-ui-web/pom.xml index 007213d..60a01ef 100644 --- a/swe-ui-web/pom.xml +++ b/swe-ui-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>scmwebeditor</artifactId> - <version>0.8</version> + <version>0.9-SNAPSHOT</version> </parent> <artifactId>scmwebeditor-ui-web</artifactId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm