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 |
|
Seth Call
|
9a055fd2c2
|
* updating protocol buffer messages to use 'Music' instead of 'Jam'
|
2012-10-04 21:34:10 -05:00 |
|
Seth Call
|
f480f0bf75
|
* renamed all 'JamSession' occurrences to 'MusicSession'
|
2012-10-04 21:33:32 -05:00 |
|
Jonathon Wilson
|
c278588967
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2012-10-03 20:36:35 -06:00 |
|
Jonathon Wilson
|
90a6996bd8
|
Simple create session which uses api. Only description field is recognized. No response handler.
|
2012-10-03 20:36:25 -06:00 |
|
Seth Call
|
757c016b67
|
* changing musicians to participants
|
2012-10-03 21:09:01 -05:00 |
tihot_jk
|
4c0f21741e
|
Fixing the peer auth issues
|
2012-10-03 00:34:22 -07:00 |
|
tihot_jk
|
9f4c565308
|
Fixing the peer auth issue
|
2012-10-03 00:28:27 -07:00 |
|
Seth Call
|
5599aa9405
|
* VRFS-15; making musicians hang off of root uri take 2; I had a bad test that was a false positive
|
2012-10-03 00:05:33 -05:00 |
|
Seth Call
|
ee481274bd
|
* VRFS-15; making musicians hang off of root uri
|
2012-10-02 23:56:02 -05:00 |
|
Seth Call
|
d1bb5ae374
|
* VRFS-15; making musicians hang off of root uri
|
2012-10-02 23:50:49 -05:00 |
|
Seth Call
|
9037bafd71
|
* VRFS-15; fixing plurality of 'musicians'
|
2012-10-02 23:47:29 -05:00 |
|
Seth Call
|
5fa01d09d5
|
* VRFS-15 merge conflicts resolved
|
2012-10-02 23:00:35 -05:00 |
|
Seth Call
|
6f14c505c3
|
* VRFS-15 cleaning up location of files and superflous use of 'api' in file names.
|
2012-10-02 22:57:27 -05:00 |
|
Seth Call
|
0f37d1523c
|
* VRFS-15: new models for sessions REST API
|
2012-10-02 22:50:23 -05:00 |
|
Seth Call
|
4c39cb4c58
|
* merged manifest
|
2012-10-02 22:48:28 -05:00 |
|
Seth Call
|
f3c21dba51
|
* db changes required for minimal sessions API
|
2012-10-02 22:46:28 -05:00 |
|
Seth Call
|
eb9f0d791c
|
* VRFS-15: session crud in progress
|
2012-10-02 19:54:29 -05:00 |
|
Brian Smith
|
8451f8653a
|
user presence development
|
2012-10-02 01:03:08 -04:00 |
|
Brian Smith
|
2c60c3b263
|
added friend_update message / user presence development
|
2012-10-02 01:02:02 -04:00 |
|
Brian Smith
|
e1aeb9ec4f
|
added friend_update message
|
2012-10-02 00:51:49 -04:00 |
|
Brian Smith
|
af4a94c875
|
removed copy/paste error
|
2012-10-01 17:36:51 -04:00 |
|
Brian Smith
|
849c6d3b20
|
formatting fix
|
2012-10-01 17:34:29 -04:00 |
|
Brian Smith
|
cd723ac964
|
create connection row on login
|
2012-10-01 17:31:47 -04:00 |
|
Brian Smith
|
4660434a2b
|
user presence development
|
2012-10-01 17:27:32 -04:00 |
|
Brian Smith
|
b5d5a422a0
|
move user scripts to new file
|
2012-09-30 22:46:20 -04:00 |
bsmith
|
b86ec296fc
|
added more table creation scripts
|
2012-09-30 22:33:53 -04:00 |
|
Jonathon Wilson
|
a463030f93
|
Unstyled. Change create session controls to reflect spec.
|
2012-09-29 11:48:23 -06:00 |
|
Jonathon Wilson
|
b395abf944
|
Add jasmine JS test support. Minor code cleanup.
|
2012-09-29 10:43:01 -06:00 |
|
tihot_jk
|
82cea286be
|
Added initial web-socket communication to the client page.
|
2012-09-28 01:20:43 -07:00 |
|
Jonathon Wilson
|
3e8dfdf8f8
|
Ignore Gemfile.lock
|
2012-09-22 14:36:12 -06:00 |
|
Jonathon Wilson
|
4e07d98315
|
Remove Gemfile.lock. Will include in .gitignore shortly.
|
2012-09-22 14:35:07 -06:00 |
|
Jonathon Wilson
|
d70b41b915
|
Get webfonts working in client.
|
2012-09-22 13:21:56 -06:00 |
|
tihot_jk
|
56cd864f67
|
Adding .rvmrc file for the project.
|
2012-09-21 23:34:13 -07:00 |
|
Seth Call
|
216755d828
|
* isolating css for mockup from bootstrap/rest of site. also fixed fonts
|
2012-09-21 21:14:44 -05:00 |
|
Seth Call
|
eded658db4
|
* adding in initial client mockup; but bootstrap CSS is affecting some centering, and font paths are not fully worked out yet
|
2012-09-20 23:46:45 -05:00 |
|
unknown
|
2533c6732d
|
* adding windows specific run script
|
2012-09-20 21:08:29 -05:00 |
|
Seth Call
|
12fb985883
|
* moving jam-db to test scope only
|
2012-09-19 23:19:21 -05:00 |
|
Seth Call
|
562eaea844
|
* disabling test until pgmigrate allows specification of password argument
|
2012-09-17 22:38:21 -05:00 |