Changeset [3520b518daf9a83288950e97b579a98fcc2cf039] by Shawn Balestracci
May 8th, 2012 @ 09:51 PM
Merge branch '630_admins_of_schools' into wip
Conflicts:
app/models/right.rb
https://github.com/vegantech/sims/commit/3520b518daf9a83288950e97b5...
Committed by Shawn Balestracci
- A app/controllers/school_admin_controller.rb
- A spec/controllers/school_admin_controller_spec.rb
- A spec/csv/admins_of_schools.csv
- M app/controllers/application_controller.rb
- M app/controllers/groups/assignments_controller.rb
- M app/controllers/groups_controller.rb
- M app/controllers/main_controller.rb
- M app/controllers/quicklist_items_controller.rb
- M app/controllers/school_teams_controller.rb
- M app/controllers/schools_controller.rb
- M app/controllers/special_user_groups_controller.rb
- M app/models/right.rb
- M app/models/role.rb
- M app/models/user.rb
- M app/views/district/schools/_label_form.html.erb
- M app/views/district/users/_label_form.html.erb
- M config/routes.rb
- M doc/oneoffscripts.txt
- M lib/csv_importer/admins_of_schools.rb
- M lib/csv_importer/school_admins.rb
- M spec/controllers/application_controller_spec.rb
- M spec/controllers/schools_controller_spec.rb
- M spec/lib/all_controllers_spec.rb
- M spec/lib/csv_importer/admins_of_schools_spec.rb
- M spec/lib/csv_importer/school_admins_spec.rb
- M spec/models/user_spec.rb
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