Commit Graph

7883 Commits

Author SHA1 Message Date
Seth Call 912b4e76d8 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-02-02 21:39:02 -06:00
Seth Call 7792e40b52 * adding log to indicate if no js errors 2013-02-02 21:38:45 -06:00
Brian Smith e859b58998 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-02-02 22:12:41 -05:00
Brian Smith 9769ade049 added keyword search to find session 2013-02-02 18:55:26 -05:00
Brian Smith 8ce893c8b3 added keyword search to find session 2013-02-02 18:53:57 -05:00
Seth Call 0bb05ec423 * trying once again 2013-02-02 15:02:29 -06:00
Seth Call 44ab897057 * trying to fix broken cucumber tests 2013-02-02 14:52:27 -06: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
Mike Slemmer 051a841995 more work 2013-01-31 00:25:07 -08:00
Mike Slemmer 723b52c5bd more work 2013-01-31 00:24:39 -08: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
Mike Slemmer a3e93a208d minor update 2013-01-30 09:57:12 -08: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
Brian Smith ceaf4119af added participants as filter criteria / fixed bug with genre filter 2013-01-30 10:43:01 -05:00
Mike Slemmer 33c3a54d12 more work 2013-01-29 21:46:56 -08:00
Mike Slemmer 5d1af73685 more work 2013-01-29 21:46:40 -08:00
Mike Slemmer 1d498fad80 more work 2013-01-29 21:46:16 -08:00
Mike Slemmer 772a8c5f26 Merge branch 'master' of bitbucket.org:jamkazam/jam-db into slemmer_20130122 2013-01-29 21:45:59 -08: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
Seth Call a9f0ec895d * removing more traces of active_scaffold 2013-01-28 21:09:05 -06:00
Seth Call 6fec421761 * removing offending initializer 2013-01-28 20:58:16 -06:00
Seth Call d3595afba1 * stopping swp files from being committed 2013-01-28 20:56:59 -06:00