Age | Commit message (Collapse) | Author |
|
|
|
Conflicts:
users/app/controllers/users_controller.rb
users/app/helpers/users_helper.rb
users/app/views/users/edit.html.haml
users/app/views/users/show.html.haml
users/config/locales/en.yml
|
|
|
|
separate controller, make users_controller html only and v1/users_controller json only.
|
|
|
|
|
|
|
|
update some user fields.
|
|
password (they can leave either the same if they just want to change one, but we should make this clearer.)
|
|
Conflicts:
users/app/views/users/edit.html.haml
|
|
different display.
|
|
|
|
|
|
|
|
|
|
This involves a number of other changes like making sure the comparison between aliases and emails still works.
Will do that by removing the @domain.tld from aliases as well.
|
|
|
|
still needs a bit of refactoring in the view
|
|
|
|
|
|
|
|
password requires ajax for secure remote password to work
|
|
|
|
|
|
|
|
|