[commits] Horde branch develop updated. 562e555ab52f8ce59cd4c9dd8f5eae79b22611e3

Michael J. Rubinsky mrubinsk at horde.org
Tue Dec 20 01:54:22 UTC 2011


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

from: 33c9d0036ff406d3dbc5676fbd991d6bafd4166f

c9274cd [mms] Fix merging config data (Bug #10381).
2f5b795 Speedup via common shortcut.
a7347b4 Fix spelling and tweak api docs for modifyDate(). I still find this a bit opaque; may want to rename the method and/or some of its parameters still.
97fdc64 [gwr] Fixed datatype for birthday and anniversary contact attributes.
227307a Released Horde_Kolab_Format-1.1.1
bbde38c Development mode for Horde_Kolab_Format-1.1.2
3876d8c Remove stray file, damn.
619ac41 Move TODO.
e401aa6 CS
ffc20cd rename script.
a0456dc Prepare for initial alpha.
a6b6897 Ensure the log option gets removed if the logger package is missing.
7294366 Prepare for release. Fixed dependencies, added translation task.
c4f0aec Released Horde_Kolab_Cli-1.0.0alpha1
9e11969 Development mode for Horde_Kolab_Cli-1.0.0alpha2
5111336 I thought there was a bug, but the test runs fine.
cf189ac0 Don't show local time if obviously incorrect.
caf0f0c Simplify, cancel default link behavior.
74c8a31 Style
8109fb9 Port toVcard() test.
904bac6 Fix setting country.
916a509 Trim attribute, chunk_split() adds a trailing delimiter.
23f9852 Add CRs to expected strings.
cd33af2 Fix test.
ad25ca8 Catch empty GEO attributes.
b3b168a Only load required classes.
0fb8267 Turba is ASL not GPL.
4b176e4 Ansel is GPL not ASL.
7ea75dc Fix license URLs.
ba67c17 Catch exceptions from Horde_Date ctor (Bug #10557).
8eaf5b3 [jan] Fix importing vCards with empty X-ANNIVERSARY attributes (Bug #10557).
aca6c8a [jan] Allow to pass multiple parameter values in setAttribute() (Bug #7248).
8e9d13c [jan] Catch exceptions when changing or retrieving objects from the applications.
0eb3c9d [jan] Set VOICE parameter when exporting phone numbers to vCard (Request #10349).
ee763dd Update file list.
d6406f3 phpdoc typo
5fad00e Toggle the spinner while waiting for the new location
11a6c50 Tweak some search element labels
7e88027 fix comment
3ff9ebc Hide searchbar when switching views
e8eb2e9 Show loading image when refreshing a search view
ce4e2a7 [mms] Fix editing date search elements.
a17107e [mms] Fix attachment detection search filter.
21406c5 Ensure we can actually create the stream before passing it to Horde_Log_Logger
dac4a94 Spacing/comments etc...
9ee536d Better support for Android provisioning.
8d957c2 CHANGES
562e555 Merge branch 'master' into develop

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

commit c9274cd01b407ed251d4a130943ef146e71278d1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Dec 15 23:22:57 2011 -0700

    [mms] Fix merging config data (Bug #10381).

 framework/Core/lib/Horde/Registry.php            |   28 +++++-
 framework/Core/package.xml                       |    2 +-
 framework/Core/test/Horde/Core/RegistryTest.php  |  111 ++++++++++++++++++++++
 framework/Core/test/Horde/Core/Stub/Registry.php |   45 +++++++++
 4 files changed, 184 insertions(+), 2 deletions(-)
 create mode 100644 framework/Core/test/Horde/Core/RegistryTest.php
 create mode 100644 framework/Core/test/Horde/Core/Stub/Registry.php

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

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

commit 2f5b795f67a9c6be26f14bd189037064e3ff211d
Author: Jan Schneider <jan at horde.org>
Date:   Wed Dec 14 15:29:59 2011 +0100

    Speedup via common shortcut.

 framework/Util/lib/Horde/String.php |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/2f5b795f67a9c6be26f14bd189037064e3ff211d

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

commit a7347b4408611b8de100c0d218e359aa247a2a37
Author: Chuck Hagenbuch <chuck at horde.org>
Date:   Thu Dec 15 21:12:33 2011 -0500

    Fix spelling and tweak api docs for modifyDate(). I still find this a bit
    opaque; may want to rename the method and/or some of its parameters still.

 framework/Db/lib/Horde/Db/Adapter/Base/Schema.php       |    9 ++++-----
 framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php |    9 ++++-----
 framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php     |   12 ++++++------
 3 files changed, 14 insertions(+), 16 deletions(-)

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

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

commit 97fdc644e267bbef8870b16b69d869d41b5e9a43
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Dec 16 22:29:23 2011 +0100

    [gwr] Fixed datatype for birthday and anniversary contact attributes.

 .../Kolab_Format/Horde_Kolab_Format-1.1.1dev201112120653.tgz      |  Bin 0 -> 57932 bytes
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Contact.php     |    4 ++--
 framework/Kolab_Format/package.xml                                |    2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 framework/Kolab_Format/Horde_Kolab_Format-1.1.1dev201112120653.tgz

http://git.horde.org/horde-git/-/commit/97fdc644e267bbef8870b16b69d869d41b5e9a43

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

commit 227307aef218d19e27c0e501235236d4a16acfb8
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Dec 16 22:34:39 2011 +0100

    Released Horde_Kolab_Format-1.1.1

 framework/Kolab_Format/package.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/227307aef218d19e27c0e501235236d4a16acfb8

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

commit bbde38c0c1c07ecee78557d94e319a38ba1ff2bb
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Dec 16 22:34:39 2011 +0100

    Development mode for Horde_Kolab_Format-1.1.2

 framework/Kolab_Format/package.xml |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

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

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

commit 3876d8c0e0a0ee26c02057604a5cd87a1be9bb38
Author: Gunnar Wrobel <p at rdus.de>
Date:   Sat Dec 17 00:15:05 2011 +0100

    Remove stray file, damn.

 .../Kolab_Format/Horde_Kolab_Format-1.1.1dev201112120653.tgz      |  Bin 57932 -> 0 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 framework/Kolab_Format/Horde_Kolab_Format-1.1.1dev201112120653.tgz

http://git.horde.org/horde-git/-/commit/3876d8c0e0a0ee26c02057604a5cd87a1be9bb38

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

commit 619ac4125726a5f3226ffefc3bff5ce5f90bc8e5
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Dec 16 23:02:30 2011 +0100

    Move TODO.

 framework/Kolab_Cli/doc/Horde/Kolab/Cli/TODO |   11 +++++++++++
 framework/Kolab_Cli/doc/TODO                 |   11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 framework/Kolab_Cli/doc/Horde/Kolab/Cli/TODO
 delete mode 100644 framework/Kolab_Cli/doc/TODO

http://git.horde.org/horde-git/-/commit/619ac4125726a5f3226ffefc3bff5ce5f90bc8e5

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

commit e401aa60ce262106e0b31a443e29a3d0efc4db54
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Dec 16 23:10:45 2011 +0100

    CS

 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Base.php   |    5 ++---
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Data.php   |    6 +++---
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Folder.php |    2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/List.php   |    2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

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

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

commit ffc20cd83afa8c72edda98e0fabc530c86d70803
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Dec 16 23:15:07 2011 +0100

    rename script.

 framework/Kolab_Cli/bin/horde-kolab-cli |    8 ++++++++
 framework/Kolab_Cli/bin/klb             |    8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100755 framework/Kolab_Cli/bin/horde-kolab-cli
 delete mode 100755 framework/Kolab_Cli/bin/klb

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

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

commit a0456dca1a172d95caee6e792856719475cf3592
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Dec 16 23:15:43 2011 +0100

    Prepare for initial alpha.

 framework/Kolab_Cli/package.xml |   61 ++++++++++++++++----------------------
 1 files changed, 26 insertions(+), 35 deletions(-)

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

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

commit a6b689734588ffcc5447d6d19ec7a71e406fc5a0
Author: Gunnar Wrobel <p at rdus.de>
Date:   Sat Dec 17 00:09:40 2011 +0100

    Ensure the log option gets removed if the logger package is missing.

 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Base.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

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

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

commit 7294366ee707c7e66ef2b2f50e723676939ab076
Author: Gunnar Wrobel <p at rdus.de>
Date:   Sat Dec 17 00:10:50 2011 +0100

    Prepare for release. Fixed dependencies, added translation task.

 framework/Kolab_Cli/package.xml |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/7294366ee707c7e66ef2b2f50e723676939ab076

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

commit c4f0aeca9b6f2a2bcbed55d0d969b7918b1152cf
Author: Gunnar Wrobel <p at rdus.de>
Date:   Sat Dec 17 00:26:02 2011 +0100

    Released Horde_Kolab_Cli-1.0.0alpha1

 framework/Kolab_Cli/package.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

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

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

commit 9e11969763d90c4391e842183d0dfef3070d4179
Author: Gunnar Wrobel <p at rdus.de>
Date:   Sat Dec 17 00:26:03 2011 +0100

    Development mode for Horde_Kolab_Cli-1.0.0alpha2

 framework/Kolab_Cli/package.xml |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/9e11969763d90c4391e842183d0dfef3070d4179

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

commit 5111336569a13f4e07ae0337d9cfbb936f41ca9a
Author: Jan Schneider <jan at horde.org>
Date:   Sun Dec 18 16:14:49 2011 +0100

    I thought there was a bug, but the test runs fine.

 framework/Vfs/test/Horde/Vfs/FileTest.php |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/5111336569a13f4e07ae0337d9cfbb936f41ca9a

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

commit cf189ac05a0bf5443999036ae1b62650e41447ef
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 08:25:55 2011 +0100

    Don't show local time if obviously incorrect.

 horde/lib/Block/Weather.php |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

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

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

commit caf0f0c776d9b2f12587a605ddd8060dd9387820
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 08:30:49 2011 +0100

    Simplify, cancel default link behavior.

 .../lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter.php    |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

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

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

commit 74c8a31773e9bcb4b4c7f0a3e96b60d1109530c2
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 08:47:16 2011 +0100

    Style

 horde/lib/Block/Weather.php     |   21 ++++++++++-----------
 horde/themes/default/screen.css |    9 +++++++++
 2 files changed, 19 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/74c8a31773e9bcb4b4c7f0a3e96b60d1109530c2

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

commit 8109fb9eda52acef991120432b1293d14d0fd799
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 11:03:42 2011 +0100

    Port toVcard() test.

 turba/test/Turba/ToDo/az.png         |  Bin 117 -> 0 bytes
 turba/test/Turba/ToDo/tovcard.phpt   |  143 --------------------------
 turba/test/Turba/Unit/DriverTest.php |  185 ++++++++++++++++++++++++++++++++++
 turba/test/Turba/fixtures/az.png     |  Bin 0 -> 117 bytes
 4 files changed, 185 insertions(+), 143 deletions(-)
 delete mode 100644 turba/test/Turba/ToDo/az.png
 delete mode 100644 turba/test/Turba/ToDo/tovcard.phpt
 create mode 100644 turba/test/Turba/Unit/DriverTest.php
 create mode 100644 turba/test/Turba/fixtures/az.png

http://git.horde.org/horde-git/-/commit/8109fb9eda52acef991120432b1293d14d0fd799

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

commit 904bac6e8bd79473209cb369f6919e021c86693b
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 11:06:53 2011 +0100

    Fix setting country.

 turba/test/Turba/Unit/DriverTest.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/904bac6e8bd79473209cb369f6919e021c86693b

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

commit 916a5093a0c1c67dc2c20ea8776125fbed0b7b97
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 11:12:43 2011 +0100

    Trim attribute, chunk_split() adds a trailing delimiter.

 framework/Icalendar/lib/Horde/Icalendar.php |    2 +-
 framework/Icalendar/package.xml             |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/916a5093a0c1c67dc2c20ea8776125fbed0b7b97

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

commit 23f985292444a688d1ced6f3e1019b77c377db2d
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 11:15:31 2011 +0100

    Add CRs to expected strings.

 turba/test/Turba/Unit/DriverTest.php |  162 +++++++++++++++++-----------------
 1 files changed, 81 insertions(+), 81 deletions(-)

http://git.horde.org/horde-git/-/commit/23f985292444a688d1ced6f3e1019b77c377db2d

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

commit cd33af2407b96860ceeec1f92faea4278ed11acb
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 11:16:36 2011 +0100

    Fix test.

 turba/test/Turba/Unit/DriverTest.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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

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

commit ad25ca882c8a3e9021ff0abad5722ec8cf9e8727
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 13:31:19 2011 +0100

    Catch empty GEO attributes.

 framework/Icalendar/lib/Horde/Icalendar.php |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

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

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

commit b3b168a82fedf1cc13567dd96de0757b79c75b05
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 14:10:32 2011 +0100

    Only load required classes.

 turba/test/Turba/Autoload.php                       |    7 -------
 turba/test/Turba/TestCase.php                       |    8 ++++++--
 turba/test/Turba/Unit/Driver/Base.php               |    5 +++++
 turba/test/Turba/Unit/Driver/KolabTest.php          |    5 ++---
 turba/test/Turba/Unit/Driver/Sql/Base.php           |    5 +++++
 turba/test/Turba/Unit/Driver/Sql/Pdo/SqliteTest.php |    2 +-
 turba/test/Turba/Unit/Turba/Base.php                |    5 +++++
 turba/test/Turba/Unit/Turba/KolabTest.php           |    2 +-
 turba/test/Turba/Unit/Turba/Sql/Base.php            |    8 +++++++-
 turba/test/Turba/Unit/Turba/Sql/Pdo/SqliteTest.php  |    2 +-
 10 files changed, 33 insertions(+), 16 deletions(-)

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

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

commit 0fb826726a0f9c58db81919d57b29e09c22c95d0
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 14:16:37 2011 +0100

    Turba is ASL not GPL.

 turba/lib/Data/Ldif.php                               |    4 ++--
 turba/lib/Test.php                                    |    4 ++--
 turba/migration/4_turba_upgrade_sqlhierarchical.php   |    8 ++++----
 turba/migration/5_turba_upgrade_sqlnghierarchical.php |    8 ++++----
 turba/migration/6_turba_upgrade_updateschema.php      |    8 ++++----
 turba/test/Turba/ToDo/KolabTestBase.php               |    8 ++++----
 6 files changed, 20 insertions(+), 20 deletions(-)

http://git.horde.org/horde-git/-/commit/0fb826726a0f9c58db81919d57b29e09c22c95d0

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

commit 4b176e41694e68f829977bb9c39e6459298ee652
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 14:21:17 2011 +0100

    Ansel is GPL not ASL.

 ansel/test/Ansel/AllTests.php |    8 ++++----
 ansel/test/Ansel/Autoload.php |    2 +-
 ansel/test/Ansel/TestCase.php |    8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

http://git.horde.org/horde-git/-/commit/4b176e41694e68f829977bb9c39e6459298ee652

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

commit 7ea75dcacaaf0796dd3ca46691610a79f54b3746
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 14:22:14 2011 +0100

    Fix license URLs.

 ingo/bin/ingo-convert-prefs-to-sql                    |    2 +-
 ingo/blacklist.php                                    |    2 +-
 ingo/filters.php                                      |    2 +-
 ingo/forward.php                                      |    2 +-
 ingo/index.php                                        |    2 +-
 ingo/lib/Api.php                                      |    2 +-
 ingo/lib/Application.php                              |    2 +-
 ingo/lib/Block/Overview.php                           |    2 +-
 ingo/lib/Exception.php                                |    2 +-
 ingo/lib/Exception/Pear.php                           |    2 +-
 ingo/lib/Ingo.php                                     |    2 +-
 ingo/lib/LoginTasks/SystemTask/Upgrade.php            |    4 +-
 ingo/lib/Script.php                                   |    2 +-
 ingo/lib/Script/Imap.php                              |    4 +-
 ingo/lib/Script/Imap/Api.php                          |    4 +-
 ingo/lib/Script/Imap/Live.php                         |    2 +-
 ingo/lib/Script/Maildrop.php                          |    2 +-
 ingo/lib/Script/Maildrop/Comment.php                  |    2 +-
 ingo/lib/Script/Maildrop/Recipe.php                   |    2 +-
 ingo/lib/Script/Maildrop/Variable.php                 |    2 +-
 ingo/lib/Script/Procmail.php                          |    2 +-
 ingo/lib/Script/Procmail/Comment.php                  |    2 +-
 ingo/lib/Script/Procmail/Recipe.php                   |    2 +-
 ingo/lib/Script/Procmail/Variable.php                 |    2 +-
 ingo/lib/Script/Sieve.php                             |    2 +-
 ingo/lib/Script/Sieve/Action.php                      |    2 +-
 ingo/lib/Script/Sieve/Action/Addflag.php              |    2 +-
 ingo/lib/Script/Sieve/Action/Discard.php              |    2 +-
 ingo/lib/Script/Sieve/Action/Fileinto.php             |    2 +-
 ingo/lib/Script/Sieve/Action/Flag.php                 |    2 +-
 ingo/lib/Script/Sieve/Action/Keep.php                 |    2 +-
 ingo/lib/Script/Sieve/Action/Notify.php               |    2 +-
 ingo/lib/Script/Sieve/Action/Redirect.php             |    2 +-
 ingo/lib/Script/Sieve/Action/Reject.php               |    2 +-
 ingo/lib/Script/Sieve/Action/Removeflag.php           |    2 +-
 ingo/lib/Script/Sieve/Action/Stop.php                 |    2 +-
 ingo/lib/Script/Sieve/Action/Vacation.php             |    2 +-
 ingo/lib/Script/Sieve/Comment.php                     |    2 +-
 ingo/lib/Script/Sieve/Else.php                        |    2 +-
 ingo/lib/Script/Sieve/Elsif.php                       |    2 +-
 ingo/lib/Script/Sieve/If.php                          |    2 +-
 ingo/lib/Script/Sieve/Test.php                        |    2 +-
 ingo/lib/Script/Sieve/Test/Address.php                |    2 +-
 ingo/lib/Script/Sieve/Test/Allof.php                  |    2 +-
 ingo/lib/Script/Sieve/Test/Anyof.php                  |    2 +-
 ingo/lib/Script/Sieve/Test/Body.php                   |    2 +-
 ingo/lib/Script/Sieve/Test/Exists.php                 |    2 +-
 ingo/lib/Script/Sieve/Test/False.php                  |    2 +-
 ingo/lib/Script/Sieve/Test/Header.php                 |    2 +-
 ingo/lib/Script/Sieve/Test/Not.php                    |    2 +-
 ingo/lib/Script/Sieve/Test/Relational.php             |    2 +-
 ingo/lib/Script/Sieve/Test/Size.php                   |    2 +-
 ingo/lib/Script/Sieve/Test/True.php                   |    2 +-
 ingo/lib/Storage.php                                  |    2 +-
 ingo/lib/Storage/Blacklist.php                        |    2 +-
 ingo/lib/Storage/Filters.php                          |    2 +-
 ingo/lib/Storage/Filters/Sql.php                      |    2 +-
 ingo/lib/Storage/Forward.php                          |    2 +-
 ingo/lib/Storage/Mock.php                             |    2 +-
 ingo/lib/Storage/Prefs.php                            |    2 +-
 ingo/lib/Storage/Rule.php                             |    2 +-
 ingo/lib/Storage/Spam.php                             |    2 +-
 ingo/lib/Storage/Sql.php                              |    2 +-
 ingo/lib/Storage/Vacation.php                         |    2 +-
 ingo/lib/Storage/VacationTest.php                     |    2 +-
 ingo/lib/Storage/Whitelist.php                        |    2 +-
 ingo/lib/Transport.php                                |    2 +-
 ingo/lib/Transport/Ldap.php                           |    2 +-
 ingo/lib/Transport/Null.php                           |    2 +-
 ingo/lib/Transport/Sivtest.php                        |    2 +-
 ingo/lib/Transport/Timsieved.php                      |    2 +-
 ingo/lib/Transport/Vfs.php                            |    2 +-
 ingo/lib/Ui/VarRenderer/Ingo.php                      |    2 +-
 ingo/lib/tests/MaildropTest.php                       |    2 +-
 ingo/lib/tests/ProcmailTest.php                       |    2 +-
 ingo/lib/tests/ScriptTest.php                         |    2 +-
 ingo/lib/tests/SieveTest.php                          |    2 +-
 ingo/migration/1_ingo_base_tables.php                 |    4 +-
 ingo/migration/2_ingo_upgrade_autoincrement.php       |    4 +-
 ingo/migration/3_ingo_upgrade_sqlng.php               |    4 +-
 ingo/rule.php                                         |    2 +-
 ingo/script.php                                       |    2 +-
 ingo/spam.php                                         |    2 +-
 ingo/vacation.php                                     |    2 +-
 ingo/whitelist.php                                    |    2 +-
 mnemo/bin/mnemo-convert-to-utf8                       |    2 +-
 mnemo/bin/mnemo-import-text-note                      |    2 +-
 mnemo/data.php                                        |    2 +-
 mnemo/index.php                                       |    2 +-
 mnemo/lib/Ajax/Application.php                        |    4 +-
 mnemo/lib/Api.php                                     |    2 +-
 mnemo/lib/Application.php                             |    2 +-
 mnemo/lib/Driver.php                                  |    2 +-
 mnemo/lib/Driver/Kolab.php                            |    2 +-
 mnemo/lib/Driver/Sql.php                              |    2 +-
 mnemo/lib/Exception.php                               |    2 +-
 mnemo/lib/Factory/Driver.php                          |    2 +-
 mnemo/lib/Factory/Notepads.php                        |    6 ++--
 mnemo/lib/Form/CreateNotepad.php                      |    2 +-
 mnemo/lib/Form/DeleteNotepad.php                      |    2 +-
 mnemo/lib/Form/EditNotepad.php                        |    2 +-
 mnemo/lib/Mnemo.php                                   |    2 +-
 mnemo/lib/Notepads/Base.php                           |    6 ++--
 mnemo/lib/Notepads/Default.php                        |    6 ++--
 mnemo/lib/Notepads/Kolab.php                          |    6 ++--
 mnemo/list.php                                        |    2 +-
 mnemo/memo.php                                        |    2 +-
 mnemo/migration/1_mnemo_base_tables.php               |    4 +-
 mnemo/migration/2_mnemo_upgrade_autoincrement.php     |    4 +-
 mnemo/migration/3_mnemo_upgrade_sqlng.php             |    4 +-
 mnemo/note/pdf.php                                    |    2 +-
 mnemo/notepads/create.php                             |    2 +-
 mnemo/notepads/delete.php                             |    2 +-
 mnemo/notepads/edit.php                               |    2 +-
 mnemo/notepads/index.php                              |    2 +-
 mnemo/notes/index.php                                 |    2 +-
 mnemo/package.xml                                     |   22 ++++++++--------
 mnemo/search.php                                      |    2 +-
 mnemo/test/Mnemo/AllTests.php                         |    6 ++--
 mnemo/test/Mnemo/Autoload.php                         |    2 +-
 mnemo/test/Mnemo/TestCase.php                         |    6 ++--
 mnemo/test/Mnemo/Unit/Driver/KolabTest.php            |    6 ++--
 mnemo/test/Mnemo/Unit/Factory/DriverTest.php          |    6 ++--
 mnemo/test/Mnemo/Unit/Mnemo/Base.php                  |    6 ++--
 mnemo/test/Mnemo/Unit/Mnemo/KolabTest.php             |    6 ++--
 mnemo/test/Mnemo/Unit/Mnemo/Sql/Base.php              |    6 ++--
 mnemo/test/Mnemo/Unit/Mnemo/Sql/Pdo/SqliteTest.php    |    6 ++--
 mnemo/view.php                                        |    2 +-
 turba/add.php                                         |    2 +-
 turba/addressbooks/create.php                         |    2 +-
 turba/addressbooks/delete.php                         |    2 +-
 turba/addressbooks/edit.php                           |    2 +-
 turba/addressbooks/index.php                          |    2 +-
 turba/bin/turba-import-squirrelmail-file-abook        |    2 +-
 turba/bin/turba-import-squirrelmail-sql-abook         |    2 +-
 turba/bin/turba-import-vcards                         |    2 +-
 turba/bin/turba-public-to-horde-share                 |    2 +-
 turba/browse.php                                      |    2 +-
 turba/contact.php                                     |    2 +-
 turba/data.php                                        |    2 +-
 turba/delete.php                                      |    4 +-
 turba/deletefile.php                                  |    2 +-
 turba/edit.php                                        |    2 +-
 turba/index.php                                       |    2 +-
 turba/js/columnprefs.js                               |    2 +-
 turba/js/search.js                                    |    2 +-
 turba/lib/Api.php                                     |    4 +-
 turba/lib/Block/Minisearch.php                        |    2 +-
 turba/lib/Data/Ldif.php                               |    2 +-
 turba/lib/Driver.php                                  |    4 +-
 turba/lib/Driver/Facebook.php                         |    4 +-
 turba/lib/Driver/Favourites.php                       |    4 +-
 turba/lib/Driver/Group.php                            |    4 +-
 turba/lib/Driver/Imsp.php                             |    4 +-
 turba/lib/Driver/Kolab.php                            |    4 +-
 turba/lib/Driver/Ldap.php                             |    4 +-
 turba/lib/Driver/Prefs.php                            |    4 +-
 turba/lib/Driver/Share.php                            |    4 +-
 turba/lib/Driver/Sql.php                              |    4 +-
 turba/lib/Driver/Vbook.php                            |    4 +-
 turba/lib/Exception.php                               |    4 +-
 turba/lib/Form/CreateAddressBook.php                  |    2 +-
 turba/lib/Form/DeleteAddressBook.php                  |    2 +-
 turba/lib/Form/EditAddressBook.php                    |    2 +-
 turba/lib/List.php                                    |    4 +-
 turba/lib/LoginTasks/SystemTask/Upgrade.php           |    4 +-
 turba/lib/Test.php                                    |    2 +-
 turba/lib/View/Browse.php                             |    2 +-
 turba/lib/View/Duplicates.php                         |    2 +-
 turba/merge.php                                       |    2 +-
 turba/migration/1_turba_base_tables.php               |    4 +-
 turba/migration/2_turba_upgrade_autoincrement.php     |    4 +-
 turba/migration/3_turba_upgrade_sqlng.php             |    4 +-
 turba/migration/4_turba_upgrade_sqlhierarchical.php   |    6 ++--
 turba/migration/5_turba_upgrade_sqlnghierarchical.php |    6 ++--
 turba/migration/6_turba_upgrade_updateschema.php      |    2 +-
 turba/minisearch.php                                  |    2 +-
 turba/search.php                                      |    2 +-
 turba/test/Turba/ToDo/KolabTestBase.php               |    2 +-
 turba/vcard.php                                       |    2 +-
 turba/view.php                                        |    2 +-
 181 files changed, 248 insertions(+), 248 deletions(-)

http://git.horde.org/horde-git/-/commit/7ea75dcacaaf0796dd3ca46691610a79f54b3746

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

commit ba67c17595c52a2354256116511cf0d13f11665b
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 14:29:31 2011 +0100

    Catch exceptions from Horde_Date ctor (Bug #10557).

 framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

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

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

commit 8eaf5b308394e04921611c6eed9b6ac4ad345d78
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 14:36:36 2011 +0100

    [jan] Fix importing vCards with empty X-ANNIVERSARY attributes (Bug #10557).

 turba/docs/CHANGES   |    1 +
 turba/lib/Driver.php |    6 +++++-
 turba/package.xml    |    2 ++
 3 files changed, 8 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/8eaf5b308394e04921611c6eed9b6ac4ad345d78

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

commit aca6c8a4e8932ab907c3929001391056bc3d52df
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 15:27:44 2011 +0100

    [jan] Allow to pass multiple parameter values in setAttribute() (Bug #7248).

 framework/Icalendar/lib/Horde/Icalendar.php |   44 +++++++++++++++-----------
 framework/Icalendar/package.xml             |   10 ++++--
 2 files changed, 31 insertions(+), 23 deletions(-)

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

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

commit 8e9d13cd2e17a58fa6e32b2ece84daccf4e32760
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 15:29:09 2011 +0100

    [jan] Catch exceptions when changing or retrieving objects from the applications.

 framework/SyncMl/lib/Horde/SyncMl/Backend/Horde.php |   40 +++++++++++-------
 framework/SyncMl/package.xml                        |    4 +-
 2 files changed, 26 insertions(+), 18 deletions(-)

http://git.horde.org/horde-git/-/commit/8e9d13cd2e17a58fa6e32b2ece84daccf4e32760

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

commit 0eb3c9de6cb4577018a731428fce11fb2beb52ea
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 15:32:34 2011 +0100

    [jan] Set VOICE parameter when exporting phone numbers to vCard (Request #10349).

 turba/docs/CHANGES                   |    2 +
 turba/lib/Driver.php                 |   42 ++++++++++++++++++---------------
 turba/package.xml                    |    4 ++-
 turba/test/Turba/Unit/DriverTest.php |   18 +++++++-------
 4 files changed, 37 insertions(+), 29 deletions(-)

http://git.horde.org/horde-git/-/commit/0eb3c9de6cb4577018a731428fce11fb2beb52ea

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

commit ee763dd3d5b0d93ca313bfaf9e354e3443c478d6
Author: Jan Schneider <jan at horde.org>
Date:   Mon Dec 19 15:56:29 2011 +0100

    Update file list.

 turba/package.xml |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

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

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

commit d6406f3caf38a76039d3a4d562fabb5a4a69c4d6
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 19 12:40:04 2011 -0500

    phpdoc typo

 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit 5fad00e7b1bc925152d177187006dddf9b614223
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 19 12:40:18 2011 -0500

    Toggle the spinner while waiting for the new location

 .../lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter.php    |    7 ++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/5fad00e7b1bc925152d177187006dddf9b614223

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

commit 11a6c5000c4d436c889e5eb4fb6b584bf9cb0f61
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Dec 19 16:04:39 2011 -0700

    Tweak some search element labels

 imp/lib/Search/Element/Date.php |    6 +++---
 imp/lib/Search/Element/Size.php |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/11a6c5000c4d436c889e5eb4fb6b584bf9cb0f61

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

commit 7e880276b9d2ef4afa832f5d151dff3b7d1fdf74
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Dec 19 16:52:33 2011 -0700

    fix comment

 imp/js/viewport.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/7e880276b9d2ef4afa832f5d151dff3b7d1fdf74

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

commit 3ff9ebc04619b8b88f516ef91473e01efcba3121
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Dec 19 16:56:23 2011 -0700

    Hide searchbar when switching views

 imp/js/dimpbase.js |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/3ff9ebc04619b8b88f516ef91473e01efcba3121

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

commit e8eb2e997497e0c90b55bded9265e5bb0583e495
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Dec 19 17:00:51 2011 -0700

    Show loading image when refreshing a search view

 imp/js/dimpbase.js |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

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

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

commit ce4e2a78bc5152d12729c43f440335af6ba7a559
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Dec 19 17:15:51 2011 -0700

    [mms] Fix editing date search elements.

 imp/docs/CHANGES |    1 +
 imp/js/search.js |    5 +++--
 imp/package.xml  |    2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

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

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

commit a17107e4c3bad736f150b1da56181459d853b580
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Dec 19 17:31:00 2011 -0700

    [mms] Fix attachment detection search filter.

 imp/docs/CHANGES                      |    1 +
 imp/js/search.js                      |    4 ++++
 imp/lib/Search/Element/Attachment.php |   15 ++++++++++-----
 imp/package.xml                       |    2 ++
 4 files changed, 17 insertions(+), 5 deletions(-)

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

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

commit 21406c517e6adba7a8b92c5da358a598caf0d95e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 19 20:21:47 2011 -0500

    Ensure we can actually create the stream before passing it to Horde_Log_Logger

 framework/Core/lib/Horde/Core/Factory/ActiveSyncServer.php |   15 ++++++++----
 1 files changed, 10 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/21406c517e6adba7a8b92c5da358a598caf0d95e

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

commit dac4a9422f608ce98e16f58fe3effaa400f53d66
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 19 20:41:48 2011 -0500

    Spacing/comments etc...

 framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php |   64 +++---
 1 files changed, 32 insertions(+), 32 deletions(-)

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

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

commit 9ee536d3160a2ff52548b1c5af9516cc30f84e98
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 19 20:42:19 2011 -0500

    Better support for Android provisioning.
    
    Android sends the exact same User-Agent string for a number of
    different versions - including versions that have broken provisioning
    support as well as those that have working provisioning support.
    
    With this change, enabling "loose" provisioning will cause those devices to NOT
    be provisioned, while allowing the more recent "EAS-" versioned clients to be
    provisioned.
    
    Enabling "forced" provisioning will continue to work as it always had, with one
    change - even android devices that correctly support provisioning will now be provisioned.
    (We were previously never allowing Android devices to attempt to be provisioned).

 framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php |   36 ++++++++++--
 1 files changed, 30 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/9ee536d3160a2ff52548b1c5af9516cc30f84e98

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

commit 8d957c28ea126a4a197be11badc7cc86abf8312f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 19 20:48:40 2011 -0500

    CHANGES

 framework/ActiveSync/package.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/8d957c28ea126a4a197be11badc7cc86abf8312f

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

commit 562e555ab52f8ce59cd4c9dd8f5eae79b22611e3
Merge: 33c9d00 8d957c2
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Dec 19 20:53:49 2011 -0500

    Merge branch 'master' into develop
    
    Conflicts:
    	framework/Core/package.xml
    	horde/lib/Block/Weather.php
    	imp/package.xml
    	turba/package.xml

 ansel/test/Ansel/AllTests.php                                     |    8 +-
 ansel/test/Ansel/Autoload.php                                     |    2 +-
 ansel/test/Ansel/TestCase.php                                     |    8 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php  |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php        |   36 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php   |   64 +-
 framework/ActiveSync/package.xml                                  |    2 +
 .../lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter.php    |   10 +-
 framework/Core/lib/Horde/Core/Factory/ActiveSyncServer.php        |   15 +-
 framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php             |   12 +-
 framework/Core/lib/Horde/Registry.php                             |   28 +-
 framework/Core/package.xml                                        |    4 +
 framework/Core/test/Horde/Core/RegistryTest.php                   |  111 +++
 framework/Core/test/Horde/Core/Stub/Registry.php                  |   45 +
 framework/Icalendar/lib/Horde/Icalendar.php                       |   64 +-
 framework/Icalendar/package.xml                                   |   14 +-
 framework/Kolab_Cli/bin/horde-kolab-cli                           |    8 +
 framework/Kolab_Cli/bin/klb                                       |    8 -
 framework/Kolab_Cli/doc/Horde/Kolab/Cli/TODO                      |   11 +
 framework/Kolab_Cli/doc/TODO                                      |   11 -
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Base.php           |    6 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Data.php           |    6 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/Folder.php         |    2 +-
 framework/Kolab_Cli/lib/Horde/Kolab/Cli/Module/List.php           |    2 +-
 framework/Kolab_Cli/package.xml                                   |   88 ++-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Contact.php     |    4 +-
 framework/Kolab_Format/package.xml                                |   24 +-
 framework/SyncMl/lib/Horde/SyncMl/Backend/Horde.php               |   40 +-
 framework/SyncMl/package.xml                                      |    4 +-
 framework/Util/lib/Horde/String.php                               |    3 +
 framework/Vfs/test/Horde/Vfs/FileTest.php                         |   13 +-
 horde/lib/Block/Weather.php                                       |   29 +-
 horde/themes/default/screen.css                                   |    9 +
 imp/docs/CHANGES                                                  |    2 +
 imp/js/dimpbase.js                                                |   10 +-
 imp/js/search.js                                                  |    9 +-
 imp/js/viewport.js                                                |    4 +-
 imp/lib/Search/Element/Attachment.php                             |   15 +-
 imp/lib/Search/Element/Date.php                                   |    6 +-
 imp/lib/Search/Element/Size.php                                   |    4 +-
 imp/package.xml                                                   |    2 +
 ingo/bin/ingo-convert-prefs-to-sql                                |    2 +-
 ingo/blacklist.php                                                |    2 +-
 ingo/filters.php                                                  |    2 +-
 ingo/forward.php                                                  |    2 +-
 ingo/index.php                                                    |    2 +-
 ingo/lib/Api.php                                                  |    2 +-
 ingo/lib/Application.php                                          |    2 +-
 ingo/lib/Block/Overview.php                                       |    2 +-
 ingo/lib/Exception.php                                            |    2 +-
 ingo/lib/Exception/Pear.php                                       |    2 +-
 ingo/lib/Ingo.php                                                 |    2 +-
 ingo/lib/LoginTasks/SystemTask/Upgrade.php                        |    4 +-
 ingo/lib/Script.php                                               |    2 +-
 ingo/lib/Script/Imap.php                                          |    4 +-
 ingo/lib/Script/Imap/Api.php                                      |    4 +-
 ingo/lib/Script/Imap/Live.php                                     |    2 +-
 ingo/lib/Script/Maildrop.php                                      |    2 +-
 ingo/lib/Script/Maildrop/Comment.php                              |    2 +-
 ingo/lib/Script/Maildrop/Recipe.php                               |    2 +-
 ingo/lib/Script/Maildrop/Variable.php                             |    2 +-
 ingo/lib/Script/Procmail.php                                      |    2 +-
 ingo/lib/Script/Procmail/Comment.php                              |    2 +-
 ingo/lib/Script/Procmail/Recipe.php                               |    2 +-
 ingo/lib/Script/Procmail/Variable.php                             |    2 +-
 ingo/lib/Script/Sieve.php                                         |    2 +-
 ingo/lib/Script/Sieve/Action.php                                  |    2 +-
 ingo/lib/Script/Sieve/Action/Addflag.php                          |    2 +-
 ingo/lib/Script/Sieve/Action/Discard.php                          |    2 +-
 ingo/lib/Script/Sieve/Action/Fileinto.php                         |    2 +-
 ingo/lib/Script/Sieve/Action/Flag.php                             |    2 +-
 ingo/lib/Script/Sieve/Action/Keep.php                             |    2 +-
 ingo/lib/Script/Sieve/Action/Notify.php                           |    2 +-
 ingo/lib/Script/Sieve/Action/Redirect.php                         |    2 +-
 ingo/lib/Script/Sieve/Action/Reject.php                           |    2 +-
 ingo/lib/Script/Sieve/Action/Removeflag.php                       |    2 +-
 ingo/lib/Script/Sieve/Action/Stop.php                             |    2 +-
 ingo/lib/Script/Sieve/Action/Vacation.php                         |    2 +-
 ingo/lib/Script/Sieve/Comment.php                                 |    2 +-
 ingo/lib/Script/Sieve/Else.php                                    |    2 +-
 ingo/lib/Script/Sieve/Elsif.php                                   |    2 +-
 ingo/lib/Script/Sieve/If.php                                      |    2 +-
 ingo/lib/Script/Sieve/Test.php                                    |    2 +-
 ingo/lib/Script/Sieve/Test/Address.php                            |    2 +-
 ingo/lib/Script/Sieve/Test/Allof.php                              |    2 +-
 ingo/lib/Script/Sieve/Test/Anyof.php                              |    2 +-
 ingo/lib/Script/Sieve/Test/Body.php                               |    2 +-
 ingo/lib/Script/Sieve/Test/Exists.php                             |    2 +-
 ingo/lib/Script/Sieve/Test/False.php                              |    2 +-
 ingo/lib/Script/Sieve/Test/Header.php                             |    2 +-
 ingo/lib/Script/Sieve/Test/Not.php                                |    2 +-
 ingo/lib/Script/Sieve/Test/Relational.php                         |    2 +-
 ingo/lib/Script/Sieve/Test/Size.php                               |    2 +-
 ingo/lib/Script/Sieve/Test/True.php                               |    2 +-
 ingo/lib/Storage.php                                              |    2 +-
 ingo/lib/Storage/Blacklist.php                                    |    2 +-
 ingo/lib/Storage/Filters.php                                      |    2 +-
 ingo/lib/Storage/Filters/Sql.php                                  |    2 +-
 ingo/lib/Storage/Forward.php                                      |    2 +-
 ingo/lib/Storage/Mock.php                                         |    2 +-
 ingo/lib/Storage/Prefs.php                                        |    2 +-
 ingo/lib/Storage/Rule.php                                         |    2 +-
 ingo/lib/Storage/Spam.php                                         |    2 +-
 ingo/lib/Storage/Sql.php                                          |    2 +-
 ingo/lib/Storage/Vacation.php                                     |    2 +-
 ingo/lib/Storage/VacationTest.php                                 |    2 +-
 ingo/lib/Storage/Whitelist.php                                    |    2 +-
 ingo/lib/Transport.php                                            |    2 +-
 ingo/lib/Transport/Ldap.php                                       |    2 +-
 ingo/lib/Transport/Null.php                                       |    2 +-
 ingo/lib/Transport/Sivtest.php                                    |    2 +-
 ingo/lib/Transport/Timsieved.php                                  |    2 +-
 ingo/lib/Transport/Vfs.php                                        |    2 +-
 ingo/lib/Ui/VarRenderer/Ingo.php                                  |    2 +-
 ingo/lib/tests/MaildropTest.php                                   |    2 +-
 ingo/lib/tests/ProcmailTest.php                                   |    2 +-
 ingo/lib/tests/ScriptTest.php                                     |    2 +-
 ingo/lib/tests/SieveTest.php                                      |    2 +-
 ingo/migration/1_ingo_base_tables.php                             |    4 +-
 ingo/migration/2_ingo_upgrade_autoincrement.php                   |    4 +-
 ingo/migration/3_ingo_upgrade_sqlng.php                           |    4 +-
 ingo/rule.php                                                     |    2 +-
 ingo/script.php                                                   |    2 +-
 ingo/spam.php                                                     |    2 +-
 ingo/vacation.php                                                 |    2 +-
 ingo/whitelist.php                                                |    2 +-
 mnemo/bin/mnemo-convert-to-utf8                                   |    2 +-
 mnemo/bin/mnemo-import-text-note                                  |    2 +-
 mnemo/data.php                                                    |    2 +-
 mnemo/index.php                                                   |    2 +-
 mnemo/lib/Ajax/Application.php                                    |    4 +-
 mnemo/lib/Api.php                                                 |    2 +-
 mnemo/lib/Application.php                                         |    2 +-
 mnemo/lib/Driver.php                                              |    2 +-
 mnemo/lib/Driver/Kolab.php                                        |    2 +-
 mnemo/lib/Driver/Sql.php                                          |    2 +-
 mnemo/lib/Exception.php                                           |    2 +-
 mnemo/lib/Factory/Driver.php                                      |    2 +-
 mnemo/lib/Factory/Notepads.php                                    |    6 +-
 mnemo/lib/Form/CreateNotepad.php                                  |    2 +-
 mnemo/lib/Form/DeleteNotepad.php                                  |    2 +-
 mnemo/lib/Form/EditNotepad.php                                    |    2 +-
 mnemo/lib/Mnemo.php                                               |    2 +-
 mnemo/lib/Notepads/Base.php                                       |    6 +-
 mnemo/lib/Notepads/Default.php                                    |    6 +-
 mnemo/lib/Notepads/Kolab.php                                      |    6 +-
 mnemo/list.php                                                    |    2 +-
 mnemo/memo.php                                                    |    2 +-
 mnemo/migration/1_mnemo_base_tables.php                           |    4 +-
 mnemo/migration/2_mnemo_upgrade_autoincrement.php                 |    4 +-
 mnemo/migration/3_mnemo_upgrade_sqlng.php                         |    4 +-
 mnemo/note/pdf.php                                                |    2 +-
 mnemo/notepads/create.php                                         |    2 +-
 mnemo/notepads/delete.php                                         |    2 +-
 mnemo/notepads/edit.php                                           |    2 +-
 mnemo/notepads/index.php                                          |    2 +-
 mnemo/notes/index.php                                             |    2 +-
 mnemo/package.xml                                                 |   22 +-
 mnemo/search.php                                                  |    2 +-
 mnemo/test/Mnemo/AllTests.php                                     |    6 +-
 mnemo/test/Mnemo/Autoload.php                                     |    2 +-
 mnemo/test/Mnemo/TestCase.php                                     |    6 +-
 mnemo/test/Mnemo/Unit/Driver/KolabTest.php                        |    6 +-
 mnemo/test/Mnemo/Unit/Factory/DriverTest.php                      |    6 +-
 mnemo/test/Mnemo/Unit/Mnemo/Base.php                              |    6 +-
 mnemo/test/Mnemo/Unit/Mnemo/KolabTest.php                         |    6 +-
 mnemo/test/Mnemo/Unit/Mnemo/Sql/Base.php                          |    6 +-
 mnemo/test/Mnemo/Unit/Mnemo/Sql/Pdo/SqliteTest.php                |    6 +-
 mnemo/view.php                                                    |    2 +-
 turba/add.php                                                     |    2 +-
 turba/addressbooks/create.php                                     |    2 +-
 turba/addressbooks/delete.php                                     |    2 +-
 turba/addressbooks/edit.php                                       |    2 +-
 turba/addressbooks/index.php                                      |    2 +-
 turba/bin/turba-import-squirrelmail-file-abook                    |    2 +-
 turba/bin/turba-import-squirrelmail-sql-abook                     |    2 +-
 turba/bin/turba-import-vcards                                     |    2 +-
 turba/bin/turba-public-to-horde-share                             |    2 +-
 turba/browse.php                                                  |    2 +-
 turba/contact.php                                                 |    2 +-
 turba/data.php                                                    |    2 +-
 turba/delete.php                                                  |    4 +-
 turba/deletefile.php                                              |    2 +-
 turba/docs/CHANGES                                                |    3 +
 turba/edit.php                                                    |    2 +-
 turba/index.php                                                   |    2 +-
 turba/js/columnprefs.js                                           |    2 +-
 turba/js/search.js                                                |    2 +-
 turba/lib/Api.php                                                 |    4 +-
 turba/lib/Block/Minisearch.php                                    |    2 +-
 turba/lib/Data/Ldif.php                                           |    4 +-
 turba/lib/Driver.php                                              |   52 +-
 turba/lib/Driver/Facebook.php                                     |    4 +-
 turba/lib/Driver/Favourites.php                                   |    4 +-
 turba/lib/Driver/Group.php                                        |    4 +-
 turba/lib/Driver/Imsp.php                                         |    4 +-
 turba/lib/Driver/Kolab.php                                        |    4 +-
 turba/lib/Driver/Ldap.php                                         |    4 +-
 turba/lib/Driver/Prefs.php                                        |    4 +-
 turba/lib/Driver/Share.php                                        |    4 +-
 turba/lib/Driver/Sql.php                                          |    4 +-
 turba/lib/Driver/Vbook.php                                        |    4 +-
 turba/lib/Exception.php                                           |    4 +-
 turba/lib/Form/CreateAddressBook.php                              |    2 +-
 turba/lib/Form/DeleteAddressBook.php                              |    2 +-
 turba/lib/Form/EditAddressBook.php                                |    2 +-
 turba/lib/List.php                                                |    4 +-
 turba/lib/LoginTasks/SystemTask/Upgrade.php                       |    4 +-
 turba/lib/Test.php                                                |    4 +-
 turba/lib/View/Browse.php                                         |    2 +-
 turba/lib/View/Duplicates.php                                     |    2 +-
 turba/merge.php                                                   |    2 +-
 turba/migration/1_turba_base_tables.php                           |    4 +-
 turba/migration/2_turba_upgrade_autoincrement.php                 |    4 +-
 turba/migration/3_turba_upgrade_sqlng.php                         |    4 +-
 turba/migration/4_turba_upgrade_sqlhierarchical.php               |    8 +-
 turba/migration/5_turba_upgrade_sqlnghierarchical.php             |    8 +-
 turba/migration/6_turba_upgrade_updateschema.php                  |    8 +-
 turba/minisearch.php                                              |    2 +-
 turba/package.xml                                                 |   16 +-
 turba/search.php                                                  |    2 +-
 turba/test/Turba/Autoload.php                                     |    7 -
 turba/test/Turba/TestCase.php                                     |    8 +-
 turba/test/Turba/ToDo/KolabTestBase.php                           |    8 +-
 turba/test/Turba/ToDo/az.png                                      |  Bin 117 -> 0 bytes
 turba/test/Turba/ToDo/tovcard.phpt                                |  143 ----
 turba/test/Turba/Unit/Driver/Base.php                             |    5 +
 turba/test/Turba/Unit/Driver/KolabTest.php                        |    5 +-
 turba/test/Turba/Unit/Driver/Sql/Base.php                         |    5 +
 turba/test/Turba/Unit/Driver/Sql/Pdo/SqliteTest.php               |    2 +-
 turba/test/Turba/Unit/DriverTest.php                              |  185 +++++
 turba/test/Turba/Unit/Turba/Base.php                              |    5 +
 turba/test/Turba/Unit/Turba/KolabTest.php                         |    2 +-
 turba/test/Turba/Unit/Turba/Sql/Base.php                          |    8 +-
 turba/test/Turba/Unit/Turba/Sql/Pdo/SqliteTest.php                |    2 +-
 turba/test/Turba/fixtures/az.png                                  |  Bin 0 -> 117 bytes
 turba/vcard.php                                                   |    2 +-
 turba/view.php                                                    |    2 +-
 238 files changed, 1054 insertions(+), 651 deletions(-)

http://git.horde.org/horde-git/-/commit/562e555ab52f8ce59cd4c9dd8f5eae79b22611e3




More information about the commits mailing list