Changeset [db90aebb2828831d70f5b28d15454c850f5159a8] by Shawn Balestracci
Revision db90aebb2828831d70f5b28d15454c850f5159a8,
committed by Shawn Balestracci
· January 18th, 2012 @ 03:47 PM
Merge branch 'master' into wip
https://github.com/vegantech/sims/commit/db90aebb2828831d70f5b28d15...
15 changed files
-
M
app/controllers/personal_groups_controller.rb -
M
app/helpers/students_helper.rb -
M
app/models/enrollment.rb -
M
app/models/group.rb -
M
app/models/personal_group.rb -
M
app/models/school.rb -
M
app/models/special_user_group.rb -
M
app/models/user.rb -
M
app/views/students/grade_search.js.rjs -
M
app/views/students/member_search.js.rjs -
M
app/views/students/search.html.erb -
M
spec/helpers/students_helper_spec.rb -
M
spec/models/personal_group_spec.rb -
M
spec/models/school_spec.rb -
M
spec/models/user_spec.rb