[Jamwiki-commit] [SCM] JAMWiki branch master updated. 1.3.1-45-gb4ddd47

[thkoch2001 <thk...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "JAMWiki".

The branch, master has been updated
       via  b4ddd474a23e23c8506d4aa7800837ec6ce047ba (commit)
       via  3b4a2a13940c0e68b0cf5d2af16d4f7320e82dd5 (commit)
       via  d745ae31e38ca1a098588c4c66a0556a45ef569c (commit)
       via  07130e1fef9c8e39ab11b2a951f57a44766346eb (commit)
       via  d8bbd00f94b59a25a18205e767dbfe23e24482ad (commit)
       via  63e6582a52824934ec911fc62caf94231d83e3a5 (commit)
       via  37749db7c35d8ac6ae1af2e9240e8e19621f3f16 (commit)
       via  c07fd7e43a2a0798a42bcce9c4c4892c1ab88935 (commit)
       via  05b0535e5797d27a214d5431beebcaa08b09f4b7 (commit)
       via  63598c03bedb8fc4a51a87f1bd6efaeb20b1c8e9 (commit)
       via  0bbdd6edbbd2719f948f4c664560b0d9727e9ea7 (commit)
       via  fa324bbc2b0eaeef98e65fd13addb94f0e89572d (commit)
       via  512165909d10c895a608c008048cf6f145e83367 (commit)
       via  a19c274e3be03aa3f9999c19b2a2bbd6ec439168 (commit)
      from  bd649210896e83427c36904f720c5f6b81fe7704 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b4ddd474a23e23c8506d4aa7800837ec6ce047ba
Author: Thomas Koch <th...@ko...>
Date:   Sat Apr 6 15:12:00 2013 +0200

    Extract feed entry description creation in separate function
    
    I plan to include a diff of the change in the feed and therefor the
    description creation will become more complex and should be done in
    its own function.

commit 3b4a2a13940c0e68b0cf5d2af16d4f7320e82dd5
Author: Thomas Koch <th...@ko...>
Date:   Sat Apr 6 12:45:26 2013 +0200

    use static helper methods url{En|De}codeUtf8

commit d745ae31e38ca1a098588c4c66a0556a45ef569c
Author: Thomas Koch <th...@ko...>
Date:   Sat Apr 6 12:31:33 2013 +0200

    remove unused variable

commit 07130e1fef9c8e39ab11b2a951f57a44766346eb
Author: Thomas Koch <th...@ko...>
Date:   Thu Mar 14 10:42:13 2013 +0100

    access static members statically, not with this.

commit d8bbd00f94b59a25a18205e767dbfe23e24482ad
Author: Thomas Koch <th...@ko...>
Date:   Thu Mar 14 10:38:32 2013 +0100

    remove some unused java imports

commit 63e6582a52824934ec911fc62caf94231d83e3a5
Author: Thomas Koch <th...@ko...>
Date:   Thu Mar 14 10:29:42 2013 +0100

    remove unused variable
    
    The constructor call is only done to validate the value. So no need
    to assign the object to a then unused variable.
    
    A more involved fix would be to create a JamWikiDatePattern class.

commit 37749db7c35d8ac6ae1af2e9240e8e19621f3f16
Merge: c07fd7e 05b0535
Author: Thomas Koch <th...@ko...>
Date:   Sun Apr 7 22:02:53 2013 +0200

    Merge branch '1.3.x'

commit c07fd7e43a2a0798a42bcce9c4c4892c1ab88935
Merge: bd64921 a19c274
Author: Thomas Koch <th...@ko...>
Date:   Sun Apr 7 21:55:39 2013 +0200

    Merge commit a19c274e3b from branch 1.3.x
    
    with strategy -s recursive -X ours to ignore version number conflicts

-----------------------------------------------------------------------

Summary of changes:
 .../src/main/java/org/jamwiki/WikiBase.java        |    2 +-
 .../main/java/org/jamwiki/db/AnsiQueryHandler.java |    2 +-
 .../src/main/java/org/jamwiki/model/GroupMap.java  |    4 +-
 .../main/java/org/jamwiki/utils/UpgradeUtil.java   |    3 -
 .../src/main/java/org/jamwiki/utils/Utilities.java |   29 ++++++++-----
 .../resources/ApplicationResources_ru.properties   |    6 +-
 jamwiki-war/src/main/webapp/CHANGELOG.txt          |    5 +-
 .../src/main/webapp/WEB-INF/jsp/admin-manage.jsp   |    6 ++-
 .../src/main/webapp/WEB-INF/jsp/register.jsp       |    2 +-
 jamwiki-war/src/main/webapp/WEB-INF/jsp/setup.jsp  |    8 ++--
 .../java/org/jamwiki/servlets/AdminServlet.java    |    4 +-
 .../jamwiki/servlets/RecentChangesFeedServlet.java |   46 +++++++++++---------
 .../java/org/jamwiki/servlets/ServletUtil.java     |    5 --
 .../java/org/jamwiki/servlets/UpgradeServlet.java  |    2 -
 .../org/jamwiki/web/utils/UserPreferencesUtil.java |    1 -
 15 files changed, 64 insertions(+), 61 deletions(-)


hooks/post-receive
-- 
JAMWiki