Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
and thus merging into feature-admin_users branch.
|
|
config file.
|
|
Conflicts:
users/app/controllers/application_controller.rb
users/app/models/user.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* once tested as helper
* once tested as @controller.send...
|
|
|
|
|
|
|
|
|
|
This reverts commit 439e27ef2792a03e5e50f8b9c607fca512cb1452.
Conflicts:
config/cert
|
|
|
|
|
|
|
|
|
|
long as we have it.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
.gitignore
|
|
|
|
Also removed a few hooks to User.current. Will replace with current_user
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
filename
|
|
handshake.to_json now returns what we want.
|
|
|