Changeset [0d226f82fb7838f9ae67afdd15e7fd09b5072cc1] by Shawn Balestracci
Revision 0d226f82fb7838f9ae67afdd15e7fd09b5072cc1,
committed by Shawn Balestracci
· March 29th, 2012 @ 08:51 PM
Merge branch 'master' into 632_sld_enhancements
Conflicts:
app/reports/html_csv_text.rb
https://github.com/vegantech/sims/commit/0d226f82fb7838f9ae67afdd15...
32 changed files
-
A
app/views/reports/_team_notes.html.erb -
A
app/views/reports/team_notes.csv.erb -
R
app/reports/default_report.rb -
R
app/reports/html_csv_text.rb -
M
Gemfile -
M
Gemfile.lock -
M
app/controllers/reports_controller.rb -
M
app/models/answer.rb -
M
app/models/answer_definition.rb -
M
app/models/checklist.rb -
M
app/models/checklist_definition.rb -
M
app/models/element_definition.rb -
M
app/models/frequency.rb -
M
app/models/goal_definition.rb -
M
app/models/intervention.rb -
M
app/models/intervention_cluster.rb -
M
app/models/intervention_definition.rb -
M
app/models/intervention_participant.rb -
M
app/models/objective_definition.rb -
M
app/models/probe_definition.rb -
M
app/models/question_definition.rb -
M
app/models/recommended_monitor.rb -
M
app/models/student.rb -
M
app/models/student_comment.rb -
M
app/models/tier.rb -
M
app/models/time_length.rb -
M
app/models/user.rb -
M
app/reports/statewide_intervention_definition_summary_report.rb -
M
app/reports/statewide_progress_monitor_summary_report.rb -
M
app/reports/team_notes_report.rb -
M
spec/controllers/reports_controller_spec.rb -
M
spec/reports/team_notes_report_spec.rb