18 Dec
2009
18 Dec
'09
5:16 p.m.
User: kreynen Branch: DRUPAL-6--1 Date: Fri, 18 Dec 2009 16:16:21 +0000 Modified files: /modules/merci merci.module Log message: committed initial changes for #462758, but commented out the $tokens['node']['merci_resources'] until that error is resolved. Also added admin_hours setting for the conflict grid to show hours outside of hours of operation. I set a default for that avraible of 07:00-23:00. That shoudl address #543244 where users don't see the grid when they configure MERCI without setting the hours of operation. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.module...