tihot_jk
|
82ac665c96
|
Merge branch 'master' of bitbucket.org:jamkazam/websocket-gateway
Conflicts:
lib/jam_websockets/router.rb
|
2012-10-28 21:07:51 -07:00 |
|
tihot_jk
|
d6d60ecc17
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2012-10-28 21:03:41 -07:00 |
|
tihot_jk
|
374ca96153
|
Hook up the notifications when a client joins/leaves a session.
|
2012-10-28 17:37:59 -07:00 |
|
tihot_jk
|
74e03cd897
|
Add session_id to the notification massage for join/leave session.
|
2012-10-28 17:29:07 -07:00 |
|
tihot_jk
|
8b2148990f
|
Add session_id to the notifications when a client joins/leaves a music session.
|
2012-10-28 17:27:44 -07:00 |
|
tihot_jk
|
640e77e601
|
Fixing a bug after MusicSessionClient was renamed to Connection.
|
2012-10-28 17:24:16 -07:00 |
Brian Smith
|
96fbb23c34
|
removed musician model
|
2012-10-27 22:38:25 -04:00 |
|
Brian Smith
|
229ab95d34
|
updates for musicians
|
2012-10-27 22:35:28 -04:00 |
|
Brian Smith
|
849360bb8c
|
updates for musicians
|
2012-10-27 22:33:49 -04:00 |
 Seth Call
|
18fee761ae
|
* fixing MusicSesssionClient to Connection
|
2012-10-27 18:47:27 -05:00 |
|
Seth Call
|
b7094ce310
|
* VRFS-29; musician_access flag added
|
2012-10-27 17:51:26 -05:00 |
|
Seth Call
|
6925eb89c3
|
Merge branch 'invitations'
|
2012-10-27 17:29:07 -05:00 |
|
Seth Call
|
83b68cfc1f
|
* VRFS-27; invitations CRUD done
|
2012-10-27 17:26:45 -05:00 |
|
Seth Call
|
568d9aedae
|
* VRFS-27; adding notice that someone received an invitation
|
2012-10-27 17:26:24 -05:00 |
|
Seth Call
|
f4149648c6
|
* VRFS-27 invitation model and tests added
|
2012-10-27 14:22:05 -05:00 |
|
Seth Call
|
bc10d96a9e
|
* VRFS-27 tables added
|
2012-10-27 14:20:11 -05:00 |
Jonathon Wilson
|
7d83870640
|
genre to genres as list
|
2012-10-26 08:46:04 -06:00 |
|
Jonathon Wilson
|
b1bca81f1e
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-10-26 08:37:02 -06:00 |
|
Seth Call
|
e457f45dc6
|
* VRFS-28; raising Rollback exception to cause transaction to rollback in music_session_controller create
|
2012-10-26 06:15:21 -05:00 |
|
Seth Call
|
5f9c7c24a2
|
* VRFS-27; working on invitations controller
|
2012-10-26 05:58:02 -05:00 |
|
Seth Call
|
80637bac74
|
* VRFS-27; invitations model defined*
|
2012-10-26 05:34:41 -05:00 |
|
Seth Call
|
9ab04a7e74
|
* invitatations table and model build and tested
|
2012-10-26 05:33:39 -05:00 |
|
Jonathon Wilson
|
f3868ede2b
|
Load genres from ajax. Add clientId to jamkazam. Add genre and clientId to createSession call
|
2012-10-25 21:24:05 -06:00 |
|
Jonathon Wilson
|
072be0062f
|
VRFS-22. List genres REST call.
|
2012-10-25 09:08:55 -06:00 |
|
Seth Call
|
2cefa2c669
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-10-25 07:13:04 -05:00 |
|
Seth Call
|
7f70156248
|
* VRFS-21; genres field required to create session; returned in session list
|
2012-10-25 07:12:51 -05:00 |
|
Seth Call
|
a8f46f8d7d
|
* VRFS-21; adding genres field to session CRUD
|
2012-10-25 07:11:10 -05:00 |
|
Seth Call
|
889dfe5f7a
|
* VRFS-21 merged
|
2012-10-25 07:10:32 -05:00 |
|
Seth Call
|
528611cbc9
|
* VRFS-21; bootstrapping genre values and also associating with sessions
|
2012-10-25 07:09:59 -05:00 |
|
Brian Smith
|
a1ee5279e9
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-10-24 20:18:36 -04:00 |
|
Brian Smith
|
db21a70190
|
wrap friend creation in transaction
|
2012-10-24 20:18:26 -04:00 |
|
Jonathon Wilson
|
ce23a04e94
|
Add heartbeat calls in response to LOGIN_ACK
|
2012-10-23 20:54:41 -06:00 |
|
Seth Call
|
5e2bac6e95
|
* hiding 'id' field in participants because it's not used. but I wish the 'client_id' field is called 'id' and haven't figured out how to fix it via rabl
|
2012-10-23 07:44:17 -05:00 |
|
Seth Call
|
8837b29814
|
* VRFS-18 completed by integrating ConnectionManager to REST API
* rescue_from used a little now; good way to handle errors
|
2012-10-23 06:43:52 -05:00 |
|
Seth Call
|
7a3b20814a
|
* ConnectionManager integrated
* ruby-1.9.3 instead of JRuby
* Heartbeat Interval added to LoginAck
|
2012-10-23 06:42:28 -05:00 |
|
Seth Call
|
520225aedf
|
* adding support for new heartbeat_interval field on LoginAck
|
2012-10-23 06:37:25 -05:00 |
|
Seth Call
|
96d83aac26
|
Merge branch 'VRFS-18'
|
2012-10-23 06:36:22 -05:00 |
|
Seth Call
|
205aaf856e
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-pb
|
2012-10-23 06:34:38 -05:00 |
|
Seth Call
|
d055d7212e
|
* adding heartbeat interval to login_ack
|
2012-10-23 06:34:30 -05:00 |
|
Seth Call
|
1660b2b01a
|
* VRFS-18 syncing back to other comp
|
2012-10-22 22:16:14 -05:00 |
|
Seth Call
|
a04bf41555
|
* cascading delete SET NULL on client_id (to stop fk's from deleting music_session)
|
2012-10-22 20:00:13 -05:00 |
|
Seth Call
|
e3027e831b
|
* VRFS-18: removed transactions from conneciton manager
|
2012-10-22 19:59:35 -05:00 |
|
Seth Call
|
4323c4f573
|
* midway through jruby>ruby port for VRFS-18
|
2012-10-22 19:58:57 -05:00 |
|
Jonathon Wilson
|
97f095fe03
|
Starting in on a little bit of track layout.
|
2012-10-21 20:55:05 -06:00 |
|
Jonathon Wilson
|
c5a7a89413
|
Add event subscription to main app with tests. Early start on track view. Add some docs.
|
2012-10-21 17:03:46 -06:00 |
|
Seth Call
|
331c13d858
|
* forgot to add state_error class
|
2012-10-21 14:11:04 -05:00 |
|
Seth Call
|
3e269f2551
|
* connection manager complete. now will integrate into jam-web and websocket-gateway
|
2012-10-21 10:05:06 -05:00 |
|
Seth Call
|
d8dc08bef6
|
* VRFS-18; creating ConnectionManager which is responsible for managing data within the connections table
|
2012-10-20 20:55:49 -05:00 |
|
Seth Call
|
fda7e61420
|
* remove music_session_clients; merge into connections table (VRFS-18
|
2012-10-20 20:54:38 -05:00 |
|
Seth Call
|
2fe02a6c79
|
* syncing wip on connection cleaning
|
2012-10-17 21:00:52 -05:00 |