Changeset [c99fda7d6c7a904172b6a3cf6c35c0783814b814] by Shawn Balestracci
May 19th, 2012 @ 09:41 AM
Merge branch 'master' into ruby_1.9.3
https://github.com/vegantech/sims/commit/c99fda7d6c7a904172b6a3cf6c...
Committed by Shawn Balestracci
- A app/controllers/school_admin_controller.rb
- A db/migrate/20120510140653_add_forgot_password_to_districts.rb
- A features/regular_user/forgot_password.feature
- A lib/csv_importer/admins_of_schools.rb
- A public/district_upload/empty/admins_of_schools.csv
- A public/district_upload/sample/admins_of_schools.csv
- A spec/controllers/school_admin_controller_spec.rb
- A spec/csv/admins_of_schools.csv
- A spec/lib/csv_importer/admins_of_schools_spec.rb
- M Gemfile
- M Gemfile.lock
- M app/controllers/application_controller.rb
- M app/controllers/groups/assignments_controller.rb
- M app/controllers/groups_controller.rb
- M app/controllers/login_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/mailers/notifications.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 app/views/districts/edit.html.erb
- M app/views/layouts/_menu.html.erb
- M app/views/login/_login.html.erb
- M app/views/login/_whats_new.html.erb
- M app/views/login/change_password.html.erb
- M config/routes.rb
- M db/schema.rb
- M doc/oneoffscripts.txt
- M features/school_admin/quicklist.feature
- M features/step_definitions/sims_steps.rb
- M lib/create_training_district.rb
- M lib/csv_importer/school_admins.rb
- M lib/csv_importer/user_school_assignments.rb
- M lib/import_csv.rb
- M lib/tasks/verify_rcov.rake
- M public/district_upload/empty/empty.zip
- M public/district_upload/sample/sample.zip
- M spec/controllers/application_controller_spec.rb
- M spec/controllers/login_controller_spec.rb
- M spec/controllers/schools_controller_spec.rb
- M spec/lib/all_controllers_spec.rb
- M spec/lib/csv_importer/school_admins_spec.rb
- M spec/lib/csv_importer/user_school_assignments_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