jasmine working for affix_navbar.js
will try to refactor js so it's more testable
pre-merge
post merge
Merge branch 'spike' of https://github.com/yggie/WebsiteOne into spike2
finished spec for event countdown
Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into spike2
changed handling of negative numbers, and loosened regex
the non-deterministic nature of the tests actually exposed a bug in an area I neglected to test -- yaay
upgraded to ruby 2.1.1 & rails 4.1.0. Removed squeel. All tests are passing green
changed ruby version to '2.1.1p76' in travis
changed ruby version to '2.1.1' in travis
the <div> in users/show is a real pain
updated feature with cancel scenarios and preventing multiple votes
Merge branch 'article_vote' of http://github.com/qpias/WebsiteOne into article_vote
added a route to verification app
clean db schema
Merge pull request #384 from tochman/sinatra

Route to verification application
re-enabled wso_spec
Refactor: EventsController#create
Add value objects for handling EventDate, StartTime, EndTime