Changeset [2b7dac984b3d971c8e979ffba487cabf3d01047d] by Shawn Balestracci
Revision 2b7dac984b3d971c8e979ffba487cabf3d01047d,
committed by Shawn Balestracci
· June 11th, 2013 @ 06:58 PM
Merge commit '05d9e488160b0234a61b3da679fed2d70bdf2321' into
production
https://github.com/vegantech/sims/commit/2b7dac984b3d971c8e979ffba4...
24 changed files
-
A
app/controllers/checklist_builder/base.rb -
A
app/models/stats/student.rb -
A
app/models/stats/user.rb -
M
app/controllers/checklist_builder/elements_controller.rb -
M
app/controllers/checklist_builder/questions_controller.rb -
M
app/controllers/interventions/categories_controller.rb -
M
app/controllers/interventions/goals_controller.rb -
M
app/controllers/interventions/objectives_controller.rb -
M
app/helpers/interventions_helper.rb -
M
app/models/student.rb -
M
app/models/user.rb -
M
app/views/interventions/categories/_select.html.erb -
M
app/views/interventions/goals/_select.html.erb -
M
app/views/interventions/objectives/_select.html.erb -
M
features/regular_user/custom_interventions.feature -
M
features/regular_user/custom_probes.feature -
M
features/regular_user/intervention.feature -
M
features/regular_user/intervention_participants.feature -
M
features/regular_user/sims_demo_walkthrough.feature -
M
features/step_definitions/subscenarios.rb -
M
lib/populate_intervention_dropdowns.rb -
M
spec/controllers/interventions/categories_controller_spec.rb -
M
spec/controllers/interventions/goals_controller_spec.rb -
M
spec/controllers/interventions/objectives_controller_spec.rb