Changeset [590f018f9afe4dbedd1e1eedea7723bba1476ee0] by Shawn Balestracci
May 27th, 2012 @ 08:10 AM
Merge branch 'master' into wip
Conflicts:
db/schema.rb
https://github.com/vegantech/sims/commit/590f018f9afe4dbedd1e1eedea...
Committed by Shawn Balestracci
- 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
- M app/controllers/main_controller.rb
- M app/controllers/schools_controller.rb
- M app/controllers/special_user_groups_controller.rb
- M app/controllers/students_controller.rb
- M app/models/district.rb
- M app/models/group.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/district/users/_district_groups.html.erb
- M db/schema.rb
- M features/school_admin/quicklist.feature
- 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 spec/controllers/schools_controller_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/enrollment_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