Changeset [4541597f3d88e0158376c012ee8fc2dd229065f8] by Shawn Balestracci
Revision 4541597f3d88e0158376c012ee8fc2dd229065f8,
committed by Shawn Balestracci
· May 28th, 2012 @ 05:26 AM
Merge branch 'master' into wip
https://github.com/vegantech/sims/commit/4541597f3d88e0158376c012ee...
23 changed files
-
A
app/controllers/student_searches_controller.rb -
A
app/models/student_search.rb -
A
app/views/student_searches/grade.js.rjs -
A
app/views/student_searches/member.js.rjs -
A
app/views/student_searches/show.html.erb -
A
spec/controllers/student_searches_controller_spec.rb -
R
app/views/students/grade_search.js.rjs -
R
app/views/students/member_search.js.rjs -
R
app/views/students/search.html.erb -
M
app/controllers/main_controller.rb -
M
app/controllers/schools_controller.rb -
M
app/controllers/students_controller.rb -
M
app/helpers/application_helper.rb -
M
app/models/right.rb -
M
app/views/students/index.html.erb -
M
config/routes.rb -
M
features/step_definitions/sims_steps.rb -
M
spec/controllers/schools_controller_spec.rb -
M
spec/controllers/students_controller_spec.rb -
M
spec/lib/all_controllers_spec.rb -
M
spec/lib/csv_importer/all_schools_spec.rb -
M
spec/lib/csv_importer/all_students_in_districts_spec.rb -
M
spec/models/user_spec.rb