This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/roller.git
commit e25af330f079f5ab9204f8fdf1ec324dae3a8007 Merge: 15d4fce0c eb902c608 Author: David M. Johnson <[email protected]> AuthorDate: Thu Oct 8 19:05:05 2026 -0400 Merge branch 'roller-6.1.x' into master Brings the 6.1.7 changes (through roller-6.1.7-rc1) into master before the Roller 7 work. Version conflicts resolved to 7.0.0-SNAPSHOT. .github/workflows/codeql-analysis.yml | 4 +- .github/workflows/main.yml | 4 +- CHANGES.md | 81 ++++- NOTICE.txt | 2 +- app/pom.xml | 7 + .../roller/planet/config/PlanetRuntimeConfig.java | 27 +- .../roller/weblogger/business/WebloggerImpl.java | 24 +- .../planet/tasks/RefreshRollerPlanetTask.java | 4 + .../weblogger/planet/tasks/SyncWebsitesTask.java | 4 + .../roller/weblogger/planet/ui/PlanetConfig.java | 3 + .../weblogger/planet/ui/PlanetGroupSubs.java | 9 + .../roller/weblogger/planet/ui/PlanetGroups.java | 3 + .../roller/weblogger/planet/ui/PlanetUIAction.java | 20 ++ .../pojos/wrapper/WeblogEntryWrapper.java | 7 +- .../weblogger/pojos/wrapper/WeblogWrapper.java | 9 +- .../roller/weblogger/pojos/wrapper/Wrappers.java | 49 +++ .../ui/core/filters/ValidateSaltFilter.java | 25 ++ .../ui/core/security/BootstrapSecurity.java | 8 +- .../weblogger/ui/rendering/model/SiteModel.java | 3 +- .../ui/rendering/model/UtilitiesModel.java | 5 +- .../ui/rendering/servlets/PlanetFeedServlet.java | 10 +- .../weblogger/ui/struts2/admin/GlobalConfig.java | 7 +- .../weblogger/ui/struts2/editor/EntryEdit.java | 242 +++++++++++++ .../weblogger/ui/struts2/editor/FolderEdit.java | 2 +- .../ui/struts2/util/UISecurityEnforced.java | 9 + .../ui/struts2/util/UISecurityInterceptor.java | 8 + .../roller/weblogger/util/HTMLSanitizer.java | 17 +- .../roller/weblogger/util/InlineImageData.java | 265 ++++++++++++++ .../roller/weblogger/util/SafeSAXBuilder.java | 13 +- .../roller/weblogger/util/SecureXmlParsers.java | 94 +++++ .../webservices/atomprotocol/MediaCollection.java | 24 +- .../atomprotocol/RollerAtomHandler.java | 13 +- .../atomprotocol/RollerAtomHandlerFactory.java | 10 +- .../atomprotocol/RollerAtomServlet.java | 248 ++++++++++++++ .../main/resources/ApplicationResources.properties | 7 + .../roller/weblogger/config/roller.properties | 21 +- .../roller/weblogger/config/runtimeConfigDefs.xml | 5 + .../webapp/WEB-INF/jsps/admin/GlobalConfig.jsp | 2 +- .../main/webapp/WEB-INF/jsps/admin/PingTargets.jsp | 12 +- .../main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp | 81 +++-- .../main/webapp/WEB-INF/jsps/editor/Categories.jsp | 16 +- .../webapp/WEB-INF/jsps/editor/EntryEditor.jsp | 19 +- app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp | 3 + app/src/main/webapp/WEB-INF/web.xml | 7 +- app/src/main/webapp/roller-ui/errors/413.jsp | 35 ++ app/src/main/webapp/theme/scripts/roller.js | 25 ++ app/src/main/webapp/themes/basic/weblog.vm | 2 +- app/src/main/webapp/themes/basicmobile/weblog.vm | 2 +- app/src/main/webapp/themes/fauxcoly/weblog.vm | 3 +- app/src/main/webapp/themes/frontpage/_header.vm | 2 +- app/src/main/webapp/themes/gaurav/std_head.vm | 2 +- .../planet/config/PlanetRuntimeConfigTest.java | 74 ++++ .../weblogger/business/PlanetManagerLocalTest.java | 10 +- .../planet/ui/PlanetAvailabilityTest.java | 156 +++++++++ .../pojos/wrapper/WrapperPojoConfinementTest.java | 168 +++++++++ .../ui/core/filters/ValidateSaltFilterTest.java | 34 ++ .../admin/GlobalConfigAtomPubLimitTest.java | 113 ++++++ .../struts2/editor/EntryEditInlineImagesTest.java | 318 +++++++++++++++++ .../ui/struts2/editor/FolderEditSaveTest.java | 114 +++++++ .../util/HTMLSanitizerInlineImageTest.java | 50 +++ .../roller/weblogger/util/InlineImageDataTest.java | 182 ++++++++++ .../roller/weblogger/util/SafeSAXBuilderTest.java | 27 +- .../weblogger/util/SecureXmlParsersTest.java | 122 +++++++ .../atomprotocol/MediaCollectionPathTest.java | 172 ++++++++++ .../atomprotocol/RollerAtomServletTest.java | 379 +++++++++++++++++++++ assembly-release/src/main/assembly/source.xml | 2 + binary-includes/NOTICE.txt | 2 +- docs/roller-user-guide.adoc | 30 ++ 68 files changed, 3323 insertions(+), 134 deletions(-)
