Changeset [eee61cdf7dceec7b04bc0e98d5d70f1a7e9792e5] by Shawn Balestracci
Revision eee61cdf7dceec7b04bc0e98d5d70f1a7e9792e5,
committed by Shawn Balestracci
· August 18th, 2013 @ 08:34 AM
Merge branch 'production' into rm_production
https://github.com/vegantech/sims/commit/eee61cdf7dceec7b04bc0e98d5...
21 changed files
-
A
app/models/stats/student.rb -
A
app/models/stats/user.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