This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a change to branch user-search-names
in repository https://gitbox.apache.org/repos/asf/roller.git
from e620e71d6 Merge remote-tracking branch 'origin/roller-6.1.x' into
user-search-names
add 931161efb Keep blogroll links to web and relative URLs (#221)
add 9848f9292 Merge remote-tracking branch 'origin/roller-6.1.x' into
user-search-names
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 6 ++
.../business/jpa/JPABookmarkManagerImpl.java | 33 ++++++++++
.../pojos/wrapper/WeblogBookmarkWrapper.java | 27 +++++++-
.../apache/roller/weblogger/util/LinkScheme.java | 73 ++++++++++++++++++++++
app/src/main/webapp/WEB-INF/velocity/weblog.vm | 16 ++---
.../business/BookmarkImportParsingTest.java | 32 ++++++++++
.../pojos/wrapper/WeblogBookmarkWrapperTest.java | 56 +++++++++++++++++
.../roller/weblogger/util/LinkSchemeTest.java | 51 +++++++++++++++
8 files changed, 280 insertions(+), 14 deletions(-)
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/pojos/wrapper/WeblogBookmarkWrapperTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/util/LinkSchemeTest.java