Commit Graph

7876 Commits

Author SHA1 Message Date
Brian Smith 5d5a5d1f23 added user follower models 2012-11-04 08:33:51 -05:00
Brian Smith c6a3e7957c added users_followers table 2012-11-04 08:32:14 -05:00
Seth Call d6431973c7 * replace display name with genre Id on display of session json 2012-11-03 23:27:37 -05:00
Brian Smith a219a689ba Merge branch 'master' of bitbucket.org:jamkazam/jam-db 2012-11-03 23:56:25 -04:00
Brian Smith b3db03ff66 cleaned up scripts 2012-11-03 23:56:08 -04:00
Seth Call 2bb9548f54 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2012-11-03 22:52: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 5d1f65d027 * VRFS-34 and VRFS-61; session.tracks and instrument listing 2012-11-03 22:22:35 -05: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
Seth Call 681fc6e5ea * VRFS-34 and VRFS-61; session.tracks and instruments 2012-11-03 21:48:42 -05:00
Seth Call a7eb0cc64d Merge branch 'master' of bitbucket.org:jamkazam/jam-db 2012-11-03 21:48:23 -05:00
Seth Call 63e622be4a * VRFS-34 and VRFS-61; session.tracks and instruments 2012-11-03 21:48:20 -05:00
Jonathon Wilson a27b3f4a63 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2012-11-03 15:51:45 -06:00
Jonathon Wilson 79963e62ca Rework session screen to show tracks for uses as they enter/leave 2012-11-03 14:25:23 -06:00
Brian Smith 6c9ef03192 band APIs 2012-11-03 15:32:57 -04:00
Brian Smith d64e8962c7 band APIs 2012-11-03 15:32:27 -04:00
Brian Smith 1b39bc1fff resolve merge conflicts 2012-11-03 15:31:41 -04:00
Brian Smith e65c817024 update musicians_instruments table 2012-11-03 15:25:18 -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
Brian Smith 36f14c19d1 add support to create users / update instruments via API 2012-11-03 09:54:24 -04:00
Jonathon Wilson 7782938a96 Support multiple genres. Rough notifciation and form validation. 2012-11-02 18:29:58 -06:00
Seth Call 1ca1e4c884 * adding UserLeftMusicSession (to compliment UserJoinedMusicSession) 2012-11-02 02:47:54 -05:00
Seth Call dc7dfee8d9 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2012-11-02 01:53:43 -05:00
Seth Call be39434e1c * VRFS-31; merging from master 2012-11-02 01:53:32 -05:00
Seth Call 1c095f77f2 * list sessions has correct sort order VRFS-31 2012-11-02 01:52:12 -05:00
Seth Call 2edaf4ca71 * list sessions has correct sort order 2012-11-02 01:51:52 -05:00
Seth Call 7f51880509 * fixnig build script to work again with no BUILD NUMBER specified 2012-11-02 01:51:40 -05:00
Seth Call 1439ab6da6 * adding musician_access to music_session 2012-11-01 21:06:01 -05:00
Seth Call ba1aa4e01a * working on gem builds 2012-11-01 17:25:03 -05:00
Brian Smith 56f27930a8 band APIs 2012-10-30 23:28:17 -04:00
Brian Smith 6658c57a07 removed UserInstrument model 2012-10-30 23:26:43 -04:00
Seth Call 6649b09715 * trying to execute a login shell instead 2012-10-30 07:26:40 -05:00
Seth Call 175f6e4f80 * adding ruby decl at top to quiet trust question of rvm 2012-10-30 06:54:37 -05:00
Brian Smith 9bcc0d2014 fixed build problem 2012-10-30 02:15:55 -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 f3fc987b29 Merge branch 'master' of bitbucket.org:jamkazam/jam-db 2012-10-30 01:41:04 -04:00
Brian Smith bb7e82366e renamed musician/band related user tables 2012-10-30 01:40:52 -04:00
Brian Smith 8bc6b44ee6 add bands to users feed 2012-10-30 01:39:43 -04:00
Brian Smith 6ba6b7d595 fix instruments part of payload 2012-10-29 20:56:51 -04:00
Brian Smith bbfe15240b fix instruments part of payload 2012-10-29 20:55:27 -04:00
Jonathon Wilson 2fa2c22e6d Minor tweaks to Tiho's saving of sessionId on screen events 2012-10-29 09:10:02 -06:00
Jonathon Wilson 5b68651731 Add missing semicolon 2012-10-29 08:35:10 -06:00
Brian Smith 431367ea08 initial musician / band dev 2012-10-29 06:46:24 -04:00
Brian Smith 662fcf0112 initial musician / band dev 2012-10-29 06:45:47 -04:00
Brian Smith 30e3f8f33e added script to insert instruments 2012-10-29 06:43:52 -04:00