Jonathan Kolyer
8bbfdbc013
VRFS-2795 instrument selection; json posting
2015-03-08 06:13:29 +00:00
Jonathan Kolyer
03321a8166
VRFS-2795 instrument json
2015-03-07 06:19:14 +00:00
Jonathan Kolyer
3549ea117c
VRFS-2795 generating json from filter settings
2015-03-06 07:20:14 +00:00
Jonathan Kolyer
2b9bebb438
VRFS-2795 generate JSON from filter settings
2015-03-06 07:03:30 +00:00
Jonathan Kolyer
15559f593f
VRFS-2795 sortorder, refactoring
2015-03-06 06:33:38 +00:00
Jonathan Kolyer
3810aecb00
merging feature/musician_profile_enhancements
2015-03-06 05:12:13 +00:00
Brian Smith
e658e6f4b5
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-05 02:18:55 -05:00
Jonathan Kolyer
d514a67be5
VRFS-2795 changed gig/studio vals to match profile enhancements branch
2015-03-05 05:51:26 +00:00
Steven Miers
c6497c8457
Kill puts.
2015-03-04 16:31:03 -06:00
Steven Miers
003b06cae0
VRFS-2782 : Fix error found by test.
2015-03-04 16:14:26 -06:00
Steven Miers
a34031728e
Cleanup
2015-03-04 16:14:01 -06:00
Steven Miers
ead2921e84
VRFS-2782 : Add api controller test for multiple bitrates. Fix bug found as a result.
2015-03-04 16:13:58 -06:00
Steven Miers
d526f98367
VRFS-2782 : Add a jam tracks builder spec to more directly exercise building, in addition to specific tests for 48kHz vs 44kHz
2015-03-04 16:13:45 -06:00
Steven Miers
63c45e0a6e
VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders.
2015-03-04 16:03:57 -06:00
Steven Miers
2004d48fa1
Merge
2015-03-04 16:03:28 -06:00
Brian Smith
12b610d2cb
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-04 02:03:22 -05:00
Seth Call
aba4546e44
Squashed commit of the following:
...
* VRFS-2881 use backend audio source info in metronome
* VRFS-2832 add metronome play controls with mode control
* VRFS-2873 straighten out metronome names in frontend
* VRFS-2782 use getMyNetworkState for ntp_stable determination
* VRFS-2864 allow 'cluster' test, a new metronome mode
* VRFS-2861 metronome sounds not always matching frontend
* VRFS-2852 relax idea that only one person can open metronome
* VRFS-2865 metronome sounds not always matching frontend(dup)
* VRFS-2847 metronome volume now moves master and personal both
* VRFS-2835 metronome 'prevent' message is now dialog, not notify
* VRFS-2833 anyone can control volume/mute of metronome
* VRFS-2850 don't prevent metronome if solo session
2015-03-03 19:06:55 -06:00
Jonathan Kolyer
930166b213
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-02 12:00:39 +00:00
Jonathan Kolyer
0e9f78ccdd
VRFS-2795 search filter front end start
2015-03-02 09:41:53 +00:00
Jonathan Kolyer
bfd3f3fac6
VRFS-2795 filled out JSON_SCHEMA
2015-02-28 22:45:43 +00:00
Jonathan Kolyer
171dcb04f0
VRFS-2795 interests filter
2015-02-28 21:18:43 +00:00
Jonathan Kolyer
88315fcc40
VRFS-2795 instrument and genre filtering tests
2015-02-28 20:37:15 +00:00
Jonathan Kolyer
d95279e694
VRFS-2795 merging feature/musician_profile_enhancements
2015-02-28 20:18:56 +00:00
Brian Smith
4d133e0043
merge develop
2015-02-28 02:24:23 -05:00
Jonathan Kolyer
2d8748d4ee
VRFS-2795 iterating on tests
2015-02-28 04:24:53 +00:00
Seth Call
9415593244
* merged
2015-02-27 08:41:49 -06:00
Seth Call
8205b5ea58
* VRFS-2841 - load jmep into the backend
2015-02-27 08:37:12 -06:00
Brian Smith
0c599ca023
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-25 21:55:57 -05:00
Seth Call
4a7d6925da
* wip
2015-02-25 19:56:26 -06:00
Seth Call
ca9e3706c7
* wip
2015-02-25 16:13:04 -06:00
Seth Call
dbaeb8d996
merged
2015-02-25 10:43:21 -06:00
Seth Call
947d649f5f
* VRFS-2831 - metronome showing
2015-02-24 17:16:12 -06:00
Jonathan Kolyer
2ea1259060
merging feature/musician_profile_enhancements
2015-02-24 06:08:33 +00:00
Jonathan Kolyer
a2ef5e9859
VRFS-2795 gig and studio tests
2015-02-24 06:06:40 +00:00
Seth Call
9dbf1a3e56
* VRFS-2634 adding version to jamtrack
2015-02-23 09:12:34 -06:00
Jonathan Kolyer
83f3d56238
VRFS-2795 musician search first draft
2015-02-23 06:21:36 +00:00
Brian Smith
c961c1fdc5
fix test
2015-02-22 22:36:15 -05:00
Brian Smith
20ac47a2e1
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-21 23:36:06 -05:00
Brian Smith
20baeb8bd3
VRFS-2701 wip UI changes for musician profile enhancements
2015-02-21 09:20:11 -05:00
Brian Smith
500af2bc05
merge develop (had lots of migration issues)
2015-02-20 08:35:59 -05:00
Steven Miers
bcd3785b45
VRFS-2785 : Update recurly client with refund functionality. Unit test to verify.
2015-02-19 16:40:19 -06:00
Seth Call
9345d65f06
* merged
2015-02-19 14:31:00 -06:00
Steven Miers
0907c1acd1
VRFS-2785 : Factory recurly client into ruby project. Fix references and specs as appropriate.
2015-02-19 01:06:50 -06:00
Seth Call
65a8cb5ca4
* VRFS-2800 - cleanup metronome and backing track info on active music session on leave of session
2015-02-18 16:22:24 -06:00
Seth Call
b5a70b8ec1
* skip master track types
2015-02-18 10:33:10 -06:00
Seth Call
04cce7ef98
* skip master track types
2015-02-18 10:27:17 -06:00
Seth Call
b09825d188
* VRFS-2791 - unique-ify recorded backing track and backing track IDs
2015-02-18 10:16:47 -06:00
Seth Call
c30d42c9dd
* VRFS-2777 use SetSessionControlState to update loop info
2015-02-18 03:43:33 -06:00
Seth Call
39415cdf22
* remove BPM from jam_tracks
2015-02-17 10:41:49 -06:00
Seth Call
e40c964d97
* merged
2015-02-15 22:15:34 -06:00