Changeset [e13d373b5797669a663044d2f25bec408e1810a5] by Shawn Balestracci
May 7th, 2012 @ 09:20 PM
Merge branch '675_autoassign_school_admin_role' into 630_admins_of_schools
Conflicts:
doc/oneoffscripts.txt
https://github.com/vegantech/sims/commit/e13d373b5797669a663044d2f2...
Committed by Shawn Balestracci
- A app/controllers/school_admin_controller.rb
- A spec/controllers/school_admin_controller_spec.rb
- 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 spec/controllers/application_controller_spec.rb
- M spec/controllers/schools_controller_spec.rb
- M spec/lib/all_controllers_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