summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-04using ruby-srp 0.1.4 - ruby 1.9.3 compatibleAzul
2012-11-04fixing tests, including support files from all enginesAzul
2012-11-04minor: yaml syntax fixAzul
2012-11-04Merge branch 'feature-admin_users' into developAzul
2012-11-02Some rough functionality for tickets, like showing ticket list for admins, ↵jessib
and initial way to close tickets.
2012-11-02add debugger for ruby 1.9 so it works too.Azul
2012-11-02minor: it's gem install bundlerAzul
2012-11-02Merge branch 'feature-admin_users' into help_developjessib
2012-10-31Very basic filtering of tickets based on status. Will want this ajax-y.jessib
2012-10-31Merge branch 'develop' into help_developjessib
2012-10-31Looks like the help code has already been merged into the develop branch, ↵jessib
and thus merging into feature-admin_users branch.
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-31minor: need to cd into leap_web before initializing submodulesAzul
2012-10-31Merge branch 'develop' of ssh://leap.se/leap_web into developAzul
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-30new READMEelijah
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-29Just some commentsjessib
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-24removing duplicate testing of helper_methodsAzul
* once tested as helper * once tested as @controller.send...
2012-10-24Extraction of test support methodsAzul
2012-10-24basic admin controller methods and helpers + testsAzul
2012-10-19login after signup right away.Azul
2012-10-19added dummy cert file for tests and illustrationAzul
2012-10-19Revert "Created deploy branch with some springbok specifics"Azul
This reverts commit 439e27ef2792a03e5e50f8b9c607fca512cb1452. Conflicts: config/cert
2012-10-19moved login navigation to the rightAzul
2012-10-18Uses the working authentication code.jessib
2012-10-17Merge branch 'master' into help_developjessib
2012-10-17Merge branch 'develop' into help_developjessib
2012-10-17Not sure we actually want this in version control, but adding changes so ↵jessib
long as we have it.
2012-10-17Merge branch 'feature-authentication_system' into developAzul
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-16Some changes to INSTALL file.jessib
2012-10-16Some functional tests and other tweaks.jessib
2012-10-16working version of srp_jsAzul
2012-10-15adding login function for srpAzul
2012-10-15updated srp_jsAzul
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 15:08:39 +0000