 Seth Call
|
6128621ce6
|
* VRFS-19 - jam-ruby looks to have client messaging integrated, but need to see if it works when used in jam-web
|
2012-10-15 21:09:57 -05:00 |
Brian Smith
|
848154eb33
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-10-15 08:54:01 -04:00 |
|
Brian Smith
|
aaade12b59
|
more friend API development
|
2012-10-15 08:46:51 -04:00 |
|
Seth Call
|
cb9ec9c636
|
* usitng pb_msg and not msg to extract message
|
2012-10-15 06:38:33 -05:00 |
tihot_jk
|
d195ec78dd
|
Disable the p2p message test and reenable the ping messages.
|
2012-10-15 02:39:32 -07:00 |
|
tihot_jk
|
b96a4b8f36
|
Hooking up the JS bridge to C++ and p2p messages.
|
2012-10-15 02:23:58 -07:00 |
|
tihot_jk
|
8397291ab1
|
Renaming message_factory.js to AAB_message_factory.js
|
2012-10-15 02:19:35 -07:00 |
|
tihot_jk
|
019fe8fc36
|
Adding p2p message type.
|
2012-10-15 02:13:22 -07:00 |
|
Brian Smith
|
c407fcfd86
|
model updates
|
2012-10-15 00:14:40 -04:00 |
|
Brian Smith
|
d7fb9850e8
|
include friend_request in jam_ruby
|
2012-10-14 22:02:55 -04:00 |
Jonathon Wilson
|
2c0690bb34
|
Add a simple self-ping 5 times upon login as a test.
|
2012-10-14 13:54:12 -06:00 |
|
Jonathon Wilson
|
ade0928bdc
|
Change 'target' to 'route_to' in websocket messages
|
2012-10-14 10:56:09 -06:00 |
|
Jonathon Wilson
|
f6e21c41df
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-10-14 10:10:42 -06:00 |
|
Jonathon Wilson
|
1be39b2c18
|
JS Organization. Investigation of websocket connections.
|
2012-10-14 09:48:56 -06:00 |
|
Brian Smith
|
1fa514b2bd
|
added /friends subresource for user API
|
2012-10-14 00:29:49 -04:00 |
|
Brian Smith
|
daa042630d
|
formatting
|
2012-10-14 00:21:52 -04:00 |
|
Brian Smith
|
a36eec81c5
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-10-13 22:22:30 -04:00 |
|
Brian Smith
|
8da4d1a42d
|
friend API development
|
2012-10-13 22:22:13 -04:00 |
|
Brian Smith
|
a1f911086b
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2012-10-13 22:18:42 -04:00 |
|
Brian Smith
|
cccae35a97
|
friend API development
|
2012-10-13 22:18:20 -04:00 |
|
Brian Smith
|
0f261ee834
|
merge
|
2012-10-13 22:17:40 -04:00 |
|
Brian Smith
|
6e1293b6cf
|
added friend_requests table
|
2012-10-13 22:16:31 -04:00 |
|
Seth Call
|
1bbf3248b2
|
* websocket-gateway updated to support p2p session
|
2012-10-13 17:55:01 -05:00 |
|
Seth Call
|
67087c3370
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-10-13 17:53:11 -05:00 |
|
Seth Call
|
3f6c343e4c
|
* client_id required by /api/sessions/#id/participants now
|
2012-10-13 17:51:51 -05:00 |
|
Seth Call
|
ef968fb29d
|
* fixing tests for new client_id field
|
2012-10-13 17:51:08 -05:00 |
|
Seth Call
|
ba473ee9c9
|
* merging in FriendUpdate
|
2012-10-13 17:48:35 -05:00 |
|
Seth Call
|
43b51168bc
|
* adding PingRequest, PingAck, and TestClientMessage (all p2p messages)
|
2012-10-13 17:47:10 -05:00 |
|
Seth Call
|
961a236deb
|
* p2p.sql added--client_id added to music_session_clients table
|
2012-10-13 17:46:40 -05:00 |
|
Seth Call
|
bd047b0eea
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2012-10-10 22:33:58 -05:00 |
|
Seth Call
|
754194f4f4
|
* adding client_id for p2p messaging
|
2012-10-10 22:33:54 -05:00 |
|
Seth Call
|
c711fa932b
|
* p2p initial version implemented and particially tested
|
2012-10-10 22:04:43 -05:00 |
|
Brian Smith
|
ed87614309
|
corrected misspelled semaphore variable
|
2012-10-09 01:03:49 -04:00 |
|
Brian Smith
|
007b1e67d2
|
fixed issue with connection cleanup
|
2012-10-08 23:06:39 -04:00 |
|
Brian Smith
|
c388f9e169
|
fixed bug
|
2012-10-08 21:26:06 -04:00 |
|
Brian Smith
|
76883a0d7e
|
minor refactor to be consistent with session directed messages
|
2012-10-07 16:51:43 -04:00 |
|
Brian Smith
|
5ba13fa893
|
fixed issues found in unit tests
|
2012-10-07 14:02:26 -04:00 |
|
Brian Smith
|
c3616a0cb3
|
fixed issues found in unit tests
|
2012-10-07 14:01:48 -04:00 |
|
Brian Smith
|
dad13581eb
|
merge master
|
2012-10-07 01:09:03 -04:00 |
|
Brian Smith
|
7b15816665
|
syntax error fix
|
2012-10-07 01:05:21 -04:00 |
|
Brian Smith
|
4333a1d91f
|
merged master
|
2012-10-07 00:59:55 -04:00 |
|
Brian Smith
|
a250559b0f
|
merge master
|
2012-10-07 00:57:23 -04:00 |
|
Brian Smith
|
4b15f102db
|
added unit test
|
2012-10-07 00:53:54 -04:00 |
|
Brian Smith
|
cbb9508b6b
|
more changes for user presence
|
2012-10-06 23:38:38 -04:00 |
|
Jonathon Wilson
|
5d930f96b8
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-10-06 10:36:18 -06:00 |
|
Jonathon Wilson
|
7fee65f2fa
|
Fleshing out app framework. Session CRUD working.
|
2012-10-06 10:36:05 -06:00 |
|
Seth Call
|
36b1a4ad1c
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2012-10-04 21:39:11 -05:00 |
|
Seth Call
|
ee111930d2
|
* updating message_factory to use new jam-pb naming
|
2012-10-04 21:39:03 -05:00 |
|
Seth Call
|
b7f9dea9ec
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-10-04 21:36:50 -05:00 |
|
Seth Call
|
4b8a860025
|
* fixing devmode config to point back to localhost for websocket gateway
|
2012-10-04 21:36:42 -05:00 |