summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-19Merge branch 'develop' into help_developjessib
Conflicts: app/assets/javascripts/application.js ui_dependencies.rb
2012-11-19adding travis.yml so we have couchDB to test withAzul
2012-11-18Merge branch 'feature-client-side-validations' into developAzul
2012-11-16Rough start to modeling tickets view after the issues view in github (so ↵jessib
something like https://github.com/spree/spree/issues ), using bootstrap for display. Still want to use pjax, and have more functionality to add: searching, sorting, pagination, etc..
2012-11-16playing around with pjax-rails but not using it yetjessib
2012-11-15Some more ticket tests.jessib
2012-11-14Improvements to functional ticket tests.jessib
2012-11-13using client side validations during signupAzul
2012-11-13testing against current staging serverAzul
2012-11-12Some test improvements.jessib
2012-11-12Merge branch 'develop' into help_developjessib
2012-11-12fixed .gitignoreAzul
2012-11-12fixed .gitignoreAzul
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-12some notes to test that aren't working now.jessib
2012-11-12Merge branch 'develop' into feature-client-side-validationsAzul
Conflicts: Gemfile.lock
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 ↵jessib
info for when creating unauthenticated tickets, redirecting to index when closing a ticket, fix default select for ticket filtering.
2012-11-09Merge branch 'develop' into help_developjessib
2012-11-09seperated the warden classes from the initializerAzul
also commented the sessions controller test a bit and fixed it
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-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-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
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-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
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