summaryrefslogtreecommitdiff
path: root/users/app
AgeCommit message (Collapse)Author
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-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
2012-10-30sending proper error messages from warden.Azul
still need to translate these
2012-10-30using rails_warden bit of refactoringAzul
without rails_warden the failure app action was not getting set properly.
2012-10-30adding in warden with a basic strategyAzul
currently failing because we are not setting the content-type header.
2012-10-29Merge branch 'help_develop' into developAzul
2012-10-29Merge branch 'help_develop' into developjessib
2012-10-29first steps at is_admin?Azul
2012-10-24basic admin controller methods and helpers + testsAzul
2012-10-19login after signup right away.Azul
2012-10-19moved login navigation to the rightAzul
2012-10-18Uses the working authentication code.jessib
2012-10-17Merge branch 'develop' into help_developjessib
2012-10-17UI tweaks including newer version of bootstrapAzul
2012-10-17complete signup, login, logout workflowAzul
2012-10-17improved signup and login jsAzul
2012-10-16working version of srp_jsAzul
2012-10-15adding login function for srpAzul
2012-10-15updated srp_jsAzul
2012-10-11current_user and authenticate methodsAzul
2012-10-11use ruby-srp 0.1.3 which returns the user on authenticate callAzul
Also removed a few hooks to User.current. Will replace with current_user
2012-10-08Merge branch 'release-0.1.0' into help_developjessib
Conflicts: .gitignore
2012-10-08Merge remote branch 'origin/release-0.1.0' into help_developjessib
2012-10-07adding validations for valid login chars and verifier and salt being hexAzul
2012-10-07added validationsAzul
2012-10-05Rough code to add & comment on tickets.jessib
2012-10-05ruby-srp 0.1.1 has to_json method - simplifies controllerAzul
2012-10-05moving to ruby_srp 0.1.0, works with python srpAzul
2012-10-05Merge remote-tracking branch 'origin/master' into developAzul
Conflicts: users/app/controllers/sessions_controller.rb