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:53 UTC
[roller] branch roller-6.0.x updated (0e3aaa2 -> 2b12891)
This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a change to branch roller-6.0.x
in repository https://gitbox.apache.org/repos/asf/roller.git.
from 0e3aaa2 Fix incorrect text key, fix suggested by ghuber.
add a541cc0 Fixed: Variables scoping in ajax-user.js (ROL-2157) Pattern is identified and reported at sonacloud.io as Blocker
add 3ab437a Fixed: Variables scoping in roller and searchhi js files (ROL-2157) Pattern is identified and reported at sonacloud.io as Blocker
add 430795f Fixed: Variables scoping in weblog.vm js code (ROL-2157) Pattern is identified and reported at sonacloud.io as Blocker
add 3400441 Merge pull request #46 from apache/ROL-2157
add a459f6f Fixed: Variables should be declared explicitly in Custom JS code (ROL-2157)
add 3e7c421 Merge pull request #53 from adityasharma7/ROL-2157
add 8424a83 Merge pull request #1 from apache/master
add 88f8d5f Converted the Template guide from ODT to ADOC, first version (ROL-2151)
add 4ba28cc Corrected the section information (ROL-2151)
add e0bc7cf Added the various missing table and fixed formatting issus (ROL-2151)
add c987fc7 Added the images for model-object and, customizing theme and template (ROL-2151)
add 65f962b Updated the theme edit instructions as per new Roller UX (ROL-2151)
add 89655ad Updated the image for customizing the theme (ROL-2151)
add 3b472b3 Done minor formatting changes (ROL-2151)
add 3a28709 Removed the page template properties which are no longer shown in the new Roller UI (ROL-2151)
add 527c271 Merge pull request #56 from swapnilmmane/master
add 827b7a8 [ROL-2160] work around apparent Struts but by showing weblog handle instead of name in front-page select.
add 56fc6a8 Merge pull request #55 from apache/ROL-2160
add 31747ff [ROL-2161] Allow user emails up to 255 characters and add validation to User Edit page.
add d707a7a Merge pull request #57 from apache/ROL-2161
add 0b22358 Attempt to fix tests that are broken on builds.apache.org but work on my machine.
add eb35445 Attempt to fix tests that are broken on builds.apache.org but work on my machine.
add f39e32b Fix add user page.
add 286b4e1 Fixed: Moved the roller-install-guide to appropriate location (ROL-2151)
add 9cb1627 Merge pull request #59 from swapnilmmane/master
add 55bae93 Converted User Guide document from ODT to ASCII Doc (ROL-2151)
new f108f80 Merge branch 'master' into roller-6.0.x
new 2b12891 Preparing for 6.0.1 rc-2: switch to AsciiDoc versions of docs.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../business/SubscriptionFunctionalTests.java | 5 +-
.../roller/weblogger/business/WeblogStatsTest.java | 9 +-
assembly-release/pom.xml | 2 +-
assembly-release/sign-release.sh | 2 +-
assembly-release/src/main/assembly/binary.xml | 4 +-
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-install-guide.odt | Bin 386049 -> 0 bytes
docs/roller-install-guide.pdf | Bin 523568 -> 0 bytes
docs/roller-template-guide.adoc | 2248 ++++++++++++++++++++
docs/roller-template-guide.odt | Bin 238537 -> 0 bytes
docs/roller-template-guide.pdf | Bin 471256 -> 0 bytes
docs/roller-user-guide.adoc | 1613 ++++++++++++++
docs/roller-user-guide.odt | Bin 2740008 -> 0 bytes
docs/roller-user-guide.pdf | Bin 2033057 -> 0 bytes
60 files changed, 3873 insertions(+), 10 deletions(-)
create mode 100644 docs/images/customize-theme-1.png
create mode 100644 docs/images/customize-theme-2.png
create mode 100644 docs/images/model-object.png
create mode 100644 docs/images/template-edit.png
create mode 100644 docs/images/templates.png
create mode 100644 docs/images/user-guide-1-welcome.png
create mode 100644 docs/images/user-guide-10-categories.png
create mode 100644 docs/images/user-guide-11-blogroll.png
create mode 100644 docs/images/user-guide-12-media.png
create mode 100644 docs/images/user-guide-13-add-media.png
create mode 100644 docs/images/user-guide-14-upload-complete.png
create mode 100644 docs/images/user-guide-15-edit-media.png
create mode 100644 docs/images/user-guide-17-api.png
create mode 100644 docs/images/user-guide-18-comments.png
create mode 100644 docs/images/user-guide-2-registration.png
create mode 100644 docs/images/user-guide-20-design-menu.png
create mode 100644 docs/images/user-guide-21-member.png
create mode 100644 docs/images/user-guide-22-invite-member.png
create mode 100644 docs/images/user-guide-23-ping.png
create mode 100644 docs/images/user-guide-24-user-admin.png
create mode 100644 docs/images/user-guide-25-user-admin.png
create mode 100644 docs/images/user-guide-26-site-setting.png
create mode 100644 docs/images/user-guide-27-comments.png
create mode 100644 docs/images/user-guide-28-feed.png
create mode 100644 docs/images/user-guide-29-fileupload.png
create mode 100644 docs/images/user-guide-3-webblog.png
create mode 100644 docs/images/user-guide-30-ping.png
create mode 100644 docs/images/user-guide-31-add-ping.png
create mode 100644 docs/images/user-guide-32-planet-config.png
create mode 100644 docs/images/user-guide-33-subscription.png
create mode 100644 docs/images/user-guide-4-statusbar.png
create mode 100644 docs/images/user-guide-5-statusbar-webblog.png
create mode 100644 docs/images/user-guide-6-navigation.png
create mode 100644 docs/images/user-guide-7-main-menu.png
create mode 100644 docs/images/user-guide-8-editor.png
create mode 100644 docs/images/user-guide-9-entries.png
create mode 100644 docs/images/user-guide-comments.png
create mode 100644 docs/images/user-guide-design-theme.png
create mode 100644 docs/images/user-guide-formatting.png
create mode 100644 docs/images/user-guide-internationalization.png
create mode 100644 docs/images/user-guide-media-directory.png
create mode 100644 docs/images/user-guide-plugin.png
create mode 100644 docs/images/user-guide-podcast.png
create mode 100644 docs/images/user-guide-setting.png
create mode 100644 docs/images/user-guide-settings.png
create mode 100644 docs/images/user-guide-spam.png
rename docs/{adoc => }/roller-install-guide.adoc (100%)
delete mode 100644 docs/roller-install-guide.odt
delete mode 100644 docs/roller-install-guide.pdf
create mode 100644 docs/roller-template-guide.adoc
delete mode 100644 docs/roller-template-guide.odt
delete mode 100644 docs/roller-template-guide.pdf
create mode 100644 docs/roller-user-guide.adoc
delete mode 100644 docs/roller-user-guide.odt
delete mode 100644 docs/roller-user-guide.pdf
[roller] 01/02: Merge branch 'master' into roller-6.0.x
Posted by sn...@apache.org.
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(-)
[roller] 02/02: Preparing for 6.0.1 rc-2: switch to AsciiDoc
versions of docs.
Posted by sn...@apache.org.
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 2b12891d7e3351a6345f25d568e2502724296d72
Author: David M. Johnson <sn...@apache.org>
AuthorDate: Sun May 3 16:03:41 2020 -0400
Preparing for 6.0.1 rc-2: switch to AsciiDoc versions of docs.
---
assembly-release/pom.xml | 2 +-
assembly-release/sign-release.sh | 2 +-
assembly-release/src/main/assembly/binary.xml | 4 ++--
docs/roller-install-guide.odt | Bin 386049 -> 0 bytes
docs/roller-install-guide.pdf | Bin 523568 -> 0 bytes
docs/roller-template-guide.odt | Bin 238537 -> 0 bytes
docs/roller-template-guide.pdf | Bin 471256 -> 0 bytes
docs/roller-user-guide.odt | Bin 2740008 -> 0 bytes
docs/roller-user-guide.pdf | Bin 2033057 -> 0 bytes
9 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/assembly-release/pom.xml b/assembly-release/pom.xml
index 582604a..51493f1 100644
--- a/assembly-release/pom.xml
+++ b/assembly-release/pom.xml
@@ -79,7 +79,7 @@
</dependency>
</dependencies>
<configuration>
- <sourceDirectory>../docs/adoc</sourceDirectory>
+ <sourceDirectory>../docs</sourceDirectory>
<attributes>
<sourcedir>${project.build.sourceDirectory}</sourcedir>
</attributes>
diff --git a/assembly-release/sign-release.sh b/assembly-release/sign-release.sh
index b7248e5..0f39725 100755
--- a/assembly-release/sign-release.sh
+++ b/assembly-release/sign-release.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-export rcstring="-rc-1"
+export rcstring="-rc-2"
export vstring="6.0.1"
# for rc releases we rename the release files
diff --git a/assembly-release/src/main/assembly/binary.xml b/assembly-release/src/main/assembly/binary.xml
index 994f3ed..ae75c95 100644
--- a/assembly-release/src/main/assembly/binary.xml
+++ b/assembly-release/src/main/assembly/binary.xml
@@ -48,11 +48,11 @@
<outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
</file>
<file>
- <source>../docs/roller-template-guide.pdf</source>
+ <source>target/generated-docs/roller-template-guide.pdf</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
</file>
<file>
- <source>../docs/roller-user-guide.pdf</source>
+ <source>target/generated-docs/roller-user-guide.pdf</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
</file>
</files>
diff --git a/docs/roller-install-guide.odt b/docs/roller-install-guide.odt
deleted file mode 100644
index eb8d53d..0000000
Binary files a/docs/roller-install-guide.odt and /dev/null differ
diff --git a/docs/roller-install-guide.pdf b/docs/roller-install-guide.pdf
deleted file mode 100644
index 376b33b..0000000
Binary files a/docs/roller-install-guide.pdf and /dev/null differ
diff --git a/docs/roller-template-guide.odt b/docs/roller-template-guide.odt
deleted file mode 100644
index 541eb86..0000000
Binary files a/docs/roller-template-guide.odt and /dev/null differ
diff --git a/docs/roller-template-guide.pdf b/docs/roller-template-guide.pdf
deleted file mode 100644
index 6ae010d..0000000
Binary files a/docs/roller-template-guide.pdf and /dev/null differ
diff --git a/docs/roller-user-guide.odt b/docs/roller-user-guide.odt
deleted file mode 100644
index dcb059e..0000000
Binary files a/docs/roller-user-guide.odt and /dev/null differ
diff --git a/docs/roller-user-guide.pdf b/docs/roller-user-guide.pdf
deleted file mode 100644
index eb7bba4..0000000
Binary files a/docs/roller-user-guide.pdf and /dev/null differ