summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-09Merge branch 'develop' into help_developjessib
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
using the default layout.
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. ↵jessib
And some minor tweaks.
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-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
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-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-30new READMEelijah
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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 13:06:43 +0000