[commits] Horde branch master updated. 518dcdbd14c23633736315c4b53e5d1b9156cc5e

[Jan Schneider]

The branch "master" has been updated.
The following is a summary of the commits.

from: 34ab61d4cdd01e00ec2de5d864775562565cbf4c

f868f71 [jan] Move all default pages into the Wiki/ namespace (Request #7021).
518dcdb Use rendered page text to highlight search results.

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

commit f868f71f70f3ccbda2ba50dd6ad455fe4b84f799
Author: Jan Schneider <jan at horde.org>
Date:   Mon Sep 26 23:10:02 2011 +0200

    [jan] Move all default pages into the Wiki/ namespace (Request #7021).

 wicked/config/conf.xml                           |    6 +-
 wicked/data/Default/AddingPages                  |    4 -
 wicked/data/Default/HowToUseWiki                 |    5 -
 wicked/data/Default/SandBox                      |    5 -
 wicked/data/Default/Wiki/AddingPages             |    4 +
 wicked/data/Default/Wiki/Home                    |    5 +
 wicked/data/Default/Wiki/Page                    |    1 +
 wicked/data/Default/Wiki/SandBox                 |    5 +
 wicked/data/Default/Wiki/TextFormat              |  438 ++++++++++++++++++++++
 wicked/data/Default/Wiki/Usage                   |    5 +
 wicked/data/Default/WikiHome                     |    5 -
 wicked/data/Default/WikiPage                     |    1 -
 wicked/data/Default/WikiTextFormat               |  438 ----------------------
 wicked/diff.php                                  |    2 +-
 wicked/display.php                               |    6 +-
 wicked/docs/CHANGES                              |    1 +
 wicked/history.php                               |    2 +-
 wicked/lib/Block/Page.php                        |    2 +-
 wicked/lib/Page.php                              |    2 +-
 wicked/lib/Page/DeletePage.php                   |    4 +-
 wicked/lib/Page/StandardPage.php                 |   14 +-
 wicked/lib/Text_Wiki/Render/Xhtml/Image2.php     |    2 +-
 wicked/lib/Wicked.php                            |   11 +-
 wicked/migration/5_wicked_rename_pages.php       |   67 ++++
 wicked/package.xml                               |    2 +
 wicked/themes/default/graphics/HowToUseWiki.png  |  Bin 370 -> 0 bytes
 wicked/themes/default/graphics/WikiUsage.png     |  Bin 0 -> 370 bytes
 wicked/themes/hordeweb/graphics/HowToUseWiki.png |  Bin 454 -> 0 bytes
 wicked/themes/hordeweb/graphics/WikiUsage.png    |  Bin 0 -> 454 bytes
 wicked/view.php                                  |    2 +-
 30 files changed, 556 insertions(+), 483 deletions(-)
 delete mode 100644 wicked/data/Default/AddingPages
 delete mode 100644 wicked/data/Default/HowToUseWiki
 delete mode 100644 wicked/data/Default/SandBox
 create mode 100644 wicked/data/Default/Wiki/AddingPages
 create mode 100644 wicked/data/Default/Wiki/Home
 create mode 100644 wicked/data/Default/Wiki/Page
 create mode 100644 wicked/data/Default/Wiki/SandBox
 create mode 100644 wicked/data/Default/Wiki/TextFormat
 create mode 100644 wicked/data/Default/Wiki/Usage
 delete mode 100644 wicked/data/Default/WikiHome
 delete mode 100644 wicked/data/Default/WikiPage
 delete mode 100644 wicked/data/Default/WikiTextFormat
 create mode 100644 wicked/migration/5_wicked_rename_pages.php
 delete mode 100644 wicked/themes/default/graphics/HowToUseWiki.png
 create mode 100644 wicked/themes/default/graphics/WikiUsage.png
 delete mode 100644 wicked/themes/hordeweb/graphics/HowToUseWiki.png
 create mode 100644 wicked/themes/hordeweb/graphics/WikiUsage.png

http://git.horde.org/horde-git/-/commit/f868f71f70f3ccbda2ba50dd6ad455fe4b84f799

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

commit 518dcdbd14c23633736315c4b53e5d1b9156cc5e
Author: Jan Schneider <jan at horde.org>
Date:   Mon Sep 26 23:10:24 2011 +0200

    Use rendered page text to highlight search results.

 wicked/lib/Page/Search.php |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/518dcdbd14c23633736315c4b53e5d1b9156cc5e