seth
/
jam-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,883 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

7883 Commits

Author SHA1 Message Date
Seth Call 1bd99758ac * merging lock 2013-02-13 00:50:31 -06:00
Seth Call 57e6951c83 t pushMerge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-02-13 00:02:19 -06:00
Seth Call 0ddecbf0b2 * adding test file to satisfy carrierwave-based model 2013-02-12 23:39:53 -06:00
Jonathon Wilson 53c18a21ce Remove unnecessary guard for connect in JamServer. Default master/voice chat to proper starting states. 2013-02-12 22:30:22 -07:00
Seth Call 245ab0583b adding carrierwave to gemfile because jamruby has it as a dependency and local gems seem to not pull in transitive dependencies 2013-02-12 22:57:04 -06:00
Seth Call 223928673b * VRFS-217 artifacts page added to help one upload client builds, and 2 capybara tests 2013-02-12 22:43:57 -06:00
Seth Call 3c692bbe7c * adding carrierwave to gemfile of jam-web, only because jam-ruby specifies and path gems don't honor dependencies it seems 2013-02-12 22:41:18 -06:00
Seth Call 713b4b6f4b * VRFS-217; necessary changes to test and make artifact model work with carrierwave 2013-02-12 22:40:01 -06:00
Seth Call 7075d4c17c * ooops; missed adding matching migartion 2013-02-12 21:10:26 -06:00
Seth Call 69c662398e * putting recorded_tracks.sql at the bottom, commented out 2013-02-12 21:07:19 -06:00
Seth Call d125ffb0b8 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-02-12 20:57:36 -06:00
Michael Call 0d6e43e6cb * whitespace in gemfile 2013-02-12 20:57:18 -06:00
Seth Call 1b1ac040a6 merged gemfile 2013-02-12 20:06:23 -06:00
Seth Call b253c21cd6 * merging manifest 2013-02-12 20:01:40 -06:00
Seth Call 193419227e * sha1 no longer requried 2013-02-12 20:00:38 -06:00
Seth Call 717f076cc7 * artifact_update; changes with sha1 2013-02-12 19:56:40 -06:00
Jonathan Kolyer 8d95a15475 refreshed to fix bundle install issues 2013-02-12 19:02:08 -06:00
Mike Slemmer e767deb875 fixed conflicts 2013-02-12 14:16:48 -08:00
Mike Slemmer 1fe8f29486 fix merge 2013-02-12 13:54:12 -08:00
Jonathon Wilson 13016671dc Timeout support in session pings. Still return timeout results in find sessions. 2013-02-12 13:29:40 -07:00
Jonathan Kolyer 6bb24a91ca added aasm gem 2013-02-11 01:41:10 -06:00
Jonathan Kolyer 08976ec71a updated logging stmts for connection state mgmt 2013-02-11 00:53:00 -06:00
Jonathan Kolyer bb370a3bb0 Merge branch 'vrfs192' 2013-02-11 00:42:24 -06:00
Jonathan Kolyer 172b3067d5 Merge branch 'vrfs192' 2013-02-11 00:27:20 -06:00
Jonathan Kolyer ddd402ba6b made code layout more readable; tuned logging for connection state changes 2013-02-11 00:26:46 -06:00
Jonathan Kolyer 36aa5b45d9 Merge branch 'vrfs192' 
Conflicts:
	manifest
 2013-02-11 00:10:54 -06:00
Jonathan Kolyer 1c1949010e renamed connection timers to correspond to state names 2013-02-11 00:04:41 -06:00
Jonathan Kolyer f571de783f renamed connection timers to correspond to state names 2013-02-11 00:03:47 -06:00
Jonathan Kolyer 5535b64756 removed thin gem 2013-02-11 00:03:00 -06:00
Jonathan Kolyer 44d2aba3c6 refactored names for connection states 2013-02-11 00:02:25 -06:00
Brian Smith bee5f3d5d5 show default avatar if user does not have one 2013-02-10 18:17:18 -05:00
Brian Smith dc504655ce override white-space style for create session so terms will wrap 2013-02-10 18:02:59 -05:00
Jonathon Wilson 09a0da8be1 Extend login sleep from 3 to 4 seconds. Tests pass locally, hoping to fix build server run. 2013-02-10 12:39:53 -07:00
Jonathon Wilson 2a17fe057f Cucumber test - add delays to accommodate us waiting for websocket connect at login 2013-02-10 12:08:30 -07:00
Jonathon Wilson e9a2e044f2 Rework initialization timing. Delay most until connected. Fix some global naming issues. 2013-02-10 11:51:37 -07:00
Jonathon Wilson 0c8f5f6cc7 Visual tweaks 2013-02-10 09:40:28 -07:00
Brian Smith a0c0301099 fix build 2013-02-10 09:52:25 -05:00
Brian Smith 428dd8b4ac added another check to ensure client is connected 2013-02-10 09:34:28 -05:00
Brian Smith 3e0a567e07 another attempt to fix find session bug 2013-02-10 01:58:00 -05:00
Jonathon Wilson 089c960ded Vertical tracks default to right gain and mute state at session start. 2013-02-09 19:00:29 -07:00
Jonathon Wilson ba49d5f12a Make track avatars/instruments dynamic. Voice chat mute works now. Track settings icon only visible for my tracks. 2013-02-09 17:33:47 -07:00
Brian Smith 1cf550f391 prevent sending websocket messages before connecting 2013-02-09 17:20:25 -05:00
Brian Smith bac2cf4c75 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-02-09 11:51:22 -05:00
Brian Smith 9dbe1a51c7 find session fixes / set avatar and user name in header 2013-02-09 11:45:11 -05:00
Jonathon Wilson 47ff8182b8 Wire up voice chat, and show if there's a channel. Mute not working yet. 2013-02-07 22:08:05 -07:00
Brian Smith 1fa4f97867 duplicate instrument per connection bug fix / more style fixes 2013-02-07 22:20:45 -05:00
Seth Call 9907d272ba * VRFS-238; oops forgot 403.html 2013-02-07 21:16:07 -06:00
Seth Call 4053f16a2a * VRFS-238 done 2013-02-07 21:11:47 -06:00
Seth Call c94434f43a Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-02-07 20:27:02 -06:00
Seth Call 686790cab8 * VRFS-215: changing path of REST API to match our /api/ 2013-02-07 20:25:06 -06:00