Age | Commit message (Collapse) | Author |
|
|
|
Conflicts:
app/views/layouts/_messages.html.haml
app/views/layouts/application.html.haml
users/app/assets/javascripts/users.js.coffee
|
|
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
|
|
|
|
tests to reflect this.
|
|
|
|
index/search.
|
|
|
|
separate controller, make users_controller html only and v1/users_controller json only.
|
|
validation.
|
|
can't get it working.
|
|
|
|
|
|
|
|
https://leap.se/code/issues/2923
|
|
|
|
|
|
|
|
Feature: API version 1 fixes
|
|
* now we return the user id on login
* allow a destroy request for logging out
* added test for api sessions controller
|
|
update some user fields.
|
|
|
|
There was a weird case with reloading the user in the test if the public key had been unset.
|
|
|
|
|
|
changed the way the presenter works. Will need functional testing
|
|
|
|
|
|
|
|
|
|
Conflicts:
users/app/views/emails/_email.html.haml
|
|
This isn't ready to merge, as there is an issue with logging in as an admin in the test.
|
|
Conflicts:
users/app/controllers/users_controller.rb
|
|
test after merging in show view for users.
|
|
|
|
is an admin, they should see an alert that the object wasn't found, and be redirected to the current controller.
If the object isn't found and the current user is not an admin, then we will continue to give an error about no access, so as not to leak information about what IDs do and don't exist.
|
|
|
|
|
|
|
|
using CouchRests user.email_aliases.build so the casted_by method is set in the alias
Used this to move the validations into the alias itself. This is where they belong and allows us to render the errors inline along the email field they belong to.
|
|
still needs a bit of refactoring in the view
|
|
|
|
|
|
|
|
Conflicts:
users/test/unit/user_test.rb
|
|
|
|
|
|
|
|
|
|
|