Changeset [8429d52b822c4bc553650fcb91fd978c7c1ae122] by Shawn Balestracci
Revision 8429d52b822c4bc553650fcb91fd978c7c1ae122,
committed by Shawn Balestracci
· March 20th, 2012 @ 10:51 PM
Merge branch '632_sld_enhancements' into wip
https://github.com/vegantech/sims/commit/8429d52b822c4bc553650fcb91...
62 changed files
-
A
app/controllers/groups/assignments_controller.rb -
A
app/controllers/groups/students_controller.rb -
A
app/controllers/groups/users_controller.rb -
A
app/controllers/special_user_groups_controller.rb -
A
app/views/groups/students/_add_student_link.html.erb -
A
app/views/groups/students/_index.html.erb -
A
app/views/groups/students/_new_student_form.html.erb -
A
app/views/groups/students/_student.html.erb -
A
app/views/groups/students/create.js.rjs -
A
app/views/groups/students/destroy.js.rjs -
A
app/views/groups/students/new.js.rjs -
A
app/views/groups/users/_add_user_assignment_link.html.erb -
A
app/views/groups/users/_index.html.erb -
A
app/views/groups/users/_new_user_assignment_form.html.erb -
A
app/views/groups/users/_user_assignment.html.erb -
A
app/views/groups/users/create.js.rjs -
A
app/views/groups/users/destroy.js.rjs -
A
app/views/groups/users/new.js.rjs -
A
app/views/special_user_groups/_add_special_user_group_link.html.erb -
A
app/views/special_user_groups/_new.html.erb -
A
app/views/special_user_groups/_special_user_group.html.erb -
A
app/views/special_user_groups/_special_user_group_assignment.html.erb -
A
app/views/special_user_groups/create.js.rjs -
A
app/views/special_user_groups/destroy.js.rjs -
A
app/views/special_user_groups/edit.js.rjs -
A
app/views/special_user_groups/show.html.erb -
A
features/school_admin/quicklist.feature -
A
features/school_admin/school_teams.feature -
A
spec/controllers/groups/assignments_controller_spec.rb -
A
spec/controllers/groups/students_controller_spec.rb -
A
spec/controllers/groups/users_controller_spec.rb -
R
app/views/groups/_add_special_user_group_link.html.erb -
R
app/views/groups/_add_student_link.html.erb -
R
app/views/groups/_add_user_assignment_link.html.erb -
R
app/views/groups/_special_user_group.html.erb -
R
app/views/groups/_user_assignment.html.erb -
R
app/views/groups/add_special_form.js.rjs -
R
app/views/groups/add_student.js.rjs -
R
app/views/groups/add_student_form.js.rjs -
R
app/views/groups/add_user.js.rjs -
R
app/views/groups/add_user_form.js.rjs -
R
app/views/groups/_new_student_form.html.erb -
R
app/views/groups/_student.html.erb -
R
app/views/groups/remove_student.js.rjs -
R
app/views/groups/_new_user_assignment_form.html.erb -
R
app/views/groups/remove_user.js.rjs -
R
app/views/groups/_new_special_user_group_form.html.erb -
R
app/views/groups/add_special.js.rjs -
R
app/views/groups/remove_special.js.rjs -
R
app/views/groups/show_special.html.erb -
M
app/controllers/groups_controller.rb -
M
app/controllers/school_teams_controller.rb -
M
app/models/right.rb -
M
app/models/school.rb -
M
app/models/special_user_group.rb -
M
app/views/groups/index.html.erb -
M
app/views/groups/show.html.erb -
M
config/routes.rb -
M
features/school_admin/groups.feature -
M
features/step_definitions/sims_steps.rb -
M
spec/controllers/groups_controller_spec.rb -
M
spec/lib/all_controllers_spec.rb