[commits] Horde branch master updated. 497a3c87284e3c7a0a38f20090207ca1121238ea
Jan Schneider
jan at horde.org
Mon Jun 10 21:54:58 UTC 2013
The branch "master" has been updated.
The following is a summary of the commits.
from: f14d8d64919856389fcd0c7a83f48070fbb07f93
0425e0b Only used in modal forms.
ae67414 Convert Horde_Template templates to Horde_View.
cec3dd3 [jan] Add Most Popular and Least Popular pages to sidebar selection.
1e5e86d [jan] Convert all templates to Horde_View.
543792f Fix rule name.
b3c40d1 Simplify
a2fe892 Fix incorrect caching of pages.
290a10f Use jsonrpc.
4a4f88d [jan] Remove synchronization code.
ea4a18f phpdoc
7e27bdb Prepare release.
7877a00 Toc rule doesn't exist in all renderers.
e8a51ef Always delete unsupported rules.
1d65edd TOCs are not supported in Mediawiki.
497a3c8 [jan] Fix parsing of headings in other than the default rule (Bug #12211).
-----------------------------------------------------------------------
commit 0425e0b23a39277820efa027628a4752dd031dc6
Author: Jan Schneider <jan at horde.org>
Date: Fri Jun 7 14:10:17 2013 +0200
Only used in modal forms.
horde/themes/default/screen.css | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/0425e0b23a39277820efa027628a4752dd031dc6
-----------------------------------------------------------------------
commit ae674140e4fd56bc3f43b9a76374f13e7be4d34d
Author: Jan Schneider <jan at horde.org>
Date: Fri Jun 7 18:57:10 2013 +0200
Convert Horde_Template templates to Horde_View.
wicked/lib/Page/AddPage.php | 26 ++--
wicked/lib/Page/AllPages.php | 24 ++--
wicked/lib/Page/AttachedFiles.php | 39 ++---
wicked/lib/Page/LeastPopular.php | 28 ++--
wicked/lib/Page/MergeOrRename.php | 45 +++----
wicked/lib/Page/MostPopular.php | 24 ++--
wicked/lib/Page/RecentChanges.php | 6 +-
wicked/lib/Page/Search.php | 81 +++++------
wicked/lib/Page/StandardPage.php | 9 +-
wicked/templates/diff/diff.html.php | 7 +
wicked/templates/diff/diff.inc | 7 -
wicked/templates/display/AttachedFiles.html | 160 ---------------------
wicked/templates/display/AttachedFiles.html.php | 157 ++++++++++++++++++++
wicked/templates/display/MergeOrRename.html | 67 ---------
wicked/templates/display/MergeOrRename.html.php | 66 +++++++++
wicked/templates/display/RecentChanges.html | 20 ---
wicked/templates/display/RecentChanges.html.php | 20 +++
wicked/templates/edit/create.inc | 64 +++++----
wicked/templates/pagelist/pagelist.html | 15 --
wicked/templates/pagelist/pagelist.html.php | 18 +++
wicked/templates/pagelist/results_header.html | 16 --
wicked/templates/pagelist/results_header.html.php | 16 ++
22 files changed, 451 insertions(+), 464 deletions(-)
create mode 100644 wicked/templates/diff/diff.html.php
delete mode 100644 wicked/templates/diff/diff.inc
delete mode 100644 wicked/templates/display/AttachedFiles.html
create mode 100644 wicked/templates/display/AttachedFiles.html.php
delete mode 100644 wicked/templates/display/MergeOrRename.html
create mode 100644 wicked/templates/display/MergeOrRename.html.php
delete mode 100644 wicked/templates/display/RecentChanges.html
create mode 100644 wicked/templates/display/RecentChanges.html.php
delete mode 100644 wicked/templates/pagelist/pagelist.html
create mode 100644 wicked/templates/pagelist/pagelist.html.php
delete mode 100644 wicked/templates/pagelist/results_header.html
create mode 100644 wicked/templates/pagelist/results_header.html.php
http://git.horde.org/horde-git/-/commit/ae674140e4fd56bc3f43b9a76374f13e7be4d34d
-----------------------------------------------------------------------
commit cec3dd30911e343af3a229ad536145d4c378e715
Author: Jan Schneider <jan at horde.org>
Date: Fri Jun 7 18:58:13 2013 +0200
[jan] Add Most Popular and Least Popular pages to sidebar selection.
wicked/config/conf.xml | 2 +
wicked/docs/CHANGES | 1 +
wicked/lib/Application.php | 12 +++++---
wicked/package.xml | 33 +++++++++++++---------
wicked/themes/default/graphics/LeastPopular.png | Bin 0 -> 333 bytes
wicked/themes/default/graphics/MostPopular.png | Bin 0 -> 534 bytes
wicked/themes/default/screen.css | 6 ++++
7 files changed, 36 insertions(+), 18 deletions(-)
create mode 100644 wicked/themes/default/graphics/LeastPopular.png
create mode 100644 wicked/themes/default/graphics/MostPopular.png
http://git.horde.org/horde-git/-/commit/cec3dd30911e343af3a229ad536145d4c378e715
-----------------------------------------------------------------------
commit 1e5e86ddcdc38da7b7369a1269dc641477fb2563
Author: Jan Schneider <jan at horde.org>
Date: Mon Jun 10 19:03:20 2013 +0200
[jan] Convert all templates to Horde_View.
wicked/display.php | 2 +-
wicked/docs/CHANGES | 1 +
wicked/history.php | 2 +-
wicked/js/edit.js | 19 +++
wicked/js/history.js | 17 ++
wicked/lib/Page.php | 28 +++-
wicked/lib/Page/AddPage.php | 31 ++--
wicked/lib/Page/AllPages.php | 18 +--
wicked/lib/Page/BackLinks.php | 31 +++-
wicked/lib/Page/EditPage.php | 45 +++++-
wicked/lib/Page/LeastPopular.php | 20 +--
wicked/lib/Page/LikePages.php | 32 +++-
wicked/lib/Page/MostPopular.php | 20 +--
wicked/lib/Page/NewPage.php | 19 +--
wicked/lib/Page/Search.php | 10 +-
wicked/lib/Page/StandardPage.php | 239 ++++++++++++++++++++++++----
wicked/package.xml | 1 +
wicked/preview.php | 6 +-
wicked/templates/display/standard.html.php | 62 +++++++
wicked/templates/display/standard.inc | 130 ---------------
wicked/templates/display/title.html.php | 13 ++
wicked/templates/display/title.inc | 13 --
wicked/templates/edit/create.html.php | 51 ++++++
wicked/templates/edit/create.inc | 54 -------
wicked/templates/edit/new.html.php | 20 +++
wicked/templates/edit/new.inc | 32 ----
wicked/templates/edit/preview.html.php | 3 +
wicked/templates/edit/preview.inc | 3 -
wicked/templates/edit/standard.html.php | 34 ++++
wicked/templates/edit/standard.inc | 50 ------
wicked/templates/history/footer.html.php | 3 +
wicked/templates/history/footer.inc | 2 -
wicked/templates/history/header.html.php | 32 ++++
wicked/templates/history/header.inc | 30 ----
wicked/templates/history/summary.html.php | 26 +++
wicked/templates/history/summary.inc | 45 -----
wicked/templates/pagelist/footer.html.php | 2 +
wicked/templates/pagelist/footer.inc | 2 -
wicked/templates/pagelist/header.html.php | 14 ++
wicked/templates/pagelist/header.inc | 14 --
wicked/templates/pagelist/summary.html.php | 13 ++
wicked/templates/pagelist/summary.inc | 13 --
42 files changed, 687 insertions(+), 515 deletions(-)
create mode 100644 wicked/js/edit.js
create mode 100644 wicked/js/history.js
create mode 100644 wicked/templates/display/standard.html.php
delete mode 100644 wicked/templates/display/standard.inc
create mode 100644 wicked/templates/display/title.html.php
delete mode 100644 wicked/templates/display/title.inc
create mode 100644 wicked/templates/edit/create.html.php
delete mode 100644 wicked/templates/edit/create.inc
create mode 100644 wicked/templates/edit/new.html.php
delete mode 100644 wicked/templates/edit/new.inc
create mode 100644 wicked/templates/edit/preview.html.php
delete mode 100644 wicked/templates/edit/preview.inc
create mode 100644 wicked/templates/edit/standard.html.php
delete mode 100644 wicked/templates/edit/standard.inc
create mode 100644 wicked/templates/history/footer.html.php
delete mode 100644 wicked/templates/history/footer.inc
create mode 100644 wicked/templates/history/header.html.php
delete mode 100644 wicked/templates/history/header.inc
create mode 100644 wicked/templates/history/summary.html.php
delete mode 100644 wicked/templates/history/summary.inc
create mode 100644 wicked/templates/pagelist/footer.html.php
delete mode 100644 wicked/templates/pagelist/footer.inc
create mode 100644 wicked/templates/pagelist/header.html.php
delete mode 100644 wicked/templates/pagelist/header.inc
create mode 100644 wicked/templates/pagelist/summary.html.php
delete mode 100644 wicked/templates/pagelist/summary.inc
http://git.horde.org/horde-git/-/commit/1e5e86ddcdc38da7b7369a1269dc641477fb2563
-----------------------------------------------------------------------
commit 543792f367a5df553a9a55548a9e54e447af7c2c
Author: Jan Schneider <jan at horde.org>
Date: Mon Jun 10 19:03:34 2013 +0200
Fix rule name.
wicked/lib/Page.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/543792f367a5df553a9a55548a9e54e447af7c2c
-----------------------------------------------------------------------
commit b3c40d1fb2b052a63f90149857fed8d8b150d12b
Author: Jan Schneider <jan at horde.org>
Date: Mon Jun 10 19:56:01 2013 +0200
Simplify
wicked/lib/Page.php | 30 +++++++++++++-
wicked/lib/Page/AddPage.php | 23 +++-------
wicked/lib/Page/AllPages.php | 12 +-----
wicked/lib/Page/BackLinks.php | 18 ++------
wicked/lib/Page/LeastPopular.php | 15 ++-----
wicked/lib/Page/LikePages.php | 18 ++------
wicked/lib/Page/MostPopular.php | 15 ++-----
wicked/lib/Page/Search.php | 58 ++++++++------------------
wicked/package.xml | 58 ++++++++++++++-------------
wicked/templates/edit/create.html.php | 4 +-
wicked/templates/pagelist/_page.html.php | 14 ++++++
wicked/templates/pagelist/pagelist.html.php | 18 --------
wicked/templates/pagelist/summary.html.php | 13 ------
13 files changed, 118 insertions(+), 178 deletions(-)
create mode 100644 wicked/templates/pagelist/_page.html.php
delete mode 100644 wicked/templates/pagelist/pagelist.html.php
delete mode 100644 wicked/templates/pagelist/summary.html.php
http://git.horde.org/horde-git/-/commit/b3c40d1fb2b052a63f90149857fed8d8b150d12b
-----------------------------------------------------------------------
commit a2fe892857759a283f2720e3e245c267d2367322
Author: Jan Schneider <jan at horde.org>
Date: Mon Jun 10 22:24:38 2013 +0200
Fix incorrect caching of pages.
wicked/lib/Driver/Sql.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/a2fe892857759a283f2720e3e245c267d2367322
-----------------------------------------------------------------------
commit 290a10fd570ea733eda4e7c5803eec94c0581fd3
Author: Jan Schneider <jan at horde.org>
Date: Mon Jun 10 22:29:04 2013 +0200
Use jsonrpc.
wicked/lib/Sync/Wicked.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/290a10fd570ea733eda4e7c5803eec94c0581fd3
-----------------------------------------------------------------------
commit 4a4f88de11e817ab33a928e1bb1e87f96032ffaa
Author: Jan Schneider <jan at horde.org>
Date: Mon Jun 10 22:40:30 2013 +0200
[jan] Remove synchronization code.
wicked/config/prefs.php | 17 -
wicked/docs/CHANGES | 1 +
wicked/lib/Page/Search.php | 31 ++-
wicked/lib/Page/SyncDiff.php | 139 --------
wicked/lib/Page/SyncPages.php | 395 ---------------------
wicked/lib/Sync.php | 124 -------
wicked/lib/Sync/Wicked.php | 132 -------
wicked/package.xml | 37 +--
wicked/templates/pagelist/results_footer.html.php | 2 +
wicked/templates/pagelist/results_footer.inc | 2 -
wicked/templates/pagelist/search.html.php | 1 +
wicked/templates/pagelist/search.inc | 1 -
wicked/templates/sync/diff.inc | 105 ------
wicked/templates/sync/footer.inc | 1 -
wicked/templates/sync/form.inc | 19 -
wicked/templates/sync/header.inc | 6 -
wicked/templates/sync/list.inc | 84 -----
17 files changed, 32 insertions(+), 1065 deletions(-)
delete mode 100644 wicked/config/prefs.php
delete mode 100644 wicked/lib/Page/SyncDiff.php
delete mode 100644 wicked/lib/Page/SyncPages.php
delete mode 100644 wicked/lib/Sync.php
delete mode 100644 wicked/lib/Sync/Wicked.php
create mode 100644 wicked/templates/pagelist/results_footer.html.php
delete mode 100644 wicked/templates/pagelist/results_footer.inc
create mode 100644 wicked/templates/pagelist/search.html.php
delete mode 100644 wicked/templates/pagelist/search.inc
delete mode 100644 wicked/templates/sync/diff.inc
delete mode 100644 wicked/templates/sync/footer.inc
delete mode 100644 wicked/templates/sync/form.inc
delete mode 100644 wicked/templates/sync/header.inc
delete mode 100644 wicked/templates/sync/list.inc
http://git.horde.org/horde-git/-/commit/4a4f88de11e817ab33a928e1bb1e87f96032ffaa
-----------------------------------------------------------------------
commit ea4a18ff386ca5c7b308ca687c5e51f9a5d25439
Author: Jan Schneider <jan at horde.org>
Date: Mon Jun 10 23:03:59 2013 +0200
phpdoc
wicked/lib/Api.php | 18 +++++++++++++-----
wicked/lib/Application.php | 17 ++++++++++++-----
wicked/lib/Block/Page.php | 14 +++++++++++---
wicked/lib/Driver.php | 13 +++++++++++--
wicked/lib/Driver/Sql.php | 22 +++++++++++++++++-----
wicked/lib/Exception.php | 13 +++++++++++--
wicked/lib/Factory/Driver.php | 11 +++++++++--
wicked/lib/Page.php | 17 +++++++++++++----
wicked/lib/Page/AddPage.php | 21 ++++++++++++++++-----
wicked/lib/Page/AllPages.php | 21 ++++++++++++++++-----
wicked/lib/Page/AttachedFiles.php | 21 ++++++++++++++++-----
wicked/lib/Page/BackLinks.php | 21 ++++++++++++++++-----
wicked/lib/Page/DeletePage.php | 19 +++++++++++++------
wicked/lib/Page/EditPage.php | 20 ++++++++++++++------
wicked/lib/Page/LeastPopular.php | 21 ++++++++++++++++-----
wicked/lib/Page/LikePages.php | 21 ++++++++++++++++-----
wicked/lib/Page/MergeOrRename.php | 19 +++++++++++++++----
wicked/lib/Page/MostPopular.php | 21 ++++++++++++++++-----
wicked/lib/Page/NewPage.php | 19 +++++++++++++------
wicked/lib/Page/RecentChanges.php | 21 ++++++++++++++++-----
wicked/lib/Page/RevertPage.php | 21 ++++++++++++++++-----
wicked/lib/Page/Search.php | 21 ++++++++++++++++-----
wicked/lib/Page/StandardHistoryPage.php | 24 ++++++++++++++++++++----
wicked/lib/Page/StandardPage.php | 21 ++++++++++++++++-----
wicked/lib/Test.php | 17 +++++++++++++----
wicked/lib/Text_Wiki/Render/Rst.php | 3 ---
wicked/lib/Wicked.php | 17 +++++++++++++----
27 files changed, 374 insertions(+), 120 deletions(-)
http://git.horde.org/horde-git/-/commit/ea4a18ff386ca5c7b308ca687c5e51f9a5d25439
-----------------------------------------------------------------------
commit 7e27bdb88facbc3740d04b59765ef4e97a2c6477
Author: Jan Schneider <jan at horde.org>
Date: Mon Jun 10 23:05:17 2013 +0200
Prepare release.
wicked/package.xml | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/7e27bdb88facbc3740d04b59765ef4e97a2c6477
-----------------------------------------------------------------------
commit 7877a005eee15e536aaf5b52926f98204d31be9b
Author: Jan Schneider <jan at horde.org>
Date: Mon Jun 10 23:44:09 2013 +0200
Toc rule doesn't exist in all renderers.
wicked/lib/Page.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/7877a005eee15e536aaf5b52926f98204d31be9b
-----------------------------------------------------------------------
commit e8a51eff365691f3ca00b5f9e1405c65b08914d8
Author: Jan Schneider <jan at horde.org>
Date: Mon Jun 10 23:45:09 2013 +0200
Always delete unsupported rules.
wicked/lib/Page.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/e8a51eff365691f3ca00b5f9e1405c65b08914d8
-----------------------------------------------------------------------
commit 1d65eddb68b8563adee5540e7ab296155d7f07b3
Author: Jan Schneider <jan at horde.org>
Date: Mon Jun 10 23:51:59 2013 +0200
TOCs are not supported in Mediawiki.
wicked/data/Mediawiki/Wiki/TextFormat | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/1d65eddb68b8563adee5540e7ab296155d7f07b3
-----------------------------------------------------------------------
commit 497a3c87284e3c7a0a38f20090207ca1121238ea
Author: Jan Schneider <jan at horde.org>
Date: Mon Jun 10 23:53:13 2013 +0200
[jan] Fix parsing of headings in other than the default rule (Bug #12211).
wicked/docs/CHANGES | 1 +
wicked/lib/Text_Wiki/Parse/Cowiki/Heading2.php | 15 +++++++++++++++
wicked/lib/Text_Wiki/Parse/Creole/Heading2.php | 12 ++++++++++++
wicked/lib/Text_Wiki/Parse/Mediawiki/Heading2.php | 12 ++++++++++++
wicked/lib/Text_Wiki/Parse/Tiki/Heading2.php | 12 ++++++++++++
wicked/package.xml | 12 +++++++++++-
6 files changed, 63 insertions(+), 1 deletions(-)
create mode 100644 wicked/lib/Text_Wiki/Parse/Cowiki/Heading2.php
create mode 100644 wicked/lib/Text_Wiki/Parse/Creole/Heading2.php
create mode 100644 wicked/lib/Text_Wiki/Parse/Mediawiki/Heading2.php
create mode 100644 wicked/lib/Text_Wiki/Parse/Tiki/Heading2.php
http://git.horde.org/horde-git/-/commit/497a3c87284e3c7a0a38f20090207ca1121238ea
More information about the commits
mailing list