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

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


    from 0d604bd1c Merge pull request #433 from spyhunter99/feature/JSPWIKI-1235
     add 51894405c JSPWIKI-75 see issue for specifics
     add 3c1ee34b3 Merge branch 'master' into bug/JSPWIKI-75
     add 83f7cf623 Merge branch 'master' into bug/JSPWIKI-75
     add 53f6a4b03 change log
     new 5f0612ef9 Merge pull request #434 from spyhunter99/bug/JSPWIKI-75

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:
 ChangeLog.md                                                   |  7 +++++++
 jspwiki-api/src/main/java/org/apache/wiki/api/Release.java     |  2 +-
 .../java/org/apache/wiki/attachment/AttachmentServlet.java     |  9 ++++++---
 .../org/apache/wiki/auth/authorize/DefaultGroupManager.java    |  1 +
 .../main/java/org/apache/wiki/plugin/DefaultPluginManager.java |  8 ++++++--
 .../src/main/java/org/apache/wiki/tags/PageSizeTag.java        |  2 +-
 jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java   |  5 ++++-
 jspwiki-main/src/main/resources/CoreResources.properties       |  5 ++++-
 jspwiki-main/src/main/resources/CoreResources_de.properties    |  8 ++++++--
 jspwiki-main/src/main/resources/CoreResources_es.properties    |  6 +++++-
 jspwiki-main/src/main/resources/CoreResources_fi.properties    |  5 ++++-
 jspwiki-main/src/main/resources/CoreResources_fr.properties    |  7 +++++--
 jspwiki-main/src/main/resources/CoreResources_it.properties    |  5 ++++-
 jspwiki-main/src/main/resources/CoreResources_nl.properties    |  5 ++++-
 jspwiki-main/src/main/resources/CoreResources_pt_BR.properties |  8 ++++++--
 jspwiki-main/src/main/resources/CoreResources_ru.properties    |  6 +++++-
 jspwiki-main/src/main/resources/CoreResources_zh_CN.properties |  6 ++++--
 jspwiki-war/src/main/webapp/Comment.jsp                        | 10 +++++-----
 jspwiki-war/src/main/webapp/DeleteGroup.jsp                    |  6 ++++--
 jspwiki-war/src/main/webapp/Edit.jsp                           |  6 ++++--
 jspwiki-war/src/main/webapp/EditGroup.jsp                      |  8 ++++++--
 jspwiki-war/src/main/webapp/Error.jsp                          |  2 ++
 jspwiki-war/src/main/webapp/Group.jsp                          |  6 ++++--
 jspwiki-war/src/main/webapp/NewGroup.jsp                       |  9 ++++++---
 jspwiki-war/src/main/webapp/UserPreferences.jsp                |  6 ++++--
 25 files changed, 108 insertions(+), 40 deletions(-)

Reply via email to