[roller] branch master updated (55bae93 -> e531acb)

[sn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git.


    from 55bae93  Converted User Guide document from ODT to ASCII Doc (ROL-2151)
     add 3bb06f7  Merge AsciiDoc changes into 6.
     add ca02d5c  Fix suggested by Greg Huber.
     add 4373757  Implement template remove.
     add f77c3d7  Preparing for  Roller 6 rc3.
     add 3205136  Fixed: Variables scoping in ajax-user.js (ROL-2157) Pattern is identified and reported at  sonacloud.io as Blocker
     add 9dbc9aa  Fixed: Variables scoping in roller and searchhi js files (ROL-2157) Pattern is identified and reported at  sonacloud.io as Blocker
     add 45d0837  Fixed: Variables scoping in weblog.vm js code (ROL-2157) Pattern is identified and reported at  sonacloud.io as Blocker
     add 900b759  Merge pull request #52 from adityasharma7/ROL-2157-6.0
     add d69b27b  Fixed: Variables should be declared explicitly in Custom JS code (ROL-2157)
     add 7d11070  Merge pull request #54 from adityasharma7/ROL-2157-6.0
     add bc9a588  Fix add user page.
     add c78fc67  [ROL-2161] Allow user emails up to 255 characters and add validation to User Edit page.
     add 5d8c5ff  [ROL-2160] work around apparent Struts but by showing weblog handle instead of name in front-page select.
     add 0f1edb2  Prepare for 6.0.1 release.
     add b8df019  Preparing for 6.0.1 rc-1
     add 5941c75  Fix incorrect  text key, fix suggested by ghuber
     add 0e3aaa2  Fix incorrect text key, fix suggested by ghuber.
     add f108f80  Merge branch 'master' into roller-6.0.x
     add 2b12891  Preparing for  6.0.1 rc-2: switch to AsciiDoc versions of docs.
     add 269736d  Cleanup the docs directory.
     add e531acb  Updated the references of ODT and PDF to AsciiDoc.

No new revisions were added by this update.

Summary of changes:
 app/pom.xml                                        |   2 +-
 .../ui/struts2/ajax/CommentDataServlet.java        |   1 -
 .../ui/struts2/editor/TemplateRemove.java          | 153 ---------------------
 .../weblogger/ui/struts2/editor/Templates.java     |  78 ++++++++++-
 app/src/main/resources/struts.xml                  |   4 +-
 .../main/webapp/WEB-INF/jsps/editor/Comments.jsp   |   2 +-
 .../webapp/WEB-INF/jsps/editor/TemplateRemove.jsp  |  55 --------
 .../main/webapp/WEB-INF/jsps/editor/Templates.jsp  |   5 +-
 .../WEB-INF/jsps/editor/TemplatesSidebar.jsp       |   2 +-
 .../webapp/WEB-INF/jsps/editor/WeblogConfig.jsp    |   2 +-
 assembly-release/copy-files.sh                     |   1 -
 assembly-release/copy-to-asf.sh                    |   2 -
 assembly-release/pom.xml                           |   4 +-
 assembly-release/sign-release.sh                   |  36 ++---
 assembly-release/src/main/assembly/binary.xml      |   4 +-
 docs/README.md                                     |   8 +-
 docs/before-and-after/entries.png                  | Bin 1656714 -> 0 bytes
 docs/before-and-after/entry-edit.png               | Bin 1764121 -> 0 bytes
 docs/before-and-after/main-menu.png                | Bin 1402108 -> 0 bytes
 docs/before-and-after/media-file-view.png          | Bin 2194673 -> 0 bytes
 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
 it-selenium/pom.xml                                |   2 +-
 pom.xml                                            |   4 +-
 .../i18n/check-default-resource-file.py            |   0
 .../i18n/compare-vs-default-file.py                |   0
 .../junit-cleartables-mysql.sql                    |   0
 {docs/testing => testing}/roller-junit.properties  |   0
 {docs/testing => testing}/roller-load-test.jmx     |   0
 {docs/testing => testing}/test-plan.sxc            | Bin
 34 files changed, 112 insertions(+), 253 deletions(-)
 delete mode 100644 app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
 delete mode 100644 app/src/main/webapp/WEB-INF/jsps/editor/TemplateRemove.jsp
 delete mode 100644 assembly-release/copy-files.sh
 delete mode 100755 assembly-release/copy-to-asf.sh
 delete mode 100644 docs/before-and-after/entries.png
 delete mode 100644 docs/before-and-after/entry-edit.png
 delete mode 100644 docs/before-and-after/main-menu.png
 delete mode 100644 docs/before-and-after/media-file-view.png
 delete mode 100644 docs/roller-install-guide.odt
 delete mode 100644 docs/roller-install-guide.pdf
 delete mode 100644 docs/roller-template-guide.odt
 delete mode 100644 docs/roller-template-guide.pdf
 delete mode 100644 docs/roller-user-guide.odt
 delete mode 100644 docs/roller-user-guide.pdf
 rename {docs/examples => testing}/i18n/check-default-resource-file.py (100%)
 rename {docs/examples => testing}/i18n/compare-vs-default-file.py (100%)
 rename {docs/testing => testing}/junit-cleartables-mysql.sql (100%)
 rename {docs/testing => testing}/roller-junit.properties (100%)
 rename {docs/testing => testing}/roller-load-test.jmx (100%)
 rename {docs/testing => testing}/test-plan.sxc (100%)