[commits] Horde branch imp_6_2 updated. 585b9602a3bbec611536fcaeae8c47fcea5660dc
Michael M Slusarz
slusarz at horde.org
Thu Nov 14 20:56:41 UTC 2013
The branch "imp_6_2" has been updated.
The following is a summary of the commits.
from: f4cddf3fa9d7198c5ff41afdcc697df9ab29e73a
ac30041 Spacing
b3202f4 Revert "Eliminate a few more strict warnings"
e816d33 match original API
591ab42 Add Horde_Mongo_Exception
395fdc4 Bump minimum version, catch Exceptions.
facf7da Catch Horde_Mongo_Exception
eaa3990 Catch Horde_Mongo_Exception
6c7ac07 Revert "Add Horde_Mongo_Exception"
20db1b9 Revert "Bump minimum version, catch Exceptions."
f71cae7 Revert "Catch Horde_Mongo_Exception"
bf8d206 Revert "Catch Horde_Mongo_Exception"
dc2c27a Has been named backends.php for long time.
24f4a21 Empty buffer to not leak into the output.
8463e86 Fix enum value descriptions. Bug: 12839
ad6c682 Catch Exception
31d8456 phpdoc
cd42f88 version.php files were removed in H4
f7174f6 Use Horde_Registry#appInit() in horde-translation
585b960 Merge branch 'master' into imp_6_2
Summary: http://github.com/horde/horde/compare/f4cddf3fa9d7198c5ff41afdcc697df9ab29e73a...585b9602a3bbec611536fcaeae8c47fcea5660dc
-----------------------------------------------------------------------
commit ac30041b21af0d5f1a786f2684606a6f1423ff23
Author: Jan Schneider <jan at horde.org>
Date: Mon Oct 28 12:13:13 2013 +0100
Spacing
turba/config/backends.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/ac30041b21af0d5f1a786f2684606a6f1423ff23
http://git.horde.org/horde-git/-/commit/ac30041b21af0d5f1a786f2684606a6f1423ff23
-----------------------------------------------------------------------
commit b3202f4c844438d0317acd459f76316eaa89159d
Author: Jan Schneider <jan at horde.org>
Date: Wed Nov 13 15:33:23 2013 +0100
Revert "Eliminate a few more strict warnings"
This method is not defined in all sub-classes but called on arbitrary Horde_Form_Type instances.
This reverts commit a81b4ba9335afbd8beb3c4ce4c6736812d8022c4.
framework/Form/lib/Horde/Form/Type.php | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
http://github.com/horde/horde/commit/b3202f4c844438d0317acd459f76316eaa89159d
http://git.horde.org/horde-git/-/commit/b3202f4c844438d0317acd459f76316eaa89159d
-----------------------------------------------------------------------
commit e816d335f77b9a1f9ffee1dfa48a7f79369e734b
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Nov 13 10:20:28 2013 -0700
match original API
This is probably just as BC breaking as now we are throwing an Exception
where before a PHP fatal error was being thrown. But it does match the API
correctly, and I admittedly am the one who demands that is the
documentation that makes up the API, not the data returned.
framework/Crypt/lib/Horde/Crypt/Pgp.php | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/e816d335f77b9a1f9ffee1dfa48a7f79369e734b
http://git.horde.org/horde-git/-/commit/e816d335f77b9a1f9ffee1dfa48a7f79369e734b
-----------------------------------------------------------------------
commit 591ab423f6d9766b5b30d1f94d735cde9589ab19
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Wed Nov 13 19:57:26 2013 -0500
Add Horde_Mongo_Exception
framework/Mongo/lib/Horde/Mongo/Client.php | 8 +++++++-
framework/Mongo/lib/Horde/Mongo/Exception.php | 12 ++++++++++++
framework/Mongo/package.xml | 18 ++++++++++--------
3 files changed, 29 insertions(+), 9 deletions(-)
create mode 100644 framework/Mongo/lib/Horde/Mongo/Exception.php
http://github.com/horde/horde/commit/591ab423f6d9766b5b30d1f94d735cde9589ab19
http://git.horde.org/horde-git/-/commit/591ab423f6d9766b5b30d1f94d735cde9589ab19
-----------------------------------------------------------------------
commit 395fdc4a69f2cb0f228b975ebc54757624c2266e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Wed Nov 13 20:26:07 2013 -0500
Bump minimum version, catch Exceptions.
framework/ActiveSync/package.xml | 2 +-
.../ActiveSync/test/Horde/ActiveSync/StateTest/Mongo/BaseTest.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/395fdc4a69f2cb0f228b975ebc54757624c2266e
http://git.horde.org/horde-git/-/commit/395fdc4a69f2cb0f228b975ebc54757624c2266e
-----------------------------------------------------------------------
commit facf7da6efbc0cbab8221f7016159efdeeaf80f0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Wed Nov 13 20:44:46 2013 -0500
Catch Horde_Mongo_Exception
.../ActiveSync/test/Horde/ActiveSync/StateTest/Mongo/BaseTest.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/facf7da6efbc0cbab8221f7016159efdeeaf80f0
http://git.horde.org/horde-git/-/commit/facf7da6efbc0cbab8221f7016159efdeeaf80f0
-----------------------------------------------------------------------
commit eaa3990898b6770e6a4f1c87b110ea90f8995d7c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Wed Nov 13 20:48:21 2013 -0500
Catch Horde_Mongo_Exception
framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php | 62 ++++++------
1 files changed, 31 insertions(+), 31 deletions(-)
http://github.com/horde/horde/commit/eaa3990898b6770e6a4f1c87b110ea90f8995d7c
http://git.horde.org/horde-git/-/commit/eaa3990898b6770e6a4f1c87b110ea90f8995d7c
-----------------------------------------------------------------------
commit 6c7ac07354c21305bf850d29a1fdbb81bc1a3f7d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Nov 14 08:32:59 2013 -0500
Revert "Add Horde_Mongo_Exception"
This reverts commit 591ab423f6d9766b5b30d1f94d735cde9589ab19.
This change is BC breaking, and needs to wait until Horde_Mongo 2.0.
framework/Mongo/lib/Horde/Mongo/Client.php | 8 +-------
framework/Mongo/lib/Horde/Mongo/Exception.php | 12 ------------
framework/Mongo/package.xml | 18 ++++++++----------
3 files changed, 9 insertions(+), 29 deletions(-)
delete mode 100644 framework/Mongo/lib/Horde/Mongo/Exception.php
http://github.com/horde/horde/commit/6c7ac07354c21305bf850d29a1fdbb81bc1a3f7d
http://git.horde.org/horde-git/-/commit/6c7ac07354c21305bf850d29a1fdbb81bc1a3f7d
-----------------------------------------------------------------------
commit 20db1b92aea0082375f228097f9d98662b33f706
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Nov 14 08:33:55 2013 -0500
Revert "Bump minimum version, catch Exceptions."
This reverts commit 395fdc4a69f2cb0f228b975ebc54757624c2266e.
framework/ActiveSync/package.xml | 2 +-
.../ActiveSync/test/Horde/ActiveSync/StateTest/Mongo/BaseTest.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/20db1b92aea0082375f228097f9d98662b33f706
http://git.horde.org/horde-git/-/commit/20db1b92aea0082375f228097f9d98662b33f706
-----------------------------------------------------------------------
commit f71cae7602a4cfd77d56d56eeb1caba0c4dc5159
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Nov 14 08:34:15 2013 -0500
Revert "Catch Horde_Mongo_Exception"
This reverts commit facf7da6efbc0cbab8221f7016159efdeeaf80f0.
.../ActiveSync/test/Horde/ActiveSync/StateTest/Mongo/BaseTest.php | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/f71cae7602a4cfd77d56d56eeb1caba0c4dc5159
http://git.horde.org/horde-git/-/commit/f71cae7602a4cfd77d56d56eeb1caba0c4dc5159
-----------------------------------------------------------------------
commit bf8d20690c17d8baeec8b7d0630ac23984506465
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Nov 14 08:34:25 2013 -0500
Revert "Catch Horde_Mongo_Exception"
This reverts commit eaa3990898b6770e6a4f1c87b110ea90f8995d7c.
framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php | 62 ++++++------
1 files changed, 31 insertions(+), 31 deletions(-)
http://github.com/horde/horde/commit/bf8d20690c17d8baeec8b7d0630ac23984506465
http://git.horde.org/horde-git/-/commit/bf8d20690c17d8baeec8b7d0630ac23984506465
-----------------------------------------------------------------------
commit dc2c27a2b447dfa2a72861e6abcff13e7fa90e89
Author: Jan Schneider <jan at horde.org>
Date: Wed Nov 13 16:04:45 2013 +0100
Has been named backends.php for long time.
imp/config/prefs.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/dc2c27a2b447dfa2a72861e6abcff13e7fa90e89
http://git.horde.org/horde-git/-/commit/dc2c27a2b447dfa2a72861e6abcff13e7fa90e89
-----------------------------------------------------------------------
commit 24f4a2107cd5759892769e487cbe5bccbf9d765f
Author: Jan Schneider <jan at horde.org>
Date: Thu Nov 14 15:08:05 2013 +0100
Empty buffer to not leak into the output.
framework/Core/lib/Horde/Core/Ajax/Application/Handler/Chunk.php | 9 ++++-
1 files changed, 7 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/24f4a2107cd5759892769e487cbe5bccbf9d765f
http://git.horde.org/horde-git/-/commit/24f4a2107cd5759892769e487cbe5bccbf9d765f
-----------------------------------------------------------------------
commit 8463e86e38a5a9eb7af99cff1392b5d20f1ea934
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Nov 14 14:26:39 2013 -0500
Fix enum value descriptions. Bug: 12839
ansel/config/prefs.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/8463e86e38a5a9eb7af99cff1392b5d20f1ea934
http://git.horde.org/horde-git/-/commit/8463e86e38a5a9eb7af99cff1392b5d20f1ea934
-----------------------------------------------------------------------
commit ad6c682543b39fd38dc15897d078f5cd9173fed2
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Nov 14 14:28:46 2013 -0500
Catch Exception
framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/ad6c682543b39fd38dc15897d078f5cd9173fed2
http://git.horde.org/horde-git/-/commit/ad6c682543b39fd38dc15897d078f5cd9173fed2
-----------------------------------------------------------------------
commit 31d84561897ff3736a5d22dc3b4fadc201781a8f
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Nov 14 13:40:20 2013 -0700
phpdoc
framework/Core/lib/Horde/Registry.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/31d84561897ff3736a5d22dc3b4fadc201781a8f
http://git.horde.org/horde-git/-/commit/31d84561897ff3736a5d22dc3b4fadc201781a8f
-----------------------------------------------------------------------
commit cd42f889ca6a585779d1875694fefef2772c90d8
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Nov 14 13:46:32 2013 -0700
version.php files were removed in H4
horde/bin/horde-translation | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
http://github.com/horde/horde/commit/cd42f889ca6a585779d1875694fefef2772c90d8
http://git.horde.org/horde-git/-/commit/cd42f889ca6a585779d1875694fefef2772c90d8
-----------------------------------------------------------------------
commit f7174f6ce9b19e5f7345d1b7ceff9e7c49f0aa83
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Nov 14 13:40:32 2013 -0700
Use Horde_Registry#appInit() in horde-translation
Otherwise, this fails when retrieving version information for
applications that use $injector or $registry in their _bootstrap()
methods (i.e. IMP 6.2).
I'm assuming the only reason we haven't updated to using appInit() is
because it simply wasn't needed before now - the application just worked.
(AFAICT, horde-translation previouslt required a working version of Horde
installed, so this doesn't change anything).
horde/bin/horde-translation | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
http://github.com/horde/horde/commit/f7174f6ce9b19e5f7345d1b7ceff9e7c49f0aa83
http://git.horde.org/horde-git/-/commit/f7174f6ce9b19e5f7345d1b7ceff9e7c49f0aa83
-----------------------------------------------------------------------
commit 585b9602a3bbec611536fcaeae8c47fcea5660dc
Merge: f4cddf3 f7174f6
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Nov 14 13:56:28 2013 -0700
Merge branch 'master' into imp_6_2
ansel/config/prefs.php | 4 +-
framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php | 4 +-
framework/Core/lib/Horde/Core/Ajax/Application/Handler/Chunk.php | 9 ++-
framework/Core/lib/Horde/Registry.php | 2 +-
framework/Crypt/lib/Horde/Crypt/Pgp.php | 8 ++
framework/Form/lib/Horde/Form/Type.php | 12 +--
horde/bin/horde-translation | 25 ++----
imp/config/prefs.php | 4 +-
turba/config/backends.php | 2 +-
9 files changed, 36 insertions(+), 34 deletions(-)
http://github.com/horde/horde/commit/585b9602a3bbec611536fcaeae8c47fcea5660dc
http://git.horde.org/horde-git/-/commit/585b9602a3bbec611536fcaeae8c47fcea5660dc
More information about the commits
mailing list