Changeset [2b1356bebb225aba942302af10ec99a46ab4bca7] by Shawn Balestracci

March 14th, 2012 @ 10:43 PM

Merge branch 'master' into 632_sld_enhancements

Conflicts:

app/models/intervention.rb

https://github.com/vegantech/sims/commit/2b1356bebb225aba942302af10...

Committed by Shawn Balestracci

  • A features/regular_user/grouped_progress_entry.feature
  • M app/mailers/notifications.rb
  • M app/models/grouped_progress_entry.rb
  • M app/models/intervention.rb
  • M app/models/intervention_participant.rb
  • M app/views/notifications/intervention_starting.text.erb
  • M spec/controllers/require_all_controllers_spec.rb
  • M spec/models/grouped_progress_entry_spec.rb
  • M spec/models/intervention_spec.rb
  • M spec/models/require_all_models_helpers_and_libs_spec.rb
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile »

Student Intervention Monitoring System

Shared Ticket Bins