You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2016/05/27 22:50:30 UTC
[08/47] roller git commit: Merge branch 'trunk' of
https://github.com/apache/roller into trunk
Merge branch 'trunk' of https://github.com/apache/roller into trunk
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/d3ffb063
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/d3ffb063
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/d3ffb063
Branch: refs/heads/bootstrap-ui
Commit: d3ffb0633096584d85f86bf485a3668ffcb6c06a
Parents: 0364bc9 15214dc
Author: Dave Johnson <sn...@apache.org>
Authored: Sat Oct 17 18:01:33 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Sat Oct 17 18:01:33 2015 -0400
----------------------------------------------------------------------
NOTICE.txt | 6 +-
app/pom.xml | 32 +-
.../java/org/apache/roller/util/DateUtil.java | 20 +-
.../org/apache/roller/weblogger/TestUtils.java | 26 +-
.../business/FileContentManagerImpl.java | 263 ++--
.../weblogger/business/HitCountQueue.java | 6 +
.../weblogger/business/WeblogEntryManager.java | 2 +-
.../business/jpa/JPAPersistenceStrategy.java | 34 +-
.../business/jpa/JPAWeblogEntryManagerImpl.java | 8 +-
.../business/jpa/JPAWebloggerImpl.java | 2 +
.../runnable/ContinuousWorkerThread.java | 8 +-
.../search/operations/IndexOperation.java | 6 +-
.../business/startup/DatabaseInstaller.java | 33 +-
.../business/startup/WebloggerStartup.java | 1 +
.../roller/weblogger/pojos/MediaFile.java | 2 +-
.../roller/weblogger/ui/core/RollerContext.java | 11 +-
.../weblogger/ui/core/filters/InitFilter.java | 43 +-
.../tags/calendar/BigWeblogCalendarModel.java | 13 +-
.../ui/core/tags/calendar/CalendarTag.java | 11 +-
.../core/tags/calendar/WeblogCalendarModel.java | 2 +-
.../weblogger/ui/rendering/model/URLModel.java | 2 +-
.../rendering/pagers/WeblogEntriesDayPager.java | 14 +-
.../pagers/WeblogEntriesMonthPager.java | 20 +-
.../comments/CommentAuthenticatorUtils.java | 43 +
.../comments/LdapCommentAuthenticator.java | 11 +-
.../comments/MathCommentAuthenticator.java | 12 +-
.../ui/rendering/servlets/PageServlet.java | 17 +-
.../ui/struts2/editor/MediaFileBean.java | 2 +-
.../weblogger/ui/struts2/util/UIAction.java | 13 +-
.../resources/ApplicationResources.properties | 7 +
.../ApplicationResources_ja.properties | 1455 ++++++++++++++++++
.../ApplicationResources_ja_JP.properties | 1069 -------------
.../main/resources/sql/510-to-520-migration.vm | 54 +
app/src/main/resources/sql/dbscripts.properties | 2 +-
app/src/main/resources/sql/macros.vm | 11 +
app/src/main/resources/sql/mysql.properties | 4 +-
app/src/main/resources/sql/oracle.properties | 4 +-
.../main/resources/sql/postgresql.properties | 4 +-
.../webapp/WEB-INF/jsps/admin/PingTargets.jsp | 2 +-
.../webapp/WEB-INF/jsps/editor/Comments.jsp | 16 +-
.../main/webapp/WEB-INF/jsps/editor/Entries.jsp | 26 +-
.../webapp/WEB-INF/jsps/editor/EntryEdit.jsp | 2 +-
app/src/main/webapp/WEB-INF/velocity.properties | 3 +
app/src/main/webapp/themes/basic/_day.vm | 4 +-
.../webapp/themes/basicmobile/_day-mobile.vm | 4 +-
app/src/main/webapp/themes/basicmobile/_day.vm | 4 +-
.../webapp/themes/basicmobile/weblog-mobile.vm | 2 +-
app/src/main/webapp/themes/fauxcoly/day.vm | 4 +-
app/src/main/webapp/themes/gaurav/day.vm | 4 +-
app/src/main/webapp/themes/gaurav/entry.vm | 21 +-
app/src/main/webapp/themes/gaurav/std_head.vm | 1 +
app/src/main/webapp/themes/gaurav/tags_index.vm | 1 +
.../weblogger/business/MediaFileTest.java | 8 +-
.../ui/core/filters/InitFilterTest.java | 75 +
assembly-release/pom.xml | 2 +-
assembly-release/sign-release.sh | 2 +-
docs/roller-install-guide.odt | Bin 1622922 -> 1623069 bytes
docs/testing/junit-cleartables-mysql.sql | 22 +-
docs/testing/roller-junit.properties | 72 +
it-selenium/pom.xml | 10 +-
.../roller/selenium/AbstractRollerPage.java | 6 +
.../roller/selenium/InitialLoginTestIT.java | 5 +-
.../roller/selenium/core/CreateWeblogPage.java | 5 +
.../selenium/editor/AbstractEntryPage.java | 4 +-
.../test/resources/roller-jettyrun.properties | 2 +-
pom.xml | 7 +-
66 files changed, 2187 insertions(+), 1400 deletions(-)
----------------------------------------------------------------------