[commits] Horde branch FRAMEWORK_5_1 updated. 5706e61d5e11bb4b69c19825d3e659ac5e48e747
Michael J. Rubinsky
mrubinsk at horde.org
Mon Feb 10 16:46:14 UTC 2014
The branch "FRAMEWORK_5_1" has been updated.
The following is a summary of the commits.
from: 669b426216fb0a862d1a6ea099f231cdfbf62813
e79d363 Fix updating of f/b information when date changes.
f366c61 $event is type-hinted, it can never be an array.
4dc0f44 One more place we don't need an is_array check.
9e62fa2 Fix display of resource response icons.
f55e1cd Fix showing "yesterday" as free, when it should be unknown.
a642d98 Property compare before/after resource arrays.
3646e7e Events added to a resource calendar should always be STATUS_CONFIRMED
ade64fa Don't bother checking resource availability if event is cancelled.
d2fab97 Cancel the event on the resource's calendar.
d2e84ea Fix this in the correct place.
fb7c5cc Merge from master: must be case insensitive.
855a41a Method signature must match the parent class.
bd93fba Body is optional, don't include it if we don't have a description.
19396cb Fix css class.
5706e61 Getting caught up on some merges from master.
Summary: http://github.com/horde/horde/compare/669b426216fb0a862d1a6ea099f231cdfbf62813...5706e61d5e11bb4b69c19825d3e659ac5e48e747
-----------------------------------------------------------------------
commit e79d36340fe4ff4835031e8bc6f97162f496f693
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Wed Jan 8 13:36:59 2014 -0500
Fix updating of f/b information when date changes.
Fixes updating freebusy information when changing date via either
the textbox or date picker on new events before saving (both were broken),
as well as via the date picker when editing existing events.
Bug: 12676
kronolith/js/kronolith.js | 47 ++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 24 deletions(-)
http://github.com/horde/horde/commit/e79d36340fe4ff4835031e8bc6f97162f496f693
http://git.horde.org/horde-git/-/commit/e79d36340fe4ff4835031e8bc6f97162f496f693
-----------------------------------------------------------------------
commit f366c6145c499b10e33b8c00aa9ad627a83ac301
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Jan 9 09:42:05 2014 -0500
$event is type-hinted, it can never be an array.
kronolith/lib/Resource/Single.php | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
http://github.com/horde/horde/commit/f366c6145c499b10e33b8c00aa9ad627a83ac301
http://git.horde.org/horde-git/-/commit/f366c6145c499b10e33b8c00aa9ad627a83ac301
-----------------------------------------------------------------------
commit 4dc0f449a02ca3e25e5fa758cb2c844a023a7c64
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Jan 9 09:44:28 2014 -0500
One more place we don't need an is_array check.
kronolith/lib/Resource/Single.php | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
http://github.com/horde/horde/commit/4dc0f449a02ca3e25e5fa758cb2c844a023a7c64
http://git.horde.org/horde-git/-/commit/4dc0f449a02ca3e25e5fa758cb2c844a023a7c64
-----------------------------------------------------------------------
commit 9e62fa29030a21429558cb03c38d7bed2f8e82c7
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Jan 9 10:04:46 2014 -0500
Fix display of resource response icons.
kronolith/js/kronolith.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/9e62fa29030a21429558cb03c38d7bed2f8e82c7
http://git.horde.org/horde-git/-/commit/9e62fa29030a21429558cb03c38d7bed2f8e82c7
-----------------------------------------------------------------------
commit f55e1cd8565807d4a575c24fa12a7e133fae9492
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Jan 9 13:47:34 2014 -0500
Fix showing "yesterday" as free, when it should be unknown.
kronolith/js/kronolith.js | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/f55e1cd8565807d4a575c24fa12a7e133fae9492
http://git.horde.org/horde-git/-/commit/f55e1cd8565807d4a575c24fa12a7e133fae9492
-----------------------------------------------------------------------
commit a642d98b61c718657a3312b3ac9a3ceca4e8b0ee
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Jan 13 12:21:40 2014 -0500
Property compare before/after resource arrays.
array_merge won't work since the $values are hashes.
kronolith/lib/Event.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
http://github.com/horde/horde/commit/a642d98b61c718657a3312b3ac9a3ceca4e8b0ee
http://git.horde.org/horde-git/-/commit/a642d98b61c718657a3312b3ac9a3ceca4e8b0ee
-----------------------------------------------------------------------
commit 3646e7e51fe253c974998781dc659f19d63fc251
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Jan 13 12:31:23 2014 -0500
Events added to a resource calendar should always be STATUS_CONFIRMED
kronolith/lib/Resource/Single.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/3646e7e51fe253c974998781dc659f19d63fc251
http://git.horde.org/horde-git/-/commit/3646e7e51fe253c974998781dc659f19d63fc251
-----------------------------------------------------------------------
commit ade64faab8a7a592a9c42b9a59bd158bd01fe3cb
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Jan 13 12:58:07 2014 -0500
Don't bother checking resource availability if event is cancelled.
kronolith/lib/Event.php | 76 ++++++++++++++++++++++++----------------------
1 files changed, 40 insertions(+), 36 deletions(-)
http://github.com/horde/horde/commit/ade64faab8a7a592a9c42b9a59bd158bd01fe3cb
http://git.horde.org/horde-git/-/commit/ade64faab8a7a592a9c42b9a59bd158bd01fe3cb
-----------------------------------------------------------------------
commit d2fab9796560658685f77ffe6562687d835f315d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Jan 13 13:17:24 2014 -0500
Cancel the event on the resource's calendar.
kronolith/lib/Event.php | 15 +++++++++++++++
kronolith/lib/Resource/Single.php | 2 +-
2 files changed, 16 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/d2fab9796560658685f77ffe6562687d835f315d
http://git.horde.org/horde-git/-/commit/d2fab9796560658685f77ffe6562687d835f315d
-----------------------------------------------------------------------
commit d2e84ea86cd7460006cfd8d4410f93500843ee94
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Jan 13 14:43:52 2014 -0500
Fix this in the correct place.
kronolith/lib/View/EditEvent.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/d2e84ea86cd7460006cfd8d4410f93500843ee94
http://git.horde.org/horde-git/-/commit/d2e84ea86cd7460006cfd8d4410f93500843ee94
-----------------------------------------------------------------------
commit fb7c5ccb2dbb6b5b91456dfe59298e9bf2dbeaa8
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 10 11:38:09 2014 -0500
Merge from master: must be case insensitive.
kronolith/lib/Api.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/fb7c5ccb2dbb6b5b91456dfe59298e9bf2dbeaa8
http://git.horde.org/horde-git/-/commit/fb7c5ccb2dbb6b5b91456dfe59298e9bf2dbeaa8
-----------------------------------------------------------------------
commit 855a41a2e7b6769cb73fff9c9cd6685b717ed583
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Jan 31 10:09:17 2014 -0500
Method signature must match the parent class.
kronolith/lib/Day.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/855a41a2e7b6769cb73fff9c9cd6685b717ed583
http://git.horde.org/horde-git/-/commit/855a41a2e7b6769cb73fff9c9cd6685b717ed583
-----------------------------------------------------------------------
commit bd93fba4e384c29e5a29dc4c2b793eb0e501885c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Jan 31 15:55:35 2014 -0500
Body is optional, don't include it if we don't have a description.
kronolith/lib/Event.php | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
http://github.com/horde/horde/commit/bd93fba4e384c29e5a29dc4c2b793eb0e501885c
http://git.horde.org/horde-git/-/commit/bd93fba4e384c29e5a29dc4c2b793eb0e501885c
-----------------------------------------------------------------------
commit 19396cb5a6d7211674404a286d05c9f7ea44c72e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Wed Feb 5 21:20:23 2014 -0500
Fix css class.
kronolith/templates/dynamic/task.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/19396cb5a6d7211674404a286d05c9f7ea44c72e
http://git.horde.org/horde-git/-/commit/19396cb5a6d7211674404a286d05c9f7ea44c72e
-----------------------------------------------------------------------
commit 5706e61d5e11bb4b69c19825d3e659ac5e48e747
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 10 11:45:50 2014 -0500
Getting caught up on some merges from master.
kronolith/docs/CHANGES | 5 +++++
kronolith/package.xml | 6 ++++++
2 files changed, 11 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/5706e61d5e11bb4b69c19825d3e659ac5e48e747
http://git.horde.org/horde-git/-/commit/5706e61d5e11bb4b69c19825d3e659ac5e48e747
More information about the commits
mailing list