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 2020/05/03 20:03:54 UTC
[roller] 01/02: Merge branch 'master' into roller-6.0.x
This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a commit to branch roller-6.0.x
in repository https://gitbox.apache.org/repos/asf/roller.git
commit f108f800da4dc39326f0c9ed3939a50feba12af1
Merge: 0e3aaa2 55bae93
Author: David M. Johnson <sn...@apache.org>
AuthorDate: Sun May 3 15:33:42 2020 -0400
Merge branch 'master' into roller-6.0.x
.../business/SubscriptionFunctionalTests.java | 5 +-
.../roller/weblogger/business/WeblogStatsTest.java | 9 +-
docs/images/customize-theme-1.png | Bin 0 -> 138623 bytes
docs/images/customize-theme-2.png | Bin 0 -> 144198 bytes
docs/images/model-object.png | Bin 0 -> 163891 bytes
docs/images/template-edit.png | Bin 0 -> 143691 bytes
docs/images/templates.png | Bin 0 -> 146923 bytes
docs/images/user-guide-1-welcome.png | Bin 0 -> 96505 bytes
docs/images/user-guide-10-categories.png | Bin 0 -> 91147 bytes
docs/images/user-guide-11-blogroll.png | Bin 0 -> 103383 bytes
docs/images/user-guide-12-media.png | Bin 0 -> 131778 bytes
docs/images/user-guide-13-add-media.png | Bin 0 -> 105691 bytes
docs/images/user-guide-14-upload-complete.png | Bin 0 -> 178039 bytes
docs/images/user-guide-15-edit-media.png | Bin 0 -> 128888 bytes
docs/images/user-guide-17-api.png | Bin 0 -> 23663 bytes
docs/images/user-guide-18-comments.png | Bin 0 -> 131206 bytes
docs/images/user-guide-2-registration.png | Bin 0 -> 123378 bytes
docs/images/user-guide-20-design-menu.png | Bin 0 -> 68562 bytes
docs/images/user-guide-21-member.png | Bin 0 -> 109586 bytes
docs/images/user-guide-22-invite-member.png | Bin 0 -> 35363 bytes
docs/images/user-guide-23-ping.png | Bin 0 -> 117336 bytes
docs/images/user-guide-24-user-admin.png | Bin 0 -> 69574 bytes
docs/images/user-guide-25-user-admin.png | Bin 0 -> 91584 bytes
docs/images/user-guide-26-site-setting.png | Bin 0 -> 60608 bytes
docs/images/user-guide-27-comments.png | Bin 0 -> 60050 bytes
docs/images/user-guide-28-feed.png | Bin 0 -> 30563 bytes
docs/images/user-guide-29-fileupload.png | Bin 0 -> 33575 bytes
docs/images/user-guide-3-webblog.png | Bin 0 -> 150375 bytes
docs/images/user-guide-30-ping.png | Bin 0 -> 84737 bytes
docs/images/user-guide-31-add-ping.png | Bin 0 -> 68867 bytes
docs/images/user-guide-32-planet-config.png | Bin 0 -> 106472 bytes
docs/images/user-guide-33-subscription.png | Bin 0 -> 92978 bytes
docs/images/user-guide-4-statusbar.png | Bin 0 -> 12486 bytes
docs/images/user-guide-5-statusbar-webblog.png | Bin 0 -> 52321 bytes
docs/images/user-guide-6-navigation.png | Bin 0 -> 12515 bytes
docs/images/user-guide-7-main-menu.png | Bin 0 -> 101077 bytes
docs/images/user-guide-8-editor.png | Bin 0 -> 99153 bytes
docs/images/user-guide-9-entries.png | Bin 0 -> 106642 bytes
docs/images/user-guide-comments.png | Bin 0 -> 44628 bytes
docs/images/user-guide-design-theme.png | Bin 0 -> 199776 bytes
docs/images/user-guide-formatting.png | Bin 0 -> 20069 bytes
docs/images/user-guide-internationalization.png | Bin 0 -> 33773 bytes
docs/images/user-guide-media-directory.png | Bin 0 -> 18903 bytes
docs/images/user-guide-plugin.png | Bin 0 -> 18555 bytes
docs/images/user-guide-podcast.png | Bin 0 -> 27933 bytes
docs/images/user-guide-setting.png | Bin 0 -> 108216 bytes
docs/images/user-guide-settings.png | Bin 0 -> 37896 bytes
docs/images/user-guide-spam.png | Bin 0 -> 18269 bytes
docs/{adoc => }/roller-install-guide.adoc | 0
docs/roller-template-guide.adoc | 2248 ++++++++++++++++++++
docs/roller-user-guide.adoc | 1613 ++++++++++++++
51 files changed, 3869 insertions(+), 6 deletions(-)