branch develop updated (76ef205 -> aee8dd6)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from 76ef205 fixes bug in group creation new 91f505b prefix config option with bow. new f8951de fixes bug in url parameter evaluation expression new aee8dd6 use wikitty 3.13-SNAPSHOT to fixe bug in containsOne and containsAll 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 aee8dd6fa9924f59ef7ae2d7a176e28acd5ae21d Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Tue Jul 21 00:46:37 2015 +0200 use wikitty 3.13-SNAPSHOT to fixe bug in containsOne and containsAll commit f8951de2f9486278de04adfc09f92ae8ed863229 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Tue Jul 21 00:46:14 2015 +0200 fixes bug in url parameter evaluation expression commit 91f505b3e2b684c037c24c320e5457472587933d Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Tue Jul 21 00:44:34 2015 +0200 prefix config option with bow. Summary of changes: bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java | 2 +- bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 10 +++++----- pom.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 91f505b3e2b684c037c24c320e5457472587933d Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Tue Jul 21 00:44:34 2015 +0200 prefix config option with bow. --- bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java b/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java index f87f6d9..de94261 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java @@ -46,7 +46,7 @@ public enum BowConfigOption implements ConfigOptionDef { t("bow.config.alias.url.description"), "alias/", String.class, false, false), BOW_ALLOW_PUBLIC_GROUP( - "allow.public.group", + "bow.allow.public.group", t("bow.config.bow.allow.public.group.description"), "false", Boolean.class, false, false), BOW_SCREENSHOT_URL( -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit f8951de2f9486278de04adfc09f92ae8ed863229 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Tue Jul 21 00:46:14 2015 +0200 fixes bug in url parameter evaluation expression --- bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp index 74a0839..288fb98 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp @@ -58,15 +58,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <s:url var="groupRemoveMe" action="groupRemoveMe" escapeAmp="true"> <s:param name="groupId" value="%{#group.wikittyId}" /> - <s:param name="user" value="%{#bowSession.user.wikittyId}" /> + <s:param name="user" value="%{bowSession.user.wikittyId}" /> </s:url> <a class="removeMe" href="${groupRemoveMe}">removeMe</a> - <s:url var="rss" action="atom" escapeAmp="true"> - <s:param name="token" value="%{#bowSession.user.wikittyId}" /> - <s:param name="tagLine" value="@%{#group.name}" /> + <s:url var="atom" action="atom" escapeAmp="true"> + <s:param name="token" value="%{bowSession.permanentToken}" /> + <s:param name="tagLine" value="%{'@' + #group.name}" /> </s:url> - <a class="atom" href="${rss}">atom</a> + <a class="atom" href="${atom}">atom</a> </span> </li> </s:iterator> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit aee8dd6fa9924f59ef7ae2d7a176e28acd5ae21d Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Tue Jul 21 00:46:37 2015 +0200 use wikitty 3.13-SNAPSHOT to fixe bug in containsOne and containsAll --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 925cf45..51410d3 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ <nuitonConfigVersion>3.0-rc-2</nuitonConfigVersion> <nuitonWebVersion>1.17</nuitonWebVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> - <wikittyVersion>3.12</wikittyVersion> + <wikittyVersion>3.13-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.3.16.3</struts2Version> <struts2jqueryVersion>3.7.1</struts2jqueryVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm