summaryrefslogtreecommitdiff
path: root/users/app
AgeCommit message (Collapse)Author
2012-12-01Merge branch 'develop' into help_developAzul
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-26removing merge leftoversAzul
2012-11-26Merge branch 'develop' into help_developAzul
2012-11-26forgot the user partialAzul
2012-11-26Merge branch 'develop' into help_developjessib
2012-11-26Merge branch 'develop' into help_developjessib
Conflicts: users/app/views/sessions/_nav.html.haml
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-26minor: client side validations fixed + .json requestAzul
2012-11-26basic changing of password and login workingAzul
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-11-22fixed testsAzul
2012-11-22beautify login workflowAzul
* translating error messages * not caching login and password in js anymore * catching non responses
2012-11-22using client side validations for loginAzul
2012-11-22using the new srp.js apiAzul
2012-11-20ui tweaks to the menuAzul
2012-11-20ui tweaks to the menuAzul
2012-11-19Merge branch 'develop' into help_developjessib
Conflicts: app/assets/javascripts/application.js ui_dependencies.rb
2012-11-13using client side validations during signupAzul
2012-11-12Merge branch 'develop' into help_developjessib
Conflicts: help/test/functional/tickets_controller_test.rb users/test/functional/application_controller_test.rb users/test/support/auth_test_helper.rb
2012-11-12Merge branch 'develop' into feature-client-side-validationsAzul
Conflicts: Gemfile.lock
2012-11-12adding client side validations to the mixAzul
2012-11-12fixed signup bug and refactored a bitAzul
2012-11-09Merge branch 'develop' into help_developjessib
2012-11-09got integration test and login flow to workAzul
2012-11-09Merge branch 'develop' into feature-warden-srpAzul
Conflicts: users/app/assets/javascripts/srp
2012-11-09merged srp master into json api branchAzul
2012-11-06Merge branch 'develop' into help_developjessib
2012-11-06undo accidentally reverted srp-js and ruby 1.9 debugger in gemfileAzul
2012-11-06first steps towards warden srp testingAzul
2012-11-05Unit test for is_admin?jessib
2012-11-05Use the same URL for viewing tickets when authenticated or not---the couchdb ↵jessib
ID will be the random string for the secret URL. Tickets created when user was unauthenticated will be viewable by anybody who knows the URL.
2012-11-05Merge branch 'develop' into help_developjessib
2012-11-04fixed functional testsAzul
2012-11-04stubbing current_user the warden wayAzul
2012-11-04Merge branch 'develop' into feature-warden-srpAzul
Conflicts: Gemfile.lock users/app/controllers/application_controller.rb users/leap_web_users.gemspec
2012-11-04using ruby-srp 0.1.4 - ruby 1.9.3 compatibleAzul
2012-11-02Some rough functionality for tickets, like showing ticket list for admins, ↵jessib
and initial way to close tickets.
2012-10-31Code to check administration (and ugly test display.) This includes example ↵jessib
config file.
2012-10-31Merge branch 'develop' into feature-admin_usersjessib
Conflicts: users/app/controllers/application_controller.rb users/app/models/user.rb
2012-10-31Merge branch 'develop' of ssh://leap.se/leap_web into developjessib
2012-10-31using controller extensions for application controller by handAzul
2012-10-31user creation should send ok flag so js can start loginAzul
2012-10-31using json template for rendering the warden failuresAzul
2012-10-31user creation should send ok flag so js can start loginAzul