You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2018/03/16 13:13:24 UTC
[struts] branch master updated (e2c2ea8 -> b39433a)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.
from e2c2ea8 [maven-release-plugin] prepare for next development iteration
add 42cc8bd Align OptGroup with Select
add a6516a2 fix two issues for ListUIBean
add 770e4ed convert supplied value to list when isn't iterable
add c3d8b47 fix list when not found in stack and so is null
new b39433a Merge pull request #204 from quaff/master
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/struts2/components/ListUIBean.java | 39 +++++++++--------
.../org/apache/struts2/components/OptGroup.java | 2 +-
.../main/resources/template/simple/optgroup.ftl | 15 ++++---
.../freemarker/FreemarkerResultMockedTest.java | 49 ++++++++++++++++++++++
.../apache/struts2/views/freemarker}/select.ftl | 11 +++--
core/src/test/resources/struts.xml | 6 +++
6 files changed, 93 insertions(+), 29 deletions(-)
copy core/src/{main/resources/template/xhtml => test/resources/org/apache/struts2/views/freemarker}/select.ftl (66%)
--
To stop receiving notification emails like this one, please contact
lukaszlenart@apache.org.
[struts] 01/01: Merge pull request #204 from quaff/master
Posted by lu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit b39433aaa54bec3b593759a9631f4d38b4d2e7da
Merge: e2c2ea8 c3d8b47
Author: Lukasz Lenart <lu...@gmail.com>
AuthorDate: Fri Mar 16 14:13:21 2018 +0100
Merge pull request #204 from quaff/master
WW-4910 Align OptGroup with Select
.../org/apache/struts2/components/ListUIBean.java | 39 +++++++++--------
.../org/apache/struts2/components/OptGroup.java | 2 +-
.../main/resources/template/simple/optgroup.ftl | 15 ++++---
.../freemarker/FreemarkerResultMockedTest.java | 49 ++++++++++++++++++++++
.../org/apache/struts2/views/freemarker/select.ftl | 28 +++++++++++++
core/src/test/resources/struts.xml | 6 +++
6 files changed, 113 insertions(+), 26 deletions(-)
--
To stop receiving notification emails like this one, please contact
lukaszlenart@apache.org.