| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
Just altering identity.keys did not mark identities as changed. Also we now have a sane default for keys.
|
|
We'll want to get rid of the #public_key and #public_key= functions but they are still used from the users controller. We'll probably have an identity controller instead at some point.
|
|
|
|
|
|
|
|
It's always based on a user and most default values are based on user properties.
|
|
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
|
|
|
|
|
|
|
|
* The APP_CONFIG needs to be initialized in core so that is required from other engines
* paths for load_views need to be relative to the model - not to rails root.
|
|
Signed-off-by: jessib <jessib@leap.se>
|
|
|
|
|
|
different display.
|
|
|
|
Conflicts:
users/app/views/emails/_email.html.haml
|
|
|
|
|
|
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.
|
|
partials have specific CSS for another use, so we will likely want to tweak this.
|
|
Conflicts:
users/test/functional/users_controller_test.rb
|
|
|
|
|
|
|
|
This way we get syntax highlighting and so on.
|
|
|
|
This even works client side. :)
|
|
|
|
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.
|
|
|
|
|
|
that's what it does. Changed all tests to use it instead of the attributes method
|
|
This allows us to reuse add_email from email_aliases_attributes=
|
|
|
|
nor aliases that are the same as the original email for that matter
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
