summaryrefslogtreecommitdiff
path: root/users/app/controllers
AgeCommit message (Collapse)Author
2013-07-11Merge branch 'master' into feature/authentication_generic_errorjessib
2013-07-09Merge branch 'master' into feature/authentication_generic_errorjessib
Conflicts: app/views/layouts/_messages.html.haml app/views/layouts/application.html.haml users/app/assets/javascripts/users.js.coffee
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-04allow forms with blank email forward.elijah
2013-07-04users - make a nice overview page (well, nice enough) and better users ↵elijah
index/search.
2013-07-04fix user typeaheadelijah
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-04add js to report all errors to the user, not just ones related to field ↵elijah
validation.
2013-07-04add commented out code of how redirect should work with Warden, although I ↵elijah
can't get it working.
2013-07-04new ui - initial user changeselijah
2013-07-03Accounts can be enabled or not. Admins can edit this property.jessib
2013-06-27Want to tweak some, but start to displaying base generic message via javascript.jessib
2013-06-20For removing account, redirect to root path, and ask confirmation message:jessib
https://leap.se/code/issues/2923
2013-04-09return token on successful login via apiAzul
2013-04-02send more meaningful error message on completely failed login attemptAzul
2013-04-02send salt on Session#create without srp ephemeral AAzul
2013-03-01Merge pull request #32 from azul/feature/api-version-1-fixesazul
Feature: API version 1 fixes
2013-02-26api for sessions fixedAzul
* now we return the user id on login * allow a destroy request for logging out * added test for api sessions controller
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-31Remove public key if the key is passed as nil, but not otherwise.jessib
There was a weird case with reloading the user in the test if the public key had been unset.
2013-01-29A user's public_key is the only attribute they should be able to update via API.jessib
2013-01-29Allow PUT API to update user.jessib
2013-01-23added unit tests for user presenterAzul
changed the way the presenter works. Will need functional testing
2013-01-23make raising not found error less confusingAzul
2013-01-22adding json jrd responses to webfingerAzul
2013-01-22render 404 if neededAzul
2013-01-22some basic webfinger routes, controller, presenters, viewsAzul
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-17enabled destroying email aliases - no ajax yet.Azul
2012-12-17Merge branch 'feature/fixing-signup-and-login-issues'Azul
2012-12-13Merge branch 'master' into developAzul
Conflicts: users/test/unit/user_test.rb
2012-12-12Merge branch 'master' into developAzul
2012-12-11make sure can login twiceAzul
2012-12-10email format validationsAzul
2012-12-10actually allow adding email aliasesAzul
2012-12-09basic form added to user settings, simple model createdAzul