Commit Graph

39 Commits

Author SHA1 Message Date
Brian Smith 1fa514b2bd added /friends subresource for user API 2012-10-14 00:29:49 -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
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
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 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
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
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 eb9f0d791c * VRFS-15: session crud in progress 2012-10-02 19:54:29 -05: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
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
Seth Call 574206073c * adding migration helper to root 2012-09-03 20:53:13 -05:00
Seth Call 098a63f359 * adding 'Jam Sessions' link to header 2012-09-03 19:08:59 -05:00
Seth Call 993dd78b19 * jam-web working for milestone1 2012-09-03 17:03:16 -05:00
Seth Call fd4fcd3071 * nm; not going to run websocket gateway from within web app 2012-09-01 16:50:45 -05:00
Seth Call 2b951aec0d * getting ready to create a easy websocket starter mechanism that starts websocket whenever you run jam-web 2012-09-01 16:12:02 -05:00
Seth Call 4f8f4f392a * ok tests finally working. focused on websocket example next 2012-09-01 15:24:51 -05:00
Seth Call ee8919481e * forgot to add test db helper 2012-09-01 07:31:26 -05:00
Seth Call 77b2cc0137 * trying to fix routing issue cleanly 2012-09-01 07:10:59 -05:00
Seth Call 3839a283dd * addin reference to jam_ruby user models. some pages broken atm 2012-08-31 08:18:37 -05:00
Seth Call 5e38fa130a * half way done getting tests repaired for removal of followers/microsposts 2012-08-30 22:34:11 -05:00
Seth Call 15042a9c9b * removed all microposts/follower stuff; just user sign up and login 2012-08-30 22:01:52 -05:00
Seth Call 035ebb098e * initial web commit 2012-08-30 21:09:02 -05:00