This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a change to branch atompub-roller-servlet
in repository https://gitbox.apache.org/repos/asf/roller.git
from 6110b6f26 Merge branch 'roller-6.1.x' into atompub-roller-servlet
add e41a1a12f Turn Planet off by default and require POST for its admin
changes (#200)
add 51c943b24 ROL-2184: Preserve pasted entry images when publishing (#205)
add 5adadd9dd Fix bugs found while testing the 6.1.7 integration build
(#207)
add 76a623e69 Merge branch 'roller-6.1.x' into atompub-roller-servlet
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 54 ++++
.../roller/planet/config/PlanetRuntimeConfig.java | 27 +-
.../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 ++
.../ui/core/filters/ValidateSaltFilter.java | 25 ++
.../ui/rendering/servlets/PlanetFeedServlet.java | 10 +-
.../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 +++++++++++++++++
.../webservices/atomprotocol/MediaCollection.java | 24 +-
.../main/resources/ApplicationResources.properties | 5 +
.../roller/weblogger/config/roller.properties | 21 +-
.../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 | 5 +
.../roller-ui/errors/{denied.jsp => 413.jsp} | 24 +-
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 ++++++++++
.../ui/core/filters/ValidateSaltFilterTest.java | 34 +++
.../struts2/editor/EntryEditInlineImagesTest.java | 318 +++++++++++++++++++++
.../ui/struts2/editor/FolderEditSaveTest.java | 114 ++++++++
.../util/HTMLSanitizerInlineImageTest.java | 50 ++++
.../roller/weblogger/util/InlineImageDataTest.java | 182 ++++++++++++
.../atomprotocol/MediaCollectionPathTest.java | 172 +++++++++++
docs/roller-user-guide.adoc | 21 ++
43 files changed, 1983 insertions(+), 98 deletions(-)
create mode 100644
app/src/main/java/org/apache/roller/weblogger/util/InlineImageData.java
copy app/src/main/webapp/roller-ui/errors/{denied.jsp => 413.jsp} (65%)
create mode 100644
app/src/test/java/org/apache/roller/planet/config/PlanetRuntimeConfigTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/planet/ui/PlanetAvailabilityTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEditInlineImagesTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEditSaveTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/util/HTMLSanitizerInlineImageTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/util/InlineImageDataTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollectionPathTest.java