[commits] Horde branch master updated. e607e95f05c27fb52cd988b3b7253a5000c5204f

Wed Feb 26 17:45:14 UTC 2014

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

from: 35fdeb068c9d6795850d9a76ecd8ffcfc0e7e2e3

ee380df Merge branch 'master' into nag_4_2
827f603 Sort
f87d860 [jan] Add recurrence controls to basic view (Request #11545).
c70d1e3 Reorder
6e60d3c Fix rounding when dragging events (Bug #11904).
2a18fbf [jan] Fix padding of drop down lists with scrollbars (Bug #11971).
e607e95 Merge branch 'nag_4_2'

Summary: http://github.com/horde/horde/compare/35fdeb068c9d6795850d9a76ecd8ffcfc0e7e2e3...e607e95f05c27fb52cd988b3b7253a5000c5204f

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

commit ee380df4e680b2913c7bd0ced4d52207f859ab10
Merge: f0aa1dc cef8411
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 4 15:08:54 2013 +0100

    Merge branch 'master' into nag_4_2

 framework/Form/lib/Horde/Form.php |    5 ++++
 turba/config/backends.php         |   35 ++++++++++++++++++++++-----------
 turba/docs/CHANGES                |    1 +
 turba/lib/Driver.php              |   18 ++++++++--------
 turba/lib/Driver/Kolab.php        |   38 +++++++++++++++++++-----------------
 turba/package.xml                 |    2 +
 6 files changed, 60 insertions(+), 39 deletions(-)

http://github.com/horde/horde/commit/ee380df4e680b2913c7bd0ced4d52207f859ab10
http://git.horde.org/horde-git/-/commit/ee380df4e680b2913c7bd0ced4d52207f859ab10

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

commit 827f6037ab521c882957218acadf8b55365c5ab3
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 4 16:00:39 2013 +0100

    Sort

 nag/lib/Ui/VarRenderer/Nag.php |  251 ++++++++++++++++++++--------------------
 1 files changed, 125 insertions(+), 126 deletions(-)

http://github.com/horde/horde/commit/827f6037ab521c882957218acadf8b55365c5ab3
http://git.horde.org/horde-git/-/commit/827f6037ab521c882957218acadf8b55365c5ab3

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

commit f87d86025afb09b5bff96e556ce372aa298daed8
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 4 21:48:28 2013 +0100

    [jan] Add recurrence controls to basic view (Request #11545).

 nag/docs/CHANGES                    |    1 +
 nag/js/calendar.js                  |    7 +
 nag/lib/Form/Task.php               |    1 +
 nag/lib/Form/Type/NagRecurrence.php |  154 ++++++++++++++++++++++++++
 nag/lib/Ui/VarRenderer/Nag.php      |  206 ++++++++++++++++++++++++++++++++++-
 nag/package.xml                     |   10 +-
 nag/themes/default/screen.css       |    2 +-
 7 files changed, 374 insertions(+), 7 deletions(-)
 create mode 100644 nag/lib/Form/Type/NagRecurrence.php

http://github.com/horde/horde/commit/f87d86025afb09b5bff96e556ce372aa298daed8
http://git.horde.org/horde-git/-/commit/f87d86025afb09b5bff96e556ce372aa298daed8

Strict Standards: Declaration of Horde_Rpc_Xmlrpc::request() should be compatible with Horde_Rpc::request($driver, $url, $method, $client, $params = NULL) in /usr/local/horde/web/dev.horde.org/horde-git/framework/Rpc/lib/Horde/Rpc/Xmlrpc.php on line 125

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

commit c70d1e3873b61ad93b34087969e8d956ca9ed5dc
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 4 21:54:08 2013 +0100

    Reorder

 kronolith/templates/dynamic/task.inc |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

http://github.com/horde/horde/commit/c70d1e3873b61ad93b34087969e8d956ca9ed5dc
http://git.horde.org/horde-git/-/commit/c70d1e3873b61ad93b34087969e8d956ca9ed5dc

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

commit 6e60d3cdf4e7fdb9d54e9ddf10fdaefac3e698a6
Author: Jan Schneider <jan at horde.org>
Date:   Thu Dec 5 10:49:41 2013 +0100

    Fix rounding when dragging events (Bug #11904).

 kronolith/js/kronolith.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/6e60d3cdf4e7fdb9d54e9ddf10fdaefac3e698a6
http://git.horde.org/horde-git/-/commit/6e60d3cdf4e7fdb9d54e9ddf10fdaefac3e698a6

Strict Standards: Declaration of Horde_Rpc_Xmlrpc::request() should be compatible with Horde_Rpc::request($driver, $url, $method, $client, $params = NULL) in /usr/local/horde/web/dev.horde.org/horde-git/framework/Rpc/lib/Horde/Rpc/Xmlrpc.php on line 125

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

commit 2a18fbf2170169b6d15f5b7adee6f405eeca3dba
Author: Jan Schneider <jan at horde.org>
Date:   Thu Dec 5 11:26:52 2013 +0100

    [jan] Fix padding of drop down lists with scrollbars (Bug #11971).

 framework/Core/js/keynavlist.js |    4 +++-
 framework/Core/package.xml      |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/2a18fbf2170169b6d15f5b7adee6f405eeca3dba
http://git.horde.org/horde-git/-/commit/2a18fbf2170169b6d15f5b7adee6f405eeca3dba

Strict Standards: Declaration of Horde_Rpc_Xmlrpc::request() should be compatible with Horde_Rpc::request($driver, $url, $method, $client, $params = NULL) in /usr/local/horde/web/dev.horde.org/horde-git/framework/Rpc/lib/Horde/Rpc/Xmlrpc.php on line 125

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

commit e607e95f05c27fb52cd988b3b7253a5000c5204f
Merge: 35fdeb0 2a18fbf
Author: Jan Schneider <jan at horde.org>
Date:   Wed Feb 26 18:44:55 2014 +0100

    Merge branch 'nag_4_2'

    Conflicts:
    	framework/Core/js/keynavlist.js
    	framework/Core/package.xml
    	kronolith/templates/dynamic/task.inc
    	nag/docs/CHANGES
    	nag/lib/Ui/VarRenderer/Nag.php
    	nag/package.xml

 nag/docs/CHANGES                    |    1 +
 nag/js/calendar.js                  |    7 +
 nag/lib/Form/Task.php               |    1 +
 nag/lib/Form/Type/NagRecurrence.php |  154 ++++++++++++
 nag/lib/Ui/VarRenderer/Nag.php      |  441 +++++++++++++++++++++++++----------
 nag/package.xml                     |    8 +-
 nag/themes/default/screen.css       |    2 +-
 7 files changed, 489 insertions(+), 125 deletions(-)

http://github.com/horde/horde/commit/e607e95f05c27fb52cd988b3b7253a5000c5204f
http://git.horde.org/horde-git/-/commit/e607e95f05c27fb52cd988b3b7253a5000c5204f