This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a change to branch media-library
in repository https://gitbox.apache.org/repos/asf/roller.git
from 2ee4cb3b0 Media library: one search box, type chips, selection bar,
aligned cards
add 0137824ac Serve media found by a custom theme under the media rules
(#217)
add a8d5ece82 Drop an unclosed tag in removeHTML and print the weblog
description as text on the main menu (#228)
add 931161efb Keep blogroll links to web and relative URLs (#221)
add 3aab7aca3 Match only user names in the user search for non-admins and
escape LIKE wildcards (#222)
add dfb0af67e Require a role in the weblog for page and resource previews
(#223)
add 639c308da Refuse disabled accounts when signing in with an OpenID URL
(#224)
add 666e793fe Limit search queries to the search fields and stop indexing
comment email addresses (#225)
add a76037402 Return only published entries from search and drop the index
entry when AtomPub saves a draft (#226)
add 82636611c Require POST for action methods that change data (#227)
add 69d0d5eef Show blogroll names and descriptions as plain text (#231)
add 556593883 Merge branch 'roller-6.1.x' into master
add 8820c91b1 Merge master into media-library
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 50 ++++++
.../roller/weblogger/business/UserManager.java | 17 +-
.../business/jpa/JPABookmarkManagerImpl.java | 33 ++++
.../weblogger/business/jpa/JPAUserManagerImpl.java | 35 +++-
.../weblogger/business/search/IndexManager.java | 13 ++
.../business/search/lucene/FieldConstants.java | 3 +
.../business/search/lucene/IndexOperation.java | 28 ---
.../business/search/lucene/LuceneIndexManager.java | 111 ++++++++----
.../business/search/lucene/SearchOperation.java | 49 ++++-
.../business/themes/WeblogCustomTheme.java | 8 +
.../pojos/wrapper/WeblogBookmarkWrapper.java | 27 ++-
.../rendering/servlets/PreviewResourceServlet.java | 15 ++
.../ui/rendering/servlets/PreviewServlet.java | 8 +-
.../ui/rendering/servlets/ResourceServlet.java | 8 +
.../weblogger/ui/rendering/util/PreviewAccess.java | 50 ++++++
.../weblogger/ui/struts2/admin/PingTargetEdit.java | 14 ++
.../weblogger/ui/struts2/admin/PingTargets.java | 4 +-
.../weblogger/ui/struts2/ajax/UserDataServlet.java | 13 +-
.../roller/weblogger/ui/struts2/core/MainMenu.java | 4 +-
.../weblogger/ui/struts2/editor/EntryEdit.java | 6 +-
.../weblogger/ui/struts2/editor/EntryRemove.java | 15 +-
.../weblogger/ui/struts2/editor/MediaFileBean.java | 6 +-
.../weblogger/ui/struts2/editor/MediaFileEdit.java | 3 +
.../roller/weblogger/ui/struts2/editor/Pings.java | 6 +-
.../roller/weblogger/ui/struts2/util/UIAction.java | 3 +
.../ui/struts2/util/ValidateSaltInterceptor.java | 31 +++-
.../apache/roller/weblogger/util/LinkScheme.java | 73 ++++++++
.../roller/weblogger/util/MediaTypePolicy.java | 26 +++
.../apache/roller/weblogger/util/Utilities.java | 59 +++++-
.../webservices/atomprotocol/EntryCollection.java | 18 +-
.../org/apache/roller/weblogger/pojos/User.orm.xml | 10 +-
app/src/main/resources/struts.xml | 21 +++
.../main/webapp/WEB-INF/jsps/admin/PingTargets.jsp | 20 +--
.../webapp/WEB-INF/jsps/core/CreateDatabase.jsp | 14 +-
app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp | 26 +--
.../webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp | 14 +-
app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp | 32 ++--
app/src/main/webapp/WEB-INF/velocity/weblog.vm | 22 +--
.../business/BookmarkImportParsingTest.java | 32 ++++
.../apache/roller/weblogger/business/UserTest.java | 15 ++
.../business/jpa/JPAUserManagerLikePrefixTest.java | 37 ++++
.../business/search/IndexManagerTest.java | 34 ++++
.../business/search/UpdateEntryIndexTest.java | 63 +++++++
.../business/search/lucene/IndexedFieldsTest.java | 108 +++++++++++
.../search/lucene/SearchFieldsQueryParserTest.java | 69 +++++++
.../search/lucene/SearchHitPagingTest.java | 112 ++++++++++++
.../business/themes/WeblogCustomThemeTest.java | 9 +
.../pojos/wrapper/WeblogBookmarkWrapperTest.java | 56 ++++++
.../servlets/PreviewResourceServletTest.java | 200 +++++++++++++++++++++
.../servlets/PreviewServletAccessTest.java | 64 +++++++
.../ui/rendering/servlets/ResourceServletTest.java | 158 ++++++++++++++++
.../ui/rendering/util/PreviewAccessTest.java | 109 +++++++++++
.../ui/struts2/admin/PingTargetEditTest.java | 94 ++++++++++
.../ui/struts2/ajax/UserDataServletTest.java | 132 ++++++++++++++
.../ui/struts2/editor/MediaFileBeanTest.java | 47 +++++
.../ui/struts2/editor/MediaFileEditTest.java | 116 ++++++++++++
.../struts2/util/ValidateSaltInterceptorTest.java | 60 +++++++
.../roller/weblogger/util/LinkSchemeTest.java | 51 ++++++
.../roller/weblogger/util/MediaTypePolicyTest.java | 48 ++++-
.../roller/weblogger/util/UtilitiesTest.java | 37 ++++
60 files changed, 2364 insertions(+), 182 deletions(-)
create mode 100644
app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/PreviewAccess.java
create mode 100644
app/src/main/java/org/apache/roller/weblogger/util/LinkScheme.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerLikePrefixTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/business/search/UpdateEntryIndexTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/business/search/lucene/IndexedFieldsTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/business/search/lucene/SearchFieldsQueryParserTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/business/search/lucene/SearchHitPagingTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapperTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServletTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServletAccessTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServletTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/PreviewAccessTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/struts2/admin/PingTargetEditTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServletTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBeanTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEditTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/util/LinkSchemeTest.java