Changeset [8ea6e5c3c162f6bdd030d64574d1bfbc75d54262] by Shawn Balestracci
Revision 8ea6e5c3c162f6bdd030d64574d1bfbc75d54262,
committed by Shawn Balestracci
· January 22nd, 2009 @ 04:44 PM
Merge branch 'q' http://github.com/vegantech/sims...
27 changed files
-
M
app/controllers/enrollments_controller.rb -
M
app/controllers/user_school_assignments_controller.rb -
M
app/models/student.rb -
M
app/models/user.rb -
M
app/views/enrollments/_enrollment.html.erb -
M
app/views/enrollments/_new.html.erb -
M
app/views/enrollments/_new_link.html.erb -
M
app/views/enrollments/create.js.rjs -
M
app/views/enrollments/edit.html.erb -
M
app/views/enrollments/index.html.erb -
M
app/views/enrollments/new.html.erb -
M
app/views/enrollments/new.js.rjs -
M
app/views/enrollments/show.html.erb -
M
app/views/user_school_assignments/_assignment.html.erb -
M
app/views/user_school_assignments/_new.html.erb -
M
app/views/user_school_assignments/_new_link.html.erb -
M
app/views/user_school_assignments/create.js.rjs -
M
app/views/user_school_assignments/edit.html.erb -
M
app/views/user_school_assignments/index.html.erb -
M
app/views/user_school_assignments/new.html.erb -
M
app/views/user_school_assignments/new.js.rjs -
M
app/views/user_school_assignments/show.html.erb -
M
spec/controllers/enrollments_controller_spec.rb -
M
spec/controllers/user_school_assignments_controller_spec.rb -
M
spec/controllers/user_school_assignments_routing_spec.rb -
M
spec/lib/all_controllers_spec.rb -
M
test/fixtures/rights.yml