[commits] Horde branch master updated. 4ed43284ac9acd727d64d19296fd82b1eb246d1d

[Michael J. Rubinsky]

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

from: a4363405c0bb2dca29260f421eabec2cdbb8dc9c

d2e7f44 Break out billable vs non-billable in time summary
4ed4328 Need to use array_intersect here, not array_diff.

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

commit d2e7f4456d08f6c233ef423c0f1d00be2bec3476
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Feb 23 17:48:13 2011 -0500

    Break out billable vs non-billable in time summary

 hermes/js/hermes.js              |   18 ++++++++++++------
 hermes/templates/index/index.inc |   17 ++++++++++++-----
 hermes/themes/default/screen.css |   17 ++++++++++++++---
 3 files changed, 38 insertions(+), 14 deletions(-)

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

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

commit 4ed43284ac9acd727d64d19296fd82b1eb246d1d
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Feb 23 18:14:34 2011 -0500

    Need to use array_intersect here, not array_diff.
    
    We want *only* the blocks for the apps listed in $apps, we don't
    want to exclude those apps. Need to populate $apps with list of all
    apps if we didn't provide any apps to the method.

 framework/Core/lib/Horde/Core/Block/Collection.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

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