User: kreynen Branch: DRUPAL-6--2 Date: Fri, 11 Jun 2010 20:52:34 +0000 Modified files: /modules/merci merci.module Log message: Reverted a change darrick made to merci_get_reservable_items to fix issue with Resources conflicting. Added merci_load_reservations_for_node_in_timespan to fix conflict grid display. Changed link in grid to Reservation instead of placeholder node. Removed permission so if Reservation nodes are published users can see who made a reservation that conflicts with theirs and possible work out a change on their own. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.module...