[commits] Horde branch develop updated. 7163b53bed7a4081fa2e4cc8e4f4bee683d774ac

Michael M Slusarz slusarz at horde.org
Mon Apr 2 20:00:25 UTC 2012


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

from: 30f8a0a020e2e2f4b03baa0dcdad4513ecbf077e

e844bf0 Another check for bad zip data
544d3ac Merge branch 'master' into develop
ad390ee Merge branch 'develop' of ssh://dev.horde.org/horde/git/horde into develop
257cf70 What we really need to trim is the remnants of tidy alterations
1df8ff1 Merge branch 'master' into develop
7163b53 Merge branch 'develop' of ssh://dev.horde.org/horde/git/horde into develop

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

commit e844bf0dcebbf47dcccdecb0e87e12c68b465d13
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Apr 1 23:22:16 2012 -0600

    Another check for bad zip data

 framework/Compress/lib/Horde/Compress/Zip.php |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

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

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

commit 544d3ac94c1c6410e20ca3283955e5d0ce47b6f5
Merge: a8e14d4 e844bf0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Apr 1 23:23:30 2012 -0600

    Merge branch 'master' into develop

 framework/Compress/lib/Horde/Compress/Zip.php |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/544d3ac94c1c6410e20ca3283955e5d0ce47b6f5

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

commit ad390ee3ba5997cbd78b6b94d9f22aa17e670497
Merge: 544d3ac aa25826
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 2 11:34:26 2012 -0600

    Merge branch 'develop' of ssh://dev.horde.org/horde/git/horde into develop

 framework/Form/lib/Horde/Form/Type.php  |    2 +-
 framework/Rdo/lib/Horde/Rdo/Base.php    |    6 ++-
 framework/Rdo/lib/Horde/Rdo/Factory.php |   81 +++++++++++++++++++++++++++++++
 framework/Rdo/lib/Horde/Rdo/Mapper.php  |   30 +++++++++++-
 sesha/lib/Driver/Sql.php                |   14 ++---
 sesha/stock.php                         |    7 +--
 turba/lib/Turba.php                     |    2 +-
 7 files changed, 126 insertions(+), 16 deletions(-)

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

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

commit 257cf705d1caa2f8f39de54842241cad36e5178c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 2 13:43:13 2012 -0600

    What we really need to trim is the remnants of tidy alterations

 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/257cf705d1caa2f8f39de54842241cad36e5178c

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

commit 1df8ff158ed96d7d25548b56ff47ee363af7821c
Merge: ad390ee 257cf70
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 2 14:00:06 2012 -0600

    Merge branch 'master' into develop
    
    Conflicts:
    	framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php

 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Html.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/1df8ff158ed96d7d25548b56ff47ee363af7821c

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

commit 7163b53bed7a4081fa2e4cc8e4f4bee683d774ac
Merge: 1df8ff1 30f8a0a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 2 14:00:12 2012 -0600

    Merge branch 'develop' of ssh://dev.horde.org/horde/git/horde into develop

 framework/Date/doc/Horde/Date/UPGRADING            |   20 ++
 framework/Date/lib/Horde/Date/Recurrence.php       |   38 ++--
 framework/Date/package.xml                         |   25 ++-
 framework/Db/lib/Horde/Db/Adapter/Base.php         |    2 +-
 kronolith/docs/CHANGES                             |    2 +-
 kronolith/js/kronolith.js                          |  184 +++++++++-----
 kronolith/lib/Ajax/Application.php                 |   37 ++--
 kronolith/lib/Event.php                            |  252 +++++++++---------
 kronolith/lib/Event/Horde.php                      |   11 +-
 kronolith/lib/Kronolith.php                        |    4 +
 kronolith/templates/index/task.inc                 |   58 ++++
 nag/app/controllers/CompleteTask.php               |    8 +-
 nag/app/controllers/SaveTask.php                   |   24 +--
 nag/data.php                                       |   10 +-
 nag/docs/CHANGES                                   |    1 +
 nag/lib/Api.php                                    |  270 +++++--------------
 nag/lib/Driver.php                                 |  210 +++++++++------
 nag/lib/Driver/Kolab.php                           |  278 +++++++++-----------
 nag/lib/Driver/Sql.php                             |  259 ++++++++++++------
 nag/lib/Nag.php                                    |    4 +-
 nag/lib/Task.php                                   |  146 ++++++++--
 nag/migration/3_nag_upgrade_addalarmmethods.php    |    1 +
 nag/migration/4_nag_upgrade_addcolor.php           |    1 +
 nag/migration/7_nag_upgrade_sqlhierarchical.php    |   11 +-
 nag/migration/8_nag_upgrade_sqlnghierarchical.php  |   11 +-
 nag/migration/9_nag_upgrade_recurrence.php         |   44 +++
 nag/package.xml                                    |    7 +-
 nag/test/Nag/TestCase.php                          |    1 +
 nag/test/Nag/Unit/Driver/Base.php                  |   85 +++++--
 nag/test/Nag/Unit/Form/Task/Sql/Base.php           |   10 +-
 nag/test/Nag/Unit/Form/Task/Sql/Pdo/SqliteTest.php |    6 -
 31 files changed, 1151 insertions(+), 869 deletions(-)

http://git.horde.org/horde-git/-/commit/7163b53bed7a4081fa2e4cc8e4f4bee683d774ac




More information about the commits mailing list