Changeset [507181aada5a003e48147bd6e36700e1d1f1d6cc] by Shawn Balestracci
Revision 507181aada5a003e48147bd6e36700e1d1f1d6cc,
committed by Shawn Balestracci
· January 8th, 2012 @ 11:03 PM
Merge branch 'master' into checklist_cucumber_feature
https://github.com/vegantech/sims/commit/507181aada5a003e48147bd6e3...
30 changed files
-
A
app/models/probe_graph.rb -
A
features/regular_user/intervention_comments.feature -
A
features/step_definitions/intervention_comment_steps.rb -
A
spec/models/probe_graph_spec.rb -
A
vendor/plugins/coveralls/lib/tasks/coveralls_tasks.rake -
R
vendor/plugins/coveralls/tasks/coveralls_tasks.rake -
M
app/controllers/application_controller.rb -
M
app/controllers/interventions/probe_assignments_controller.rb -
M
app/controllers/interventions_controller.rb -
M
app/controllers/personal_groups_controller.rb -
M
app/controllers/students_controller.rb -
M
app/helpers/probes_helper.rb -
M
app/helpers/students_helper.rb -
M
app/metal/chart_proxy.rb -
M
app/models/district.rb -
M
app/models/intervention.rb -
M
app/models/intervention_probe_assignment.rb -
M
app/views/grouped_progress_entries/show.html.erb -
M
config/initializers/gchart.rb -
M
lib/populate_intervention_dropdowns.rb -
M
lib/tasks/cucumber.rake -
M
lib/tasks/rcov.rake -
M
public/javascripts/application.js -
M
spec/controllers/application_controller_spec.rb -
M
spec/controllers/personal_groups_controller_spec.rb -
M
spec/helpers/probes_helper_spec.rb -
M
spec/helpers/students_helper_spec.rb -
M
spec/lib/populate_intervention_dropdowns_spec.rb -
M
spec/models/intervention_probe_assignment_spec.rb -
M
spec/models/intervention_spec.rb