This is an automated email from the ASF dual-hosted git repository.

mraible pushed a commit to branch roller-6.1.x
in repository https://gitbox.apache.org/repos/asf/roller.git

commit d18d2897c1e72506b2de2a5f228f833b8a82a2bc
Merge: 858ae819e 273603698
Author: Matt Raible <[email protected]>
AuthorDate: Mon Nov 16 20:45:14 2026 -0700

    Merge pull request #299 from mraible/authoring-ui-encoding

 .../roller/weblogger/ui/struts2/util/UIAction.java |  20 ++++
 .../webapp/WEB-INF/jsps/admin/GlobalConfig.jsp     |  16 +--
 .../webapp/WEB-INF/jsps/admin/PlanetGroupSubs.jsp  |   2 +-
 .../webapp/WEB-INF/jsps/admin/PlanetGroups.jsp     |   2 +-
 .../main/webapp/WEB-INF/jsps/admin/UserEdit.jsp    |   8 +-
 .../main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp |   8 +-
 app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp |   8 +-
 .../webapp/WEB-INF/jsps/core/OAuthAuthorize.jsp    |   4 +-
 app/src/main/webapp/WEB-INF/jsps/core/Register.jsp |   4 +-
 .../main/webapp/WEB-INF/jsps/editor/Comments.jsp   |  24 ++--
 .../main/webapp/WEB-INF/jsps/editor/Entries.jsp    |  10 +-
 .../main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp  |   6 +-
 .../webapp/WEB-INF/jsps/editor/EntryEditor.jsp     |   2 +-
 .../WEB-INF/jsps/editor/MediaFileAddSuccess.jsp    |   6 +-
 .../jsps/editor/MediaFileAddSuccessInclude.jsp     |   2 +-
 .../webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp   |   8 +-
 .../WEB-INF/jsps/editor/MediaFileImageChooser.jsp  |   2 +-
 .../jsps/editor/MediaFileImageDimension.jsp        |   4 +-
 .../WEB-INF/jsps/editor/MediaFileSidebar.jsp       |   4 +-
 .../webapp/WEB-INF/jsps/editor/MediaFileView.jsp   |   4 +-
 .../main/webapp/WEB-INF/jsps/editor/Members.jsp    |   8 +-
 .../webapp/WEB-INF/jsps/editor/MembersSidebar.jsp  |   2 +-
 .../main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp  |   8 +-
 .../main/webapp/WEB-INF/jsps/tiles/userStatus.jsp  |   2 +-
 .../ui/struts2/util/JspOutputEncodingTest.java     | 132 +++++++++++++++++++++
 .../weblogger/ui/struts2/util/UIActionTest.java    |  39 ++++++
 26 files changed, 262 insertions(+), 73 deletions(-)

Reply via email to