summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-11-12Merge branch 'develop' into feature-client-side-validationsAzul
2012-11-12don't track Gemfile.lockAzul
2012-11-12commented out an unfinished testAzul
2012-11-12Merge branch 'feature-warden-srp' into developAzul
2012-11-12adding client side validations to the mixAzul
2012-11-12fixed signup bug and refactored a bitAzul
2012-11-09Various very small tweaks: comments about main div display in firefox, give i...jessib
2012-11-09Merge branch 'develop' into help_developjessib
2012-11-09seperated the warden classes from the initializerAzul
2012-11-09got integration test and login flow to workAzul
2012-11-09Merge branch 'develop' into feature-warden-srpAzul
2012-11-09merged srp master into json api branchAzul
2012-11-08First attempt at functionality for admins viewing their own tickets.jessib
2012-11-08added generic flash blockAzul
2012-11-08Do not overwrite initializer in tickets_controller, as that meant we weren't ...jessib
2012-11-07Move destroy button out of ticket form.jessib
2012-11-07Improvements to flow for closing/re-opening tickets.jessib
2012-11-06Admin deletion of tickets, although need to figure out jquery interaction. An...jessib
2012-11-06Merge branch 'develop' into help_developjessib
2012-11-06undo accidentally reverted srp-js and ruby 1.9 debugger in gemfileAzul
2012-11-06Merge branch 'develop' of ssh://leap.se/leap_web into developAzul
2012-11-06first steps towards warden srp testingAzul
2012-11-05Working on functionality for replying to and closing tickets.jessib
2012-11-05Unit test for is_admin?jessib
2012-11-05Use the same URL for viewing tickets when authenticated or not---the couchdb ...jessib
2012-11-05Merge branch 'develop' into help_developjessib
2012-11-04fixed functional testsAzul
2012-11-04using new login helper and cleaning up test a bitAzul
2012-11-04stubbing current_user the warden wayAzul
2012-11-04Merge branch 'develop' into feature-warden-srpAzul
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, an...jessib
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, and...jessib
2012-10-31Code to check administration (and ugly test display.) This includes example c...jessib
2012-10-31Merge branch 'develop' into feature-admin_usersjessib
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