Downloads

Download tar.gz 66.76 KB
MD5: 99cd12778029c3d361b8136a1ef66ee4
SHA-1: 941eafcc6958e6f9267ac2219def6fac524ed065
SHA-256: 800d8de849ed99eede2facb18766972d6c6e6035aed398b400c42e5e9fc3ecff
Download zip 82.39 KB
MD5: 797b819b7737729fc6da67d6ea4ce86d
SHA-1: 5f9636e9708eed8b50f70d1e6d32633577b04951
SHA-256: 0df53a56bda6c39ae05174897100c1f1a066fad81af64730552bbae10d133afd

Release notes

Changes since DRUPAL-6--2-0-BETA1:

  • fixed #605854 (again?)
  • merci_update_5 wasn't returning a valid array, causing update.php to fail.
  • Fixed broken code in merci_list_reservations
  • Migrated admin/merci/manage/reservations and admin/merci/manage/inventory to Calendar Views.
    Added views patch from issue #644268 to create views relationships for reserved items.
  • Fixed #796462.
  • Fixed #796462 much better.
  • Fixed bug for empty flat_options in merci_build_reservable_items
  • Altered fix for empty flat_options in merci_build_reservable_items a bit
  • trying to commit the fix for empty flat_options in merci_build_reservable_items again... not sure what happened last time
  • More fixes for the flat_options array.
  • Readded caching for issue #667270
  • Fixed issue #438478. Content types with allow weekends checked will have their max hours extended if the reservation is made over weekend days. Also added a new permission 'override max hours over closed days' which does the same for reservations made over days that are closed.
  • Fixed issue #730324
  • Fixed issue #687398
  • add code to move MERCI Permission under Open Media System menu when other om modules are installed
  • didn't get 1.1.2.2 changes in the branch... reconciling
  • Fix issue #463896
  • Fixed issue where items not checked back in were still reservable.
  • Fixed issue where not having any reservable content types makes this form useless.
  • Moved calendar views to it's own submodule.
  • Removed calendar module from list of dependencies.
  • Fixed a bunch of bugs in the validation regarding checked out items in old reservations.
  • More fixes for validation. Needs to be tested and will throw a conflict for future reservations made for items legitimately in the checked out state (will fix tomorrow).
  • pulled the merci_ui menus and functions out
  • Fixed conflicts for currently checked out equipment.
  • More validation fixes plus made conflict show up when editing and existing reservation.
  • Housekeeping and fix for bucket items conflicts.
  • Still more bug fixes for validation.
Created by: darrick
Created on: 21 May 2010 at 22:50 UTC
Last updated: 4 Dec 2013 at 02:13 UTC
Git tag 6.x-2.0-beta2
Unsupported

Other releases