Changeset [82e96383b25dc76434053a300dab89a35c648629] by Shawn Balestracci
June 22nd, 2012 @ 10:11 AM
Merge branch 'master' into ruby_1.9.3
Conflicts:
app/views/interventions/comments/_comment.html.erb
app/views/interventions/probe_assignments/_intervention_probe_assignment_detail.html.erb
lib/tasks/verify_rcov.rake
https://github.com/vegantech/sims/commit/82e96383b25dc76434053a300d...
Committed by Shawn Balestracci
- A app/controllers/stats_controller.rb
- A app/controllers/student_searches_controller.rb
- A app/models/student_search.rb
- A app/views/interventions/comments/_edit_js.html.erb
- A app/views/layouts/_dev_debug.html.erb
- A app/views/stats/index.html.erb
- A app/views/student_searches/grade.js.rjs
- A app/views/student_searches/member.js.rjs
- A app/views/student_searches/show.html.erb
- A db/migrate/20120524222856_add_all_studentsand_all_schools_to_users.rb
- A db/migrate/20120524223251_move_all_schools_and_all_students_to_users.rb
- A db/migrate/20120524225140_remove_district_id_and_grouptype_from_special_user_groups.rb
- A db/migrate/20120529233808_add_status_to_district_logs.rb
- A features/regular_user/stats.feature
- A features/regular_user/student_flag_summary_report.feature
- A spec/controllers/stats_controller_spec.rb
- A spec/controllers/student_searches_controller_spec.rb
- R app/views/layouts/application.html.erb.rails2
- R app/views/login/_country_state_district.html.erb
- R app/views/main/stats.html.erb
- R app/views/students/grade_search.js.rjs
- R app/views/students/member_search.js.rjs
- R app/views/students/search.html.erb
- R config/deploy/veg-open.rb
- R lib/country_state_district.rb
- R spec/lib/country_state_district_spec.rb
- M Gemfile
- M Gemfile.lock
- M app/controllers/application_controller.rb
- M app/controllers/districts_controller.rb
- M app/controllers/interventions/comments_controller.rb
- M app/controllers/interventions_controller.rb
- M app/controllers/login_controller.rb
- M app/controllers/main_controller.rb
- M app/controllers/schools_controller.rb
- M app/controllers/scripted_controller.rb
- M app/controllers/special_user_groups_controller.rb
- M app/controllers/students_controller.rb
- M app/helpers/application_helper.rb
- M app/helpers/flags_helper.rb
- M app/helpers/move_up_down_buttons_helper.rb
- M app/models/district.rb
- M app/models/district_log.rb
- M app/models/group.rb
- M app/models/intervention.rb
- M app/models/intervention_comment.rb
- M app/models/right.rb
- M app/models/special_user_group.rb
- M app/models/student.rb
- M app/models/user.rb
- M app/models/user_group_assignment.rb
- M app/models/user_school_assignment.rb
- M app/views/consultation_forms/_consultation_form_summary.html.erb
- M app/views/custom_flags/_flag.html.erb
- M app/views/custom_flags/_list.html.erb
- M app/views/district/users/_district_groups.html.erb
- M app/views/groups/students/_add_student_link.html.erb
- M app/views/groups/students/_student.html.erb
- M app/views/groups/users/_add_user_assignment_link.html.erb
- M app/views/groups/users/_user_assignment.html.erb
- M app/views/interventions/_form.html.erb
- M app/views/interventions/comments/_comment.html.erb
- M app/views/interventions/comments/_comments.html.erb
- M app/views/interventions/comments/_form.html.erb
- M app/views/interventions/comments/_index.html.erb
- M app/views/interventions/comments/edit.js.rjs
- M app/views/interventions/probes/_probe.html.erb
- M app/views/layouts/application.html.erb
- M app/views/login/_login.html.erb
- M app/views/principal_overrides/_override.html.erb
- M app/views/reports/student_flag_summary.html.erb
- M app/views/schools/index.html.erb
- M app/views/special_user_groups/_add_special_user_group_link.html.erb
- M app/views/special_user_groups/_special_user_group_assignment.html.erb
- M app/views/student_comments/_comment.html.erb
- M app/views/students/_add_note_link.html.erb
- M app/views/students/_interventions.html.erb
- M app/views/students/_recommendations.html.erb
- M app/views/students/index.html.erb
- M app/views/team_consultations/_commands.html.erb
- M app/views/team_consultations/_draft.html.erb
- M app/views/team_consultations/_team_consultation.html.erb
- M app/views/unattached_interventions/_participant.html.erb
- M config/routes.rb
- M db/schema.rb
- M doc/oneoffscripts.txt
- M features/district_admin/district_log.feature
- M features/regular_user/alternate_entry_points.feature
- M features/school_admin/groups.feature
- M features/step_definitions/custom_probe.rb
- M features/step_definitions/sims_steps.rb
- M features/support/checklist_support.rb
- M features/support/step_helpers.rb
- M lib/create_training_district.rb
- M lib/csv_importer/all_schools.rb
- M lib/csv_importer/all_students_in_districts.rb
- M lib/csv_importer/all_students_in_schools.rb
- M public/javascripts/application.js
- M spec/controllers/application_controller_spec.rb
- M spec/controllers/interventions_controller_spec.rb
- M spec/controllers/login_controller_spec.rb
- M spec/controllers/main_controller_spec.rb
- M spec/controllers/schools_controller_spec.rb
- M spec/controllers/scripted_controller_spec.rb
- M spec/controllers/students_controller_spec.rb
- M spec/helpers/application_helper_spec.rb
- M spec/helpers/flags_helper_spec.rb
- M spec/lib/all_controllers_spec.rb
- M spec/lib/csv_importer/all_schools_spec.rb
- M spec/lib/csv_importer/all_students_in_districts_spec.rb
- M spec/lib/csv_importer/all_students_in_schools_spec.rb
- M spec/lib/csv_importer/user_school_assignments_spec.rb
- M spec/models/district_spec.rb
- M spec/models/enrollment_spec.rb
- M spec/models/intervention_comment_spec.rb
- M spec/models/intervention_spec.rb
- M spec/models/special_user_group_spec.rb
- M spec/models/user_school_assignment_spec.rb
- M spec/models/user_spec.rb
- M test/fixtures/special_user_groups.yml
- M test/fixtures/users.yml
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