Changeset [49b5328005ba09be919a2126f8dcabc9868e4ac7] by Shawn Balestracci
May 14th, 2012 @ 03:52 PM
Merge branch '674_forgot_password' update what's new
Conflicts:
app/models/user.rb
spec/models/user_spec.rb
https://github.com/vegantech/sims/commit/49b5328005ba09be919a2126f8...
Committed by Shawn Balestracci
- A db/migrate/20120510140653_add_forgot_password_to_districts.rb
- A features/regular_user/forgot_password.feature
- M app/controllers/login_controller.rb
- M app/mailers/notifications.rb
- M app/models/user.rb
- M app/views/districts/edit.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 db/schema.rb
- M features/step_definitions/sims_steps.rb
- M lib/create_training_district.rb
- M spec/controllers/login_controller_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