[commits] Horde branch develop updated. e9828c1cd40ace5e35d7930c6688f839069e4771
Michael J. Rubinsky
mrubinsk at horde.org
Sun Dec 4 23:23:48 UTC 2011
The branch "develop" has been updated.
The following is a summary of the commits.
from: 51c89118297f273da77220fb1719cd6969cac9db
69c0001 Add more WU strings, update Dutch (Request #10836).
bda00d6 Update Dutch translation (Request #10837).
3322396 changes
1826582 Call the driver's listEvents method here too.
72d709b Add missing assignment (Bug: 10829).
9b48878 Fix setting the proper calendar when only a single internal calendar exists.
a664e7e wrapping
2982e37 Fix perms check.
dbc70cb The calendar type is passed in the get parameters now.
6f48d4e Clean up some strings.
703771f Refactor a bit of resource calendar handling.
edfb1e8 Need to query the DB to determine this now.
385e668 Catch cases where 'internal_' is prepended to the calendar id.
95a229c Fix keyboard navigation of time fields, remove redundant keyUp handler.
b5b869b Port time-selection fixes from Kronolith to Nag (Krono bug was #10737).
ed83074 Fix keyboard navigation of time fields.
f33d86f BFN
e9828c1 Merge branch 'master' into develop
-----------------------------------------------------------------------
commit 69c000154265c4bfef882b295b4740e45faa6657
Author: Jan Schneider <jan at horde.org>
Date: Sun Dec 4 15:00:27 2011 +0100
Add more WU strings, update Dutch (Request #10836).
.../lib/Horde/Service/Weather/Period/WeatherUnderground.php | 2 +-
.../lib/Horde/Service/Weather/WeatherUnderground_Strings.php | 19 +-
framework/Service_Weather/locale/Horde_Service_Weather.pot | 276 ++++-
.../locale/nl/LC_MESSAGES/Horde_Service_Weather.mo | Bin 8306 -> 11809 bytes
.../locale/nl/LC_MESSAGES/Horde_Service_Weather.po | 293 ++++-
5 files changed, 549 insertions(+), 41 deletions(-)
http://git.horde.org/horde-git/-/commit/69c000154265c4bfef882b295b4740e45faa6657
-----------------------------------------------------------------------
commit bda00d630519f885727ff1f5b0c9ed0f0b004abf
Author: Jan Schneider <jan at horde.org>
Date: Sun Dec 4 15:06:21 2011 +0100
Update Dutch translation (Request #10837).
chora/locale/nl/LC_MESSAGES/chora.mo | Bin 148579 -> 63091 bytes
gollem/locale/nl/LC_MESSAGES/gollem.mo | Bin 150898 -> 65743 bytes
horde/docs/CHANGES | 1 +
horde/docs/CREDITS | 1 +
horde/locale/nl/LC_MESSAGES/horde.mo | Bin 49163 -> 56105 bytes
horde/locale/nl/LC_MESSAGES/horde.po | 2627 +++++++++++---------------
horde/package.xml | 2 +
imp/locale/nl/LC_MESSAGES/imp.mo | Bin 150014 -> 156724 bytes
ingo/locale/nl/LC_MESSAGES/ingo.mo | Bin 158596 -> 73372 bytes
ingo/locale/nl/LC_MESSAGES/ingo.po | 10 +-
jonah/locale/nl/LC_MESSAGES/jonah.mo | Bin 157648 -> 72653 bytes
kronolith/locale/nl/LC_MESSAGES/kronolith.mo | Bin 176216 -> 91659 bytes
kronolith/locale/nl/LC_MESSAGES/kronolith.po | 8 +-
mnemo/locale/nl/LC_MESSAGES/mnemo.mo | Bin 150087 -> 64926 bytes
nag/locale/nl/LC_MESSAGES/nag.mo | Bin 158417 -> 73425 bytes
nag/locale/nl/LC_MESSAGES/nag.po | 8 +-
passwd/locale/nl/LC_MESSAGES/passwd.mo | Bin 143885 -> 58420 bytes
trean/locale/nl/LC_MESSAGES/trean.mo | Bin 152512 -> 67079 bytes
turba/locale/nl/LC_MESSAGES/turba.mo | Bin 167057 -> 82475 bytes
whups/locale/nl/LC_MESSAGES/whups.mo | Bin 174263 -> 89105 bytes
20 files changed, 1119 insertions(+), 1538 deletions(-)
http://git.horde.org/horde-git/-/commit/bda00d630519f885727ff1f5b0c9ed0f0b004abf
-----------------------------------------------------------------------
commit 332239641f447e33c2342fd451438caa4df9bf07
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Wed Nov 30 23:35:05 2011 -0500
changes
kronolith/docs/CHANGES | 2 ++
kronolith/package.xml | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/332239641f447e33c2342fd451438caa4df9bf07
-----------------------------------------------------------------------
commit 182658227a94ff2018a8f2454994f59ad30924d2
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Dec 1 17:48:00 2011 -0500
Call the driver's listEvents method here too.
kronolith/lib/Resource/Group.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/182658227a94ff2018a8f2454994f59ad30924d2
-----------------------------------------------------------------------
commit 72d709bc7c5262f039b50f41deb8b3a4149216c0
Author: arjen+horde (at) de-korte (dot) org <arjen+horde at de-korte.org>
Date: Sun Dec 4 15:21:08 2011 -0500
Add missing assignment (Bug: 10829).
Signed-off-by: Michael J Rubinsky <mrubinsk at horde.org>
horde/lib/Block/Weather.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/72d709bc7c5262f039b50f41deb8b3a4149216c0
-----------------------------------------------------------------------
commit 9b4887833f4977afd8e3800721d8dee32403e1bb
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 4 15:25:34 2011 -0500
Fix setting the proper calendar when only a single internal calendar exists.
kronolith/new.php | 7 ++++++-
kronolith/templates/edit/edit.inc | 3 +--
2 files changed, 7 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/9b4887833f4977afd8e3800721d8dee32403e1bb
-----------------------------------------------------------------------
commit a664e7eda11bc045df2697775a236a27f82a886a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 4 15:36:28 2011 -0500
wrapping
kronolith/lib/Resource/Base.php | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
http://git.horde.org/horde-git/-/commit/a664e7eda11bc045df2697775a236a27f82a886a
-----------------------------------------------------------------------
commit 2982e377139d34b00bdc2db8c846e837f499e5cc
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 4 15:38:36 2011 -0500
Fix perms check.
Use the same perms check for resources everywhere.
kronolith/lib/Resource/Base.php | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/2982e377139d34b00bdc2db8c846e837f499e5cc
-----------------------------------------------------------------------
commit dbc70cb3b768e35206b4fc4fc000fe0aa85a99ff
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 4 15:50:19 2011 -0500
The calendar type is passed in the get parameters now.
kronolith/delete.php | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/dbc70cb3b768e35206b4fc4fc000fe0aa85a99ff
-----------------------------------------------------------------------
commit 6f48d4e8da58491255c7b498b5c67a187db9b108
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 4 16:34:20 2011 -0500
Clean up some strings.
Related to Bug: 10829
horde/lib/Block/Weather.php | 68 +++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 38 deletions(-)
http://git.horde.org/horde-git/-/commit/6f48d4e8da58491255c7b498b5c67a187db9b108
-----------------------------------------------------------------------
commit 703771f49c694527759070ae4edb54c45a9be2dd
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 4 16:49:49 2011 -0500
Refactor a bit of resource calendar handling.
Bring resource calendar handling more in line with modern kronolith code,
and make it easier to implement in dynamic view.
Fixes Bug: 10827
kronolith/add.php | 5 ++
kronolith/docs/CHANGES | 1 +
kronolith/lib/Calendar/Resource.php | 101 +++++++++++++++++++++++++++++++++++
kronolith/lib/Kronolith.php | 3 +-
kronolith/lib/Resource.php | 2 +-
kronolith/lib/Resource/Single.php | 2 +-
kronolith/new.php | 4 +-
kronolith/package.xml | 10 +++-
kronolith/resources/index.php | 7 ++-
kronolith/templates/edit/edit.inc | 2 +-
10 files changed, 126 insertions(+), 11 deletions(-)
create mode 100644 kronolith/lib/Calendar/Resource.php
http://git.horde.org/horde-git/-/commit/703771f49c694527759070ae4edb54c45a9be2dd
-----------------------------------------------------------------------
commit edfb1e8d41894763e8d4a385e0fae3b164ae716b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 4 17:00:59 2011 -0500
Need to query the DB to determine this now.
kronolith/lib/Driver/Resource.php | 17 +++++++++++++++++
kronolith/lib/Kronolith.php | 2 +-
kronolith/lib/Resource.php | 16 ----------------
3 files changed, 18 insertions(+), 17 deletions(-)
http://git.horde.org/horde-git/-/commit/edfb1e8d41894763e8d4a385e0fae3b164ae716b
-----------------------------------------------------------------------
commit 385e6688d92ab6d531213370b7218982e2fa2255
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 4 17:27:14 2011 -0500
Catch cases where 'internal_' is prepended to the calendar id.
When urls are build directly from the results of Kronolith::listCalendars(),
the driver names are prepended to the calendar ids.
Bug: 10767
kronolith/docs/CHANGES | 2 ++
kronolith/lib/Kronolith.php | 3 +++
kronolith/package.xml | 2 ++
3 files changed, 7 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/385e6688d92ab6d531213370b7218982e2fa2255
-----------------------------------------------------------------------
commit 95a229c51f7c6cf2d00e05cb4393f7ed8ea8ee9a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 4 17:59:05 2011 -0500
Fix keyboard navigation of time fields, remove redundant keyUp handler.
Bug: 10799
kronolith/js/kronolith.js | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
http://git.horde.org/horde-git/-/commit/95a229c51f7c6cf2d00e05cb4393f7ed8ea8ee9a
-----------------------------------------------------------------------
commit b5b869b884dc45715d5945610eccf5dfc54dfec4
Author: Chuck Hagenbuch <chuck at horde.org>
Date: Tue Nov 15 10:17:58 2011 -0500
Port time-selection fixes from Kronolith to Nag (Krono bug was #10737).
nag/js/task.js | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/b5b869b884dc45715d5945610eccf5dfc54dfec4
-----------------------------------------------------------------------
commit ed83074a234a35a43d67e44a073221e4cf926956
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 4 18:06:10 2011 -0500
Fix keyboard navigation of time fields.
Ported from Kronolith Bug: 10799
nag/js/task.js | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/ed83074a234a35a43d67e44a073221e4cf926956
-----------------------------------------------------------------------
commit f33d86f5c14f6287740cfce777ffb8b8fa3b368c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 4 18:19:11 2011 -0500
BFN
kronolith/docs/CHANGES | 2 ++
kronolith/package.xml | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/f33d86f5c14f6287740cfce777ffb8b8fa3b368c
-----------------------------------------------------------------------
commit e9828c1cd40ace5e35d7930c6688f839069e4771
Merge: 51c8911 f33d86f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 4 18:23:35 2011 -0500
Merge branch 'master' into develop
Conflicts:
horde/lib/Block/Weather.php
horde/package.xml
kronolith/package.xml
nag/js/task.js
chora/locale/nl/LC_MESSAGES/chora.mo | Bin 148579 -> 63091 bytes
.../lib/Horde/Service/Weather/Period/WeatherUnderground.php | 2 +-
.../lib/Horde/Service/Weather/WeatherUnderground_Strings.php | 19 +-
framework/Service_Weather/locale/Horde_Service_Weather.pot | 276 +-
.../locale/nl/LC_MESSAGES/Horde_Service_Weather.mo | Bin 8306 -> 11809 bytes
.../locale/nl/LC_MESSAGES/Horde_Service_Weather.po | 293 +-
gollem/locale/nl/LC_MESSAGES/gollem.mo | Bin 150898 -> 65743 bytes
horde/docs/CHANGES | 1 +
horde/docs/CREDITS | 1 +
horde/lib/Block/Weather.php | 68 +-
horde/locale/nl/LC_MESSAGES/horde.mo | Bin 49163 -> 56105 bytes
horde/locale/nl/LC_MESSAGES/horde.po | 2627 ++---
horde/package.xml | 1 +
imp/locale/nl/LC_MESSAGES/imp.mo | Bin 150014 -> 156724 bytes
ingo/locale/nl/LC_MESSAGES/ingo.mo | Bin 158596 -> 73372 bytes
ingo/locale/nl/LC_MESSAGES/ingo.po | 10 +-
jonah/locale/nl/LC_MESSAGES/jonah.mo | Bin 157648 -> 72653 bytes
kronolith/add.php | 5 +
kronolith/delete.php | 8 +-
kronolith/docs/CHANGES | 7 +
kronolith/js/kronolith.js | 30 +-
kronolith/lib/Calendar/Resource.php | 101 +
kronolith/lib/Driver/Resource.php | 17 +
kronolith/lib/Kronolith.php | 8 +-
kronolith/lib/Resource.php | 18 +-
kronolith/lib/Resource/Base.php | 23 +-
kronolith/lib/Resource/Group.php | 3 +-
kronolith/lib/Resource/Single.php | 2 +-
kronolith/locale/nl/LC_MESSAGES/kronolith.mo | Bin 176216 -> 91659 bytes
kronolith/locale/nl/LC_MESSAGES/kronolith.po | 8 +-
kronolith/new.php | 9 +-
kronolith/package.xml | 8 +-
kronolith/resources/index.php | 7 +-
kronolith/templates/edit/edit.inc | 5 +-
mnemo/locale/nl/LC_MESSAGES/mnemo.mo | Bin 150087 -> 64926 bytes
nag/js/task.js | 16 +-
nag/locale/nl/LC_MESSAGES/nag.mo | Bin 158417 -> 73425 bytes
nag/locale/nl/LC_MESSAGES/nag.po | 8 +-
passwd/locale/nl/LC_MESSAGES/passwd.mo | Bin 143885 -> 58420 bytes
trean/locale/nl/LC_MESSAGES/trean.mo | Bin 152512 -> 67079 bytes
turba/locale/nl/LC_MESSAGES/turba.mo | Bin 167057 -> 82475 bytes
whups/locale/nl/LC_MESSAGES/whups.mo | Bin 174263 -> 89105 bytes
42 files changed, 1904 insertions(+), 1677 deletions(-)
http://git.horde.org/horde-git/-/commit/e9828c1cd40ace5e35d7930c6688f839069e4771
More information about the commits
mailing list