[commits] Horde branch develop updated. 834be08cfd29bcbbbd750a36456b2febbcdfb68b

[Jan Schneider]

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

from: 2abfbf22091a5771c9432ec0b5b08cc6b45aeb74

36dd769 Only show title for admins if really running from CLI.
d92bcb9 [jan] Don't show location of private events (Bug #11235).
834be08 Merge branch 'master' into develop

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

commit 36dd7694e2ae57b4e40177e43bf94c095f6f7c7b
Author: Jan Schneider <jan at horde.org>
Date:   Thu Jul 5 13:18:45 2012 +0200

    Only show title for admins if really running from CLI.

 kronolith/lib/Event.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/36dd7694e2ae57b4e40177e43bf94c095f6f7c7b

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

commit d92bcb9b7f72e14eff0e3fbe772f6910d225e7ed
Author: Jan Schneider <jan at horde.org>
Date:   Thu Jul 5 14:47:38 2012 +0200

    [jan] Don't show location of private events (Bug #11235).

 kronolith/data.php                             |    8 +-
 kronolith/docs/CHANGES                         |    1 +
 kronolith/feed/index.php                       |   22 +++--
 kronolith/lib/Block/Month.php                  |    2 +-
 kronolith/lib/Block/Monthlist.php              |    4 +-
 kronolith/lib/Block/Prevmonthlist.php          |    4 +-
 kronolith/lib/Event.php                        |  121 ++++++++++++++++--------
 kronolith/lib/View/Day.php                     |    8 +-
 kronolith/lib/View/Event.php                   |    2 +-
 kronolith/lib/View/Month.php                   |    4 +-
 kronolith/lib/View/Week.php                    |    8 +-
 kronolith/lib/View/Year.php                    |    2 +-
 kronolith/package.xml                          |    2 +
 kronolith/templates/alarm/mail.html.php        |    6 +-
 kronolith/templates/alarm/mail.plain.php       |    4 +-
 kronolith/templates/search/event_summaries.inc |    2 +-
 kronolith/templates/view/view.inc              |    6 +-
 17 files changed, 130 insertions(+), 76 deletions(-)

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

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

commit 834be08cfd29bcbbbd750a36456b2febbcdfb68b
Merge: 2abfbf2 d92bcb9
Author: Jan Schneider <jan at horde.org>
Date:   Thu Jul 5 14:59:41 2012 +0200

    Merge branch 'master' into develop
    
    Conflicts:
    	kronolith/data.php
    	kronolith/feed/index.php
    	kronolith/lib/Event.php
    	kronolith/package.xml

 kronolith/docs/CHANGES                         |    1 +
 kronolith/feed/index.php                       |   16 ++-
 kronolith/lib/Block/Month.php                  |    2 +-
 kronolith/lib/Block/Monthlist.php              |    4 +-
 kronolith/lib/Block/Prevmonthlist.php          |    4 +-
 kronolith/lib/Event.php                        |  166 +++++++++++++++---------
 kronolith/lib/View/Day.php                     |    8 +-
 kronolith/lib/View/Event.php                   |    2 +-
 kronolith/lib/View/Month.php                   |    4 +-
 kronolith/lib/View/Week.php                    |    8 +-
 kronolith/lib/View/Year.php                    |    2 +-
 kronolith/package.xml                          |   33 +++++-
 kronolith/templates/alarm/mail.html.php        |    6 +-
 kronolith/templates/alarm/mail.plain.php       |    4 +-
 kronolith/templates/search/event_summaries.inc |    2 +-
 kronolith/templates/view/view.inc              |    6 +-
 16 files changed, 176 insertions(+), 92 deletions(-)

http://git.horde.org/horde-git/-/commit/834be08cfd29bcbbbd750a36456b2febbcdfb68b