Commit Graph

383 Commits

Author SHA1 Message Date
Brian Smith 8ce893c8b3 added keyword search to find session 2013-02-02 18:53:57 -05:00
Brian Smith 9375c036f5 fix test 2013-02-01 01:21:49 -05:00
Brian Smith 971d2ea779 fixed styling on Create Session 2013-02-01 01:05:57 -05:00
Brian Smith 4334494d07 add invitation receiver id to session API response 2013-01-31 23:33:40 -05:00
Brian Smith 50201511f9 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-01-31 21:45:27 -05:00
Brian Smith ad4313c848 VRFS-201 fixed invitations for Create Session 2013-01-31 21:42:07 -05:00
Seth Call 10b3446451 * deleted specs that we didn't write (came from original tutorial) 2013-01-31 19:40:47 -06:00
Mike Slemmer 9a330169b5 adding recording routes 2013-01-31 10:22:02 -08:00
Jonathon Wilson 04fb3844ff Mute button works. Better ties to music hardware (less hard-coding) 2013-01-31 09:32:52 -07:00
Seth Call e4f6975dc4 * fixing auth page specs 2013-01-31 08:26:32 -06:00
Seth Call a930f2fd81 * forgot to check in deleted files 2013-01-30 23:50:34 -06:00
Seth Call e3c2ef481c * removing gem 2013-01-30 23:44:57 -06:00
Seth Call 4bbf7f15b9 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-01-30 23:44:41 -06:00
Seth Call e1c61884a1 * bumping capybara to 2.x 2013-01-30 23:43:26 -06:00
Jonathon Wilson 82b7e53d9d VU meter fixes.
Look for multiple tuples in single callback.
Fix to have VU meters be left/right inputs (hardcoded for now).
Increase update speed to every 100ms (so far, so good).
2013-01-30 22:23:30 -07:00
Jonathon Wilson b5dd5b0276 Fixes for changed participant structure. DOM cleanup. 2013-01-30 21:00:07 -07:00
Jonathon Wilson fc82e1fcd2 Remove extraneous debug statements 2013-01-30 19:34:31 -07:00
Jonathon Wilson 35dee05024 Working VU meters from bridge 2013-01-30 19:34:31 -07:00
Jonathon Wilson 6a2b52ed01 Track template. Visual track appearance from Jeff 2013-01-30 19:34:31 -07:00
Jonathon Wilson dfdfd159cb Start of session screen from Jeff 2013-01-30 19:34:31 -07:00
Jonathon Wilson 67bdb5a714 Start of session from jeff: header and controls 2013-01-30 19:34:31 -07:00
Brian Smith 8b6fd0a34c fix Join URL 2013-01-30 21:20:47 -05:00
Brian Smith 53898a8459 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-01-30 10:43:44 -05:00
Brian Smith 173d4ae294 VRFS-212 added search functionality to Find Session 2013-01-30 10:43:29 -05:00
Seth Call 4f3cd44fdd * remove capybara folder on start 2013-01-29 23:14:30 -06:00
Seth Call 1e4c287ec3 *adding yas (yet another sleep) to the cucumber tests 2013-01-29 23:11:24 -06:00
Seth Call ebe501d212 * have to add screenshot require later in env.rb 2013-01-29 22:45:44 -06:00
Seth Call 2872efcf60 * oops. need to keep capybara pinned 2013-01-29 22:10:17 -06:00
Seth Call 68af245c2e * removing libv8 dependency temporarily because latest therubyracer makes it a dependency 2013-01-29 21:42:50 -06:00
Seth Call 53a0a0a91f * tring out the screenshot gem 2013-01-29 21:36:19 -06:00
Brian Smith f0bf0545cd fixed tests (commented out some that need to be fixed once dev is more complete) 2013-01-29 21:32:12 -05:00
Brian Smith 26beaa6b00 VRFS-212 find session 2013-01-29 19:36:54 -05:00
Jonathon Wilson 06ee0b61ef Move create session main submit button to left temporarily 2013-01-29 16:53:21 -07:00
Brian Smith 08848439d4 Merge branch 'feature/find_session' 2013-01-28 21:33:12 -05:00
Brian Smith ef11c78b5b Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-01-28 21:33:00 -05:00
Brian Smith a3199a30af fix test 2013-01-28 21:32:25 -05:00
Jonathon Wilson 53542cc38e Fix cucumber tests for layout changes 2013-01-28 19:32:08 -07:00
Jonathon Wilson 875f8efd0f Fix tests from layout changes 2013-01-28 19:24:25 -07:00
Jonathon Wilson 3914ec4cee Remove unused files. 2013-01-28 08:51:39 -07:00
Jonathon Wilson b5ed66ce54 Jeff's signin and register pages. 2013-01-28 08:50:16 -07:00
Brian Smith a84fb46edd fix rspec tests 2013-01-27 22:41:53 -05:00
Brian Smith 5073ee9d94 VRFS-212 find session 2013-01-27 22:05:00 -05:00
Brian Smith 8d7902b3bd VRFS-212 more find session work 2013-01-27 15:17:46 -05:00
Jonathon Wilson d576366a05 bringing in Jeff's ftue mockups. Partial commit to bring in Gemfile changes 2013-01-27 11:34:14 -07:00
Seth Call f832bc9415 * allowing em-websocket to go above 0.4.0 2013-01-26 20:15:30 -06:00
Seth Call 69e69f0e6a * pinning em-websocket in jam-web, as well 2013-01-26 20:00:41 -06:00
Seth Call 43a64319bf * freeing versions of test libraries because not everything is pinned, so some things are getting into dependency trouble 2013-01-26 19:56:12 -06:00
Brian Smith f97c9d4bc8 VRFS-212 find session 2013-01-26 14:18:31 -05:00
Brian Smith e9a32c12e6 VRFS-212 Find Session work 2013-01-25 03:00:53 -05:00
Brian Smith 2e302c4179 fix friend search 2013-01-21 21:57:48 -05:00