Changeset [2144412173f86e9f2276b74f21bac6a7fff0552a] by Shawn Balestracci
December 5th, 2012 @ 11:05 AM
Merge branch 'master' into rails3.1_ruby_1.9.3
Conflicts:
app/views/interventions/categories/_select.html.erb
app/views/interventions/definitions/_select.html.erb
app/views/interventions/goals/_select.html.erb
app/views/interventions/objectives/_select.html.erb
app/views/principal_overrides/_edit.html.erb
app/views/principal_overrides/_new.html.erb
https://github.com/vegantech/sims/commit/2144412173f86e9f2276b74f21...
Committed by Shawn Balestracci
- A public/javascripts/simulate.js
- M app/helpers/interventions_helper.rb
- M app/views/checklist_builder/answers/_answer_definition_2.html.erb
- M app/views/checklist_builder/answers/_rjs_edit_form.html.erb
- M app/views/checklist_builder/answers/_rjs_new_form.html.erb
- M app/views/checklist_builder/elements/_element_definition.html.erb
- M app/views/checklist_builder/elements/_element_definition_2.html.erb
- M app/views/checklist_builder/elements/_rjs_edit_form.html.erb
- M app/views/checklist_builder/elements/_rjs_new_form.html.erb
- M app/views/checklist_builder/questions/_question_definition_2.html.erb
- M app/views/checklist_builder/questions/_rjs_edit_form.html.erb
- M app/views/checklist_builder/questions/_rjs_new_form.html.erb
- M app/views/checklist_builder/questions/edit.html.erb
- M app/views/checklist_builder/questions/new.html.erb
- M app/views/consultation_form_requests/_new.html.erb
- M app/views/groups/students/_new_student_form.html.erb
- M app/views/groups/users/_new_user_assignment_form.html.erb
- M app/views/interventions/categories/_select.html.erb
- M app/views/interventions/definitions/_select.html.erb
- M app/views/interventions/goals/_select.html.erb
- M app/views/interventions/objectives/_select.html.erb
- M app/views/layouts/application.html.erb
- M app/views/principal_overrides/_edit.html.erb
- M app/views/principal_overrides/_new.html.erb
- M app/views/special_user_groups/_new.html.erb
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