[commits] Horde branch develop updated. 9d1221a19cda2ff179d5c21958e5dfd0f376a9d7
Michael M Slusarz
slusarz at horde.org
Fri Dec 23 19:19:01 UTC 2011
The branch "develop" has been updated.
The following is a summary of the commits.
from: 3d662bb61e7c892ad5e7e59a68b3be1b2054d0c6
e013445 CHANGES
bbf0fd7 CHANGES
2c87780 CHANGES
4d6033f Released Horde_ActiveSync-1.2.0
a40fd39 Development mode for Horde_ActiveSync-1.2.1
3552031 Released Horde_Date-1.0.9
3897c7b Development mode for Horde_Date-1.0.10
d3d0a2f update file list
4b2ff96 Released Horde_Core-1.8.3
fb00f22 Development mode for Horde_Core-1.8.4
7b24e4d Add support for rain and snow forecast totals.
0f65a57 Add snow_total, rain_total to unsupported list of other drivers.
32af5cf update tests
a2ce7d2 update package.xml
6580057 Add @property phpdoc to current objects.
81b61d1 phpdoc
ba30474 Merge updates to JsMin filter
6cb9a16 Correctly add status info to pre-existing entry
ec6c8f7 default to the currently selected units
9d1221a Merge branch 'master' into develop
-----------------------------------------------------------------------
commit e01344561724b3925aaea94a5ea45490a2390aaa
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 09:22:18 2011 -0500
CHANGES
framework/Core/package.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/e01344561724b3925aaea94a5ea45490a2390aaa
-----------------------------------------------------------------------
commit bbf0fd72325e390621defcb6a9a46014dfc2874f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 09:32:03 2011 -0500
CHANGES
framework/Date/package.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/bbf0fd72325e390621defcb6a9a46014dfc2874f
-----------------------------------------------------------------------
commit 2c877802826e0ca8513c536192c22f3c32d4e486
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 10:35:24 2011 -0500
CHANGES
framework/ActiveSync/package.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/2c877802826e0ca8513c536192c22f3c32d4e486
-----------------------------------------------------------------------
commit 4d6033f38578602d7bb515562a41fb7cabb2a071
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 10:38:50 2011 -0500
Released Horde_ActiveSync-1.2.0
framework/ActiveSync/package.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/4d6033f38578602d7bb515562a41fb7cabb2a071
-----------------------------------------------------------------------
commit a40fd39f81979076f42289c964302ad9dd45bcc9
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 10:38:50 2011 -0500
Development mode for Horde_ActiveSync-1.2.1
framework/ActiveSync/package.xml | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
http://git.horde.org/horde-git/-/commit/a40fd39f81979076f42289c964302ad9dd45bcc9
-----------------------------------------------------------------------
commit 3552031c825c516ad69b29cb0415d28640239917
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 10:45:38 2011 -0500
Released Horde_Date-1.0.9
framework/Date/package.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/3552031c825c516ad69b29cb0415d28640239917
-----------------------------------------------------------------------
commit 3897c7bda5ed19f04786d4d6d38ac682a2110b45
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 10:45:38 2011 -0500
Development mode for Horde_Date-1.0.10
framework/Date/package.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/3897c7bda5ed19f04786d4d6d38ac682a2110b45
-----------------------------------------------------------------------
commit d3d0a2f83fc2041a57b44ef057f1d10b807a4302
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 10:46:54 2011 -0500
update file list
framework/Core/package.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/d3d0a2f83fc2041a57b44ef057f1d10b807a4302
-----------------------------------------------------------------------
commit 4b2ff960aeb3b15f6a4aca1027c8c0c56d1f6116
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 10:48:08 2011 -0500
Released Horde_Core-1.8.3
framework/Core/package.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/4b2ff960aeb3b15f6a4aca1027c8c0c56d1f6116
-----------------------------------------------------------------------
commit fb00f227d8721eeac03dc53f5b6621a8389a0dd7
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 10:48:08 2011 -0500
Development mode for Horde_Core-1.8.4
framework/Core/package.xml | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/fb00f227d8721eeac03dc53f5b6621a8389a0dd7
-----------------------------------------------------------------------
commit 7b24e4d302ca77d5959f89ff04a92cd678bd2195
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 11:32:48 2011 -0500
Add support for rain and snow forecast totals.
Wunderground is only provider that provides this currently.
framework/Service_Weather/lib/Horde/Service/Weather/Base.php | 8 ++-
.../lib/Horde/Service/Weather/Period/WeatherUnderground.php | 12 +++++
.../lib/Horde/Service/Weather/WeatherUnderground.php | 10 ++++
3 files changed, 28 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/7b24e4d302ca77d5959f89ff04a92cd678bd2195
-----------------------------------------------------------------------
commit 0f65a57ed269ff16e9b003a601aad4bd89451445
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 11:52:17 2011 -0500
Add snow_total, rain_total to unsupported list of other drivers.
.../Service_Weather/lib/Horde/Service/Weather/Period/Google.php | 2 ++
.../Service_Weather/lib/Horde/Service/Weather/Period/Wwo.php | 4 +++-
2 files changed, 5 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/0f65a57ed269ff16e9b003a601aad4bd89451445
-----------------------------------------------------------------------
commit 32af5cfa1783ad8cdbc65230f05d3bcc34811d50
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 11:52:40 2011 -0500
update tests
.../Service_Weather/test/Horde/Service/Weather/GoogleTest.php | 8 +++++
.../test/Horde/Service/Weather/WundergroundTest.php | 4 ++
framework/Service_Weather/test/Horde/Service/Weather/WwoTest.php | 8 +++++
.../test/Horde/Service/Weather/fixtures/boston_wunderground.json | 2 +
4 files changed, 22 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/32af5cfa1783ad8cdbc65230f05d3bcc34811d50
-----------------------------------------------------------------------
commit a2ce7d2b366a5eaf689947e5aeb11b399471566f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 11:54:08 2011 -0500
update package.xml
framework/Service_Weather/package.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/a2ce7d2b366a5eaf689947e5aeb11b399471566f
-----------------------------------------------------------------------
commit 6580057b0faf4cb508b0a5c5e8fe519c69b0a3f2
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 12:52:31 2011 -0500
Add @property phpdoc to current objects.
.../Service_Weather/lib/Horde/Service/Weather/Current/Google.php | 17 ++++
.../lib/Horde/Service/Weather/Current/WeatherUnderground.php | 20 +++++
.../Service_Weather/lib/Horde/Service/Weather/Current/Wwo.php | 20 +++++
3 files changed, 57 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/6580057b0faf4cb508b0a5c5e8fe519c69b0a3f2
-----------------------------------------------------------------------
commit 81b61d1f7cc255f65378b95def808cbf2a1862c9
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 13:41:16 2011 -0500
phpdoc
.../Service_Weather/lib/Horde/Service/Weather/Current/Base.php | 20 +++++
.../Service_Weather/lib/Horde/Service/Weather/Current/Google.php | 17 ----
.../lib/Horde/Service/Weather/Current/WeatherUnderground.php | 20 -----
.../Service_Weather/lib/Horde/Service/Weather/Current/Wwo.php | 20 -----
.../Service_Weather/lib/Horde/Service/Weather/Period/Base.php | 18 ++++
.../Service_Weather/lib/Horde/Service/Weather/Period/Google.php | 8 --
.../lib/Horde/Service/Weather/Period/WeatherUnderground.php | 16 ----
.../Service_Weather/lib/Horde/Service/Weather/Period/Wwo.php | 14 ---
8 files changed, 38 insertions(+), 95 deletions(-)
http://git.horde.org/horde-git/-/commit/81b61d1f7cc255f65378b95def808cbf2a1862c9
-----------------------------------------------------------------------
commit ba304748889c8a052700f89de98157c68e76d3ee
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Dec 22 01:02:50 2011 -0700
Merge updates to JsMin filter
.../Text_Filter/lib/Horde/Text/Filter/JavascriptMinify/JsMin.php | 24 ++++-
1 files changed, 19 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/ba304748889c8a052700f89de98157c68e76d3ee
-----------------------------------------------------------------------
commit 6cb9a16e9f3a06a77a4c626826055715c2e66b0f
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Dec 23 12:03:32 2011 -0700
Correctly add status info to pre-existing entry
imp/lib/Mime/Viewer/Related.php | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/6cb9a16e9f3a06a77a4c626826055715c2e66b0f
-----------------------------------------------------------------------
commit ec6c8f7c1460a320ca3864cde75e1009150db661
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 23 14:10:06 2011 -0500
default to the currently selected units
framework/Service_Weather/lib/Horde/Service/Weather/Base.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/ec6c8f7c1460a320ca3864cde75e1009150db661
-----------------------------------------------------------------------
commit 9d1221a19cda2ff179d5c21958e5dfd0f376a9d7
Merge: 3d662bb ec6c8f7
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Dec 23 12:18:50 2011 -0700
Merge branch 'master' into develop
Conflicts:
framework/Core/package.xml
framework/Date/package.xml
framework/ActiveSync/package.xml | 28 +++-
framework/Core/package.xml | 27 ++++-
framework/Date/package.xml | 19 +++-
framework/Service_Weather/lib/Horde/Service/Weather/Base.php | 14 ++-
.../Service_Weather/lib/Horde/Service/Weather/Current/Base.php | 20 +++
.../Service_Weather/lib/Horde/Service/Weather/Period/Base.php | 18 +++
.../Service_Weather/lib/Horde/Service/Weather/Period/Google.php | 10 +--
.../lib/Horde/Service/Weather/Period/WeatherUnderground.php | 28 ++---
.../Service_Weather/lib/Horde/Service/Weather/Period/Wwo.php | 18 +---
.../lib/Horde/Service/Weather/WeatherUnderground.php | 10 ++
framework/Service_Weather/package.xml | 10 +-
.../Service_Weather/test/Horde/Service/Weather/GoogleTest.php | 8 ++
.../test/Horde/Service/Weather/WundergroundTest.php | 4 +
framework/Service_Weather/test/Horde/Service/Weather/WwoTest.php | 8 ++
.../test/Horde/Service/Weather/fixtures/boston_wunderground.json | 2 +
.../Text_Filter/lib/Horde/Text/Filter/JavascriptMinify/JsMin.php | 24 +++-
imp/lib/Mime/Viewer/Related.php | 6 +
17 files changed, 189 insertions(+), 65 deletions(-)
http://git.horde.org/horde-git/-/commit/9d1221a19cda2ff179d5c21958e5dfd0f376a9d7
More information about the commits
mailing list