summaryrefslogtreecommitdiff
path: root/users/app/controllers/users_controller.rb
AgeCommit message (Collapse)Author
2013-07-08Merge branch 'master' into feature/disable_accountjessib
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
2013-07-04redirect to root after user destroyelijah
2013-07-04user tests -- user update has been moved entirely to api controller, so fix ↵elijah
tests to reflect this.
2013-07-04users - make a nice overview page (well, nice enough) and better users ↵elijah
index/search.
2013-07-04users engine changes - rewrite of the views, separate email settings to a ↵elijah
separate controller, make users_controller html only and v1/users_controller json only.
2013-07-03Accounts can be enabled or not. Admins can edit this property.jessib
2013-06-20For removing account, redirect to root path, and ask confirmation message:jessib
https://leap.se/code/issues/2923
2013-02-25Admins cannot update a user. Eventually we will want to allow admins to ↵jessib
update some user fields.
2013-02-19Only check if last email alias is valid if the user has a last email alias.jessib
2013-01-29Allow PUT API to update user.jessib
2013-01-18Merge remote-tracking branch 'origin/master' into feature/fixed-email-addressAzul
Conflicts: users/app/views/emails/_email.html.haml
2013-01-17Should be able to create a user when not logged in.jessib
This isn't ready to merge, as there is an issue with logging in as an admin in the test.
2013-01-17Merge branch 'master' into feature/tickets_controllers_simplificationjessib
Conflicts: users/app/controllers/users_controller.rb
2013-01-17Deal with corner case where we don't have authenticated user. Will write a ↵jessib
test after merging in show view for users.
2013-01-17minor fixes to validation workflowAzul
2013-01-15For both users and tickets, if the object is not found and the current user ↵jessib
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.
2013-01-08Adding show view for users.jessib
2012-12-20render proper tab on updateAzul
2012-12-18refactor: using tab partials for user editingAzul
2012-12-18refactored email_alias creation and validationAzul
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.
2012-12-18display errors on email tab properlyAzul
still needs a bit of refactoring in the view
2012-12-17activate email tab after changing email settingsAzul
2012-12-10email format validationsAzul
2012-12-10actually allow adding email aliasesAzul
2012-12-07fixed signup and removed flash that was not getting displayedAzul
I also tried flash.keep(:notice) but that did not help - not sure how to keep the flash until the root url has rendered.
2012-12-07first stub at displaying success messagesAzul
2012-12-07using normal requests for user updates except passwordAzul
password requires ajax for secure remote password to work
2012-12-03enable users to cancel their accountAzul
2012-11-28admins can destroy usersAzul
I changed the permissions a little to be more consistent. Now: * admins can edit users * users can destroy themselves. There's no ui for either of them but theoretically they could. Not sure this is what we want though.
2012-11-26basic typeahead and user querying workingAzul
2012-11-26basic users index with typeahead searchAzul
2012-11-26added admin menu and user index actionAzul
2012-11-26simplified controller and adjusted testsAzul
Also added #assert_json_error to tests.
2012-11-23identify user by id so rerendering the form does not use new invalid loginAzul
2012-11-23test editing user settingsAzul
2012-11-22basic user edit form and actionsAzul
2012-09-27added in leap web users - one repo to rule them allAzul