Commit Graph

  • 1660b2b01a * VRFS-18 syncing back to other comp Seth Call 2012-10-22 22:16:14 -0500
  • a04bf41555 * cascading delete SET NULL on client_id (to stop fk's from deleting music_session) Seth Call 2012-10-22 20:00:13 -0500
  • e3027e831b * VRFS-18: removed transactions from conneciton manager Seth Call 2012-10-22 19:59:35 -0500
  • 4323c4f573 * midway through jruby>ruby port for VRFS-18 Seth Call 2012-10-22 19:58:57 -0500
  • 97f095fe03 Starting in on a little bit of track layout. Jonathon Wilson 2012-10-21 20:55:05 -0600
  • c5a7a89413 Add event subscription to main app with tests. Early start on track view. Add some docs. Jonathon Wilson 2012-10-21 17:03:46 -0600
  • 331c13d858 * forgot to add state_error class Seth Call 2012-10-21 14:11:04 -0500
  • 3e269f2551 * connection manager complete. now will integrate into jam-web and websocket-gateway Seth Call 2012-10-21 10:05:06 -0500
  • d8dc08bef6 * VRFS-18; creating ConnectionManager which is responsible for managing data within the connections table Seth Call 2012-10-20 20:55:49 -0500
  • fda7e61420 * remove music_session_clients; merge into connections table (VRFS-18 Seth Call 2012-10-20 20:54:38 -0500
  • 2fe02a6c79 * syncing wip on connection cleaning Seth Call 2012-10-17 21:00:52 -0500
  • e881b19245 * adding in-progress connection cleaner class Seth Call 2012-10-17 19:39:43 -0500
  • 0e4d5a13f8 * removing session topic concept; instead sending to a session causes a message to be created for each client Seth Call 2012-10-16 22:50:28 -0500
  • 9205b35bc0 Merge branch 'VRFS-19' Seth Call 2012-10-16 22:49:48 -0500
  • c8d255dde9 *VRFS-19 finishing touches on publishing user_joined_session from jam-web Seth Call 2012-10-16 22:49:24 -0500
  • 6650bf889a Merge branch 'VRFS-19' Seth Call 2012-10-16 22:48:40 -0500
  • fd9770f0f3 * VRFS-19; finishing touches on making session messaging work via jam-web Seth Call 2012-10-16 22:48:10 -0500
  • d74c7c7202 resolve merge conflict Jonathon Wilson 2012-10-16 20:35:16 -0600
  • bee3187e5a Notes for next steps Jonathon Wilson 2012-10-16 20:30:00 -0600
  • b829a0cdc3 * VRFS-19: adding amqp and logging gem to jam-ruby Seth Call 2012-10-16 07:15:09 -0500
  • d976fde213 * adding logging-rails railtie in, so that use of 'logging' gem in jam-rby works. also adds color to console out, and log rotation in production without any thought, so why not Seth Call 2012-10-16 07:14:27 -0500
  • c1c5faaa03 Changed the client to join the session after creating it. tihot_jk 2012-10-16 01:44:33 -0700
  • a1cb141fab * VRFS-19; wip Seth Call 2012-10-15 21:11:49 -0500
  • 6128621ce6 * VRFS-19 - jam-ruby looks to have client messaging integrated, but need to see if it works when used in jam-web Seth Call 2012-10-15 21:09:57 -0500
  • 848154eb33 Merge branch 'master' of bitbucket.org:jamkazam/jam-web Brian Smith 2012-10-15 08:54:01 -0400
  • aaade12b59 more friend API development Brian Smith 2012-10-15 08:46:51 -0400
  • cb9ec9c636 * usitng pb_msg and not msg to extract message Seth Call 2012-10-15 06:38:33 -0500
  • d195ec78dd Disable the p2p message test and reenable the ping messages. tihot_jk 2012-10-15 02:39:32 -0700
  • b96a4b8f36 Hooking up the JS bridge to C++ and p2p messages. tihot_jk 2012-10-15 02:23:58 -0700
  • 8397291ab1 Renaming message_factory.js to AAB_message_factory.js tihot_jk 2012-10-15 02:19:35 -0700
  • 019fe8fc36 Adding p2p message type. tihot_jk 2012-10-15 02:13:22 -0700
  • c407fcfd86 model updates Brian Smith 2012-10-15 00:14:40 -0400
  • d7fb9850e8 include friend_request in jam_ruby Brian Smith 2012-10-14 22:02:55 -0400
  • 2c0690bb34 Add a simple self-ping 5 times upon login as a test. Jonathon Wilson 2012-10-14 13:54:12 -0600
  • ade0928bdc Change 'target' to 'route_to' in websocket messages Jonathon Wilson 2012-10-14 10:56:09 -0600
  • f6e21c41df Merge branch 'master' of bitbucket.org:jamkazam/jam-web Jonathon Wilson 2012-10-14 10:10:42 -0600
  • 1be39b2c18 JS Organization. Investigation of websocket connections. Jonathon Wilson 2012-10-14 09:48:56 -0600
  • 1fa514b2bd added /friends subresource for user API Brian Smith 2012-10-14 00:29:49 -0400
  • daa042630d formatting Brian Smith 2012-10-14 00:21:52 -0400
  • a36eec81c5 Merge branch 'master' of bitbucket.org:jamkazam/jam-web Brian Smith 2012-10-13 22:22:30 -0400
  • 8da4d1a42d friend API development Brian Smith 2012-10-13 22:22:13 -0400
  • a1f911086b Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby Brian Smith 2012-10-13 22:18:42 -0400
  • cccae35a97 friend API development Brian Smith 2012-10-13 22:18:20 -0400
  • 0f261ee834 merge Brian Smith 2012-10-13 22:17:40 -0400
  • 6e1293b6cf added friend_requests table Brian Smith 2012-10-13 22:16:31 -0400
  • 1bbf3248b2 * websocket-gateway updated to support p2p session Seth Call 2012-10-13 17:55:01 -0500
  • 67087c3370 Merge branch 'master' of bitbucket.org:jamkazam/jam-web Seth Call 2012-10-13 17:53:11 -0500
  • 3f6c343e4c * client_id required by /api/sessions/#id/participants now Seth Call 2012-10-13 17:51:51 -0500
  • ef968fb29d * fixing tests for new client_id field Seth Call 2012-10-13 17:51:08 -0500
  • ba473ee9c9 * merging in FriendUpdate Seth Call 2012-10-13 17:48:35 -0500
  • 43b51168bc * adding PingRequest, PingAck, and TestClientMessage (all p2p messages) Seth Call 2012-10-13 17:47:10 -0500
  • 961a236deb * p2p.sql added--client_id added to music_session_clients table Seth Call 2012-10-13 17:46:40 -0500
  • bd047b0eea Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby Seth Call 2012-10-10 22:33:58 -0500
  • 754194f4f4 * adding client_id for p2p messaging Seth Call 2012-10-10 22:33:54 -0500
  • c711fa932b * p2p initial version implemented and particially tested Seth Call 2012-10-10 22:04:43 -0500
  • ed87614309 corrected misspelled semaphore variable Brian Smith 2012-10-09 01:03:49 -0400
  • 007b1e67d2 fixed issue with connection cleanup Brian Smith 2012-10-08 23:06:39 -0400
  • c388f9e169 fixed bug Brian Smith 2012-10-08 21:26:06 -0400
  • 76883a0d7e minor refactor to be consistent with session directed messages Brian Smith 2012-10-07 16:51:43 -0400
  • 5ba13fa893 fixed issues found in unit tests Brian Smith 2012-10-07 14:02:26 -0400
  • c3616a0cb3 fixed issues found in unit tests Brian Smith 2012-10-07 14:01:48 -0400
  • dad13581eb merge master Brian Smith 2012-10-07 01:09:03 -0400
  • 7b15816665 syntax error fix Brian Smith 2012-10-07 01:05:21 -0400
  • 4333a1d91f merged master Brian Smith 2012-10-07 00:59:55 -0400
  • a250559b0f merge master Brian Smith 2012-10-07 00:57:23 -0400
  • 4b15f102db added unit test Brian Smith 2012-10-07 00:53:54 -0400
  • cbb9508b6b more changes for user presence Brian Smith 2012-10-06 23:38:38 -0400
  • 5d930f96b8 Merge branch 'master' of bitbucket.org:jamkazam/jam-web Jonathon Wilson 2012-10-06 10:36:18 -0600
  • 7fee65f2fa Fleshing out app framework. Session CRUD working. Jonathon Wilson 2012-10-06 10:36:05 -0600
  • 36b1a4ad1c Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby Seth Call 2012-10-04 21:39:11 -0500
  • ee111930d2 * updating message_factory to use new jam-pb naming Seth Call 2012-10-04 21:39:03 -0500
  • b7f9dea9ec Merge branch 'master' of bitbucket.org:jamkazam/jam-web Seth Call 2012-10-04 21:36:50 -0500
  • 4b8a860025 * fixing devmode config to point back to localhost for websocket gateway Seth Call 2012-10-04 21:36:42 -0500
  • 9a055fd2c2 * updating protocol buffer messages to use 'Music' instead of 'Jam' Seth Call 2012-10-04 21:34:10 -0500
  • f480f0bf75 * renamed all 'JamSession' occurrences to 'MusicSession' Seth Call 2012-10-04 21:33:32 -0500
  • c278588967 Merge branch 'master' of bitbucket.org:jamkazam/jam-web Jonathon Wilson 2012-10-03 20:36:35 -0600
  • 90a6996bd8 Simple create session which uses api. Only description field is recognized. No response handler. Jonathon Wilson 2012-10-03 20:36:25 -0600
  • 757c016b67 * changing musicians to participants Seth Call 2012-10-03 21:09:01 -0500
  • 4c0f21741e Fixing the peer auth issues tihot_jk 2012-10-03 00:34:22 -0700
  • 9f4c565308 Fixing the peer auth issue tihot_jk 2012-10-03 00:28:27 -0700
  • 5599aa9405 * VRFS-15; making musicians hang off of root uri take 2; I had a bad test that was a false positive Seth Call 2012-10-03 00:05:33 -0500
  • ee481274bd * VRFS-15; making musicians hang off of root uri Seth Call 2012-10-02 23:56:02 -0500
  • d1bb5ae374 * VRFS-15; making musicians hang off of root uri Seth Call 2012-10-02 23:50:49 -0500
  • 9037bafd71 * VRFS-15; fixing plurality of 'musicians' Seth Call 2012-10-02 23:47:29 -0500
  • 5fa01d09d5 * VRFS-15 merge conflicts resolved Seth Call 2012-10-02 23:00:35 -0500
  • 6f14c505c3 * VRFS-15 cleaning up location of files and superflous use of 'api' in file names. Seth Call 2012-10-02 22:57:27 -0500
  • 0f37d1523c * VRFS-15: new models for sessions REST API Seth Call 2012-10-02 22:50:23 -0500
  • 4c39cb4c58 * merged manifest Seth Call 2012-10-02 22:48:28 -0500
  • f3c21dba51 * db changes required for minimal sessions API Seth Call 2012-10-02 22:46:28 -0500
  • eb9f0d791c * VRFS-15: session crud in progress Seth Call 2012-10-02 19:54:29 -0500
  • 8451f8653a user presence development Brian Smith 2012-10-02 01:03:08 -0400
  • 2c60c3b263 added friend_update message / user presence development Brian Smith 2012-10-02 01:02:02 -0400
  • e1aeb9ec4f added friend_update message Brian Smith 2012-10-02 00:51:49 -0400
  • af4a94c875 removed copy/paste error Brian Smith 2012-10-01 17:36:51 -0400
  • 849c6d3b20 formatting fix Brian Smith 2012-10-01 17:34:29 -0400
  • cd723ac964 create connection row on login Brian Smith 2012-10-01 17:31:47 -0400
  • 4660434a2b user presence development Brian Smith 2012-10-01 17:27:32 -0400
  • b5d5a422a0 move user scripts to new file Brian Smith 2012-09-30 22:46:20 -0400
  • b86ec296fc added more table creation scripts bsmith 2012-09-30 22:33:53 -0400
  • a463030f93 Unstyled. Change create session controls to reflect spec. Jonathon Wilson 2012-09-29 11:48:23 -0600