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

snoopdave pushed a change to branch roller-6.0.x
in repository

    from 605797d  Prepare for rc 1
     add 596a84f  Fixed: NOTICE file does not have standard content (ROL-2138) 
1. Rearranged the content as per the standard for Notice and License files 2. 
Removed credits from Notice file
     add 1438660  Fixed: NOTICE file does not have standard content (ROL-2138) 
Improved text of the ALv2 and improved the statements as per the standards. 
Removed copyright notice of sub dependencies of Xinha WYSIWYG editor Updated 
license file as per the standards
     add 192b006  Merge branch 'master' of 
into ROL-2138
     add 917b26b  Fixed: NOTICE file does not have standard content (ROL-2138) 
Improved statements in License file
     add 21fca17  Added: separate Notice and License files for the binary 
release (ROL-2138)
     add 6916df6  Merge pull request #29 from apache/ROL-2138
     add 333dfb7  Small improvements to README
     add 83d8f8b  Add link button to Summernote rich text editor.
     add 10370c1  updated apache lucene to 8.1.1 and made necessary code 
changes. search index rebuild task is now triggered automatically during init 
if the index version is incompatible.
     add a4dfaed  removed code using the deprecated RAMDirectory, since the 
codepaths were not used or tested anyway.
     add 30694c2  reuse reader from the index consistency check.
     add 5b8c44b  Merge pull request #34 from mbien/master
     add ca5cbe2  Entries page: move delete column to far right, add tooltips 
for edit and delete glyphs.
     add 7e18e38  War file location fix
     add 8f2aef8  Merge pull request #33 from fileme/patch-1
     add 9f47674  fix global config jsp wrong tag
     add dbd7886  fix bugs in Global Config JSP
     add 74f288d  Revert "fix bugs in Global Config JSP"
     add 1918954  fix Global Config JSP Page bugs
     add 251c72e  Merge pull request #36 from zorrofox/fix_globalconfig_jsp
     add c59a571  Merge branch 'master' of
     add 619a3d2  Fixes to User Admin pages: disable edit button if nothing 
selected and send user back to user admin page after save.
     add 1ca1853  Formatting change only.
     add 7c498e5  Added the information for latest release
     add 07434a1  Merge pull request #38 from swapnilmmane/patch-1
     add deaab19  Update to work with latest docker-compose.
     add 026f8f1  Dockerfile in master should build against master.
     new 23739e2  Merge branch 'master' into roller-6.0.x

The 1 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:
 Dockerfile                                         |   6 +-
 LICENSE.txt                                        |  28 +++++
 app/pom.xml                                        |   2 +-
 .../weblogger/business/search/  |   4 -
 .../business/search/          | 136 ++++++++-------------
 .../business/search/operations/ |  10 +-
 .../search/operations/  |   3 +-
 .../search/operations/         |  40 +++---
 .../apache/roller/weblogger/config/ |  31 +++--
 .../weblogger/ui/struts2/admin/       |  16 +--
 app/src/main/resources/struts.xml                  |   6 +-
 .../webapp/WEB-INF/jsps/admin/GlobalConfig.jsp     |   8 +-
 .../main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp   |  12 +-
 .../main/webapp/WEB-INF/jsps/editor/Entries.jsp    |  29 +++--
 .../webapp/WEB-INF/jsps/editor/EntryEditor.jsp     |   3 +-
 app/src/main/webapp/roller-ui/scripts/ajax-user.js |   3 +-
 LICENSE.txt => binary-includes/LICENSE.txt         | 109 ++++++++++++++++-
 NOTICE.txt => binary-includes/NOTICE.txt           |   2 +-
 doap_roller.rdf                                    |  15 ++-
 docker-compose.yml                                 |   7 +-
 20 files changed, 297 insertions(+), 173 deletions(-)
 copy LICENSE.txt => binary-includes/LICENSE.txt (78%)
 copy NOTICE.txt => binary-includes/NOTICE.txt (95%)

Reply via email to