seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity
97 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

51 Commits

Author SHA1 Message Date
Seth Call 35f5c13283 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2012-11-15 20:50:13 -06:00
Seth Call 1a99565ea4 * VRFS-92 stub out music session params 2012-11-15 20:50:03 -06:00
Mike Slemmer 47b425b5ed some more work 2012-11-15 01:30:55 -08:00
Mike Slemmer 436495b751 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2012-11-14 21:51:57 -08:00
Brian Smith ecf792b404 VRFS-89, VRFS-90 remove name from user model 2012-11-14 22:24:30 -05:00
Mike Slemmer c938c2c768 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2012-11-14 12:08:36 -08:00
Seth Call ed76fe8699 * moving user_manager out of jam_ruby, but moving alot of logic within user_manager to User model 2012-11-13 23:37:18 -06:00
Mike Slemmer 634eebb685 added model 2012-11-13 13:21:04 -08:00
Mike Slemmer 1a81f6b58b Added authorization 2012-11-12 23:40:06 -08:00
Seth Call 5309f46964 Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby 2012-11-12 21:12:36 -06:00
Brian Smith 5ba9302290 add account fields 2012-11-12 21:52:05 -05:00
Seth Call 33c2bbd68e * VRFS-72 2012-11-12 07:26:02 -06:00
Seth Call 770134c883 * VRFS-72 merging conflicts, mostly because of FactoryGirl vs User.save 2012-11-12 07:08:50 -06:00
Seth Call eb00be630b * UserManager added 2012-11-12 06:28:44 -06:00
Brian Smith b2880dc65a added first and last name fields 2012-11-10 23:23:38 -05:00
Mike Slemmer 2982cd998a added comment 2012-11-08 22:51:17 -08:00
Mike Slemmer 27fb2f3ceb minor cleanup 2012-11-08 22:29:05 -08:00
Seth Call 1968f1a80f * VRFS-32 merged 2012-11-07 22:06:58 -06:00
Seth Call 59d3f44478 * VRFS-32; integrating elasticsearch and /api/search completed 2012-11-07 07:10:41 -06:00
Brian Smith 78445ba25b added analytics to user/band details 2012-11-05 23:47:50 -05:00
Brian Smith 4536cdc4eb added location info 2012-11-05 21:55:08 -05:00
Brian Smith 7ffc952717 band follower APIs 2012-11-04 17:54:53 -05:00
Brian Smith 5d5a5d1f23 added user follower models 2012-11-04 08:33:51 -05: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 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 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 229ab95d34 updates for musicians 2012-10-27 22:35:28 -04: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
Brian Smith cccae35a97 friend API development 2012-10-13 22:18:20 -04: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 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