42 Commits

Author	SHA1	Message	Date
Seth Call	8102ba9ec0	* VRFS-32; missed a bunch of new files	2012-11-07 19:13:35 -06:00
Seth Call	59d3f44478	* VRFS-32; integrating elasticsearch and /api/search completed	2012-11-07 07:10:41 -06:00
Seth Call	f9cc5f517f	Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby	2012-11-03 22:51:21 -05:00
Brian Smith	1a366b2385	fix unit tests	2012-11-03 23:49:36 -04:00
Seth Call	aca5e758b4	* VRFS-34 and VRFS-61; forgot to add new connection_track model	2012-11-03 22:20:05 -05:00
Seth Call	54ac90d386	Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby	2012-11-03 22:02:14 -05:00
Seth Call	5657bebab8	* VRFS-61 and VRFS-34; session.tracks and instrument listing	2012-11-03 22:02:11 -05:00
Brian Smith	d64e8962c7	band APIs	2012-11-03 15:32:27 -04:00
Brian Smith	b67a34d46d	use instrument id instead of description	2012-11-03 11:38:00 -04:00
Brian Smith	e81a68f5c8	Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby	2012-11-03 09:55:10 -04:00
Brian Smith	e41fd71212	add support to create users / update instruments via API	2012-11-03 09:54:55 -04:00
Seth Call	be39434e1c	* VRFS-31; merging from master	2012-11-02 01:53:32 -05:00
Seth Call	2edaf4ca71	* list sessions has correct sort order	2012-11-02 01:51:52 -05:00
Brian Smith	6658c57a07	removed UserInstrument model	2012-10-30 23:26:43 -04:00
Brian Smith	bc3b0e5c57	add bands to user details API, renamed band/musician related user models	2012-10-30 01:42:16 -04:00
Brian Smith	6ba6b7d595	fix instruments part of payload	2012-10-29 20:56:51 -04:00
Brian Smith	662fcf0112	initial musician / band dev	2012-10-29 06:45:47 -04: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
Seth Call	f4149648c6	* VRFS-27 invitation model and tests added	2012-10-27 14:22:05 -05:00
Seth Call	9ab04a7e74	* invitatations table and model build and tested	2012-10-26 05:33:39 -05:00
Seth Call	a8f46f8d7d	* VRFS-21; adding genres field to session CRUD	2012-10-25 07:11:10 -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
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
Brian Smith	daa042630d	formatting	2012-10-14 00:21:52 -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
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
Brian Smith	5ba13fa893	fixed issues found in unit tests	2012-10-07 14:02:26 -04:00
Brian Smith	a250559b0f	merge master	2012-10-07 00:57:23 -04:00
Seth Call	0f37d1523c	* VRFS-15: new models for sessions REST API	2012-10-02 22:50:23 -05:00
Brian Smith	2c60c3b263	added friend_update message / user presence development	2012-10-02 01:02:02 -04:00
Brian Smith	4660434a2b	user presence development	2012-10-01 17:27:32 -04:00
Seth Call	cc45a358e6	* fixed tests; setting default setting of 'public' for tests to false	2012-09-03 17:01:05 -05:00
Seth Call	069de7e754	*making updating password not mandatory on user update	2012-08-29 08:21:30 -05:00
Seth Call	3db0861a55	* making to_string of models more useful	2012-08-26 13:28:08 -05:00
Seth Call	5ee5b765c4	* changing how primary key is defined (using non deprecated method)	2012-08-22 07:57:50 -05:00
Seth Call	e8ebdeb5ef	* declaring 'id' as primary key. this makes factory_girl behave on jdbc	2012-08-21 22:07:01 -05:00
Seth Call	0f847580e6	* jam-ruby updated to include jam_session model and tests	2012-08-18 13:48:43 -05:00
Seth Call	e8ec5f3eaf	* ported user model from rails tutorial; and it's tests	2012-08-05 22:01:00 -05:00