2004d48fa1
Merge
2015-03-04 16:03:28 -06: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
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
Seth Call
3abe9108cd
* fix typo
2015-02-26 10:04:59 -06:00
Seth Call
671151b460
* VRFS-2804 - widen authorization token
2015-02-26 10:00:21 -06:00
Seth Call
6107622f79
* VRFS-2839 - add check to admin
2015-02-25 22:05:18 -06:00
Seth Call
a02f7c2dfb
* VRFS-2839 - add check to admin
2015-02-25 22:04:58 -06:00
Seth Call
471f590ef7
* update doc of teaspoon tests; really just a fake bump for dev build
2015-02-25 19:57:01 -06:00
Seth Call
4a7d6925da
* wip
2015-02-25 19:56:26 -06:00
Seth Call
6b795695ee
* VRFS-2753 - assign volume left over volume right to ensure both mono and stereo backend inputs get the data they need
2015-02-25 16:15:41 -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
Seth Call
a7824249a8
* VRFS-2826 - fix regression where remote peers couldn't see tracks
2015-02-23 22:29:28 -06:00
Seth Call
c5b77a02fa
* check shopping cart on leave of shopping cart screen
2015-02-23 17:30:06 -06:00
Seth Call
4841e56dce
* VRFS-2634 - add version check to jamtrack packages
2015-02-23 16:56:21 -06:00
Seth Call
c8752fd830
* VRFS-2634 - add version check to jamtrack packages
2015-02-23 16:55:19 -06:00
Seth Call
0795791909
* move displayCartIcon method to init logic
2015-02-23 16:03:44 -06:00
Seth Call
78ed25ea82
* actually init the shopping cart
2015-02-23 16:00:30 -06:00
Seth Call
be4627d51f
* move around shopping cart init
2015-02-23 15:55:02 -06:00
Seth Call
d89e2f8e56
* VRFS-2818 - mute and volume faders control both mixer/personal simultaneously. more work required for moving of input tracks affecting backing tracks personal mix
2015-02-23 15:00:57 -06:00
Seth Call
ae920c5a1a
* stop play issued before close of backing track
2015-02-23 10:56:22 -06:00
Seth Call
1dbfdf0546
* VRFS-2811 - read loop state when drawing track
2015-02-23 10:45:10 -06:00
Seth Call
9dbf1a3e56
* VRFS-2634 adding version to jamtrack
2015-02-23 09:12:34 -06:00
dcf3706099
VRFS-2798 : Hide/show shopping cart icon depending on contents.
2015-02-20 17:53:18 -06:00
00d8244c6a
VRFS-2786 : Change disabled text for jam track to say "Purchased". Update unit test as well.
2015-02-20 16:40:23 -06:00
fbb61f6180
Merge branch 'develop' into feature/jam_tracks_refund
2015-02-20 13:16:18 -06:00
Seth Call
0472d6bc79
* VRFS-2686 - jamtrack sliders work
2015-02-20 11:55:49 -06:00
40eea6319e
Add recurly dependency.
2015-02-20 10:40:23 -06:00
Seth Call
ea482da0dc
* VRFS-2808 - prevent duplicate attempt to open recording
2015-02-20 10:01:11 -06:00
Seth Call
9d70400e91
* VRFS-2806 - disallow concurrent open of dialog
2015-02-20 09:50:03 -06:00
e662c95fba
VRFS-2785 : Add Jam Track Right (purchased jam track) to admin ui. Hook up a refund action.
2015-02-19 16:41:09 -06:00
bcd3785b45
VRFS-2785 : Update recurly client with refund functionality. Unit test to verify.
2015-02-19 16:40:19 -06:00
Seth Call
38849a1c44
VRFS-2804 - fix code to find the jamtrack ID correctly based on recent client changes
2015-02-19 15:56:42 -06:00
Seth Call
9345d65f06
* merged
2015-02-19 14:31:00 -06:00
Seth Call
7493726e14
* fix test
2015-02-19 13:40:00 -06:00
Seth Call
2b227912cb
* take out hard-coded jamtrack id
2015-02-19 11:29:13 -06:00
Seth Call
d151101567
* VRFS-2803 - remove visually duplicated fader gain bar
2015-02-19 10:44:20 -06:00
Seth Call
85ffa2ec21
* VRFS-2802 - moving media files mixers in personal mode actually affect master mode now
2015-02-19 09:31:30 -06:00
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
23c7307c6f
* VRFS-2796 - hide X for non openers
2015-02-18 15:41:51 -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
bf0f1345ed
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-02-18 03:44:38 -06:00
Seth Call
c30d42c9dd
* VRFS-2777 use SetSessionControlState to update loop info
2015-02-18 03:43:33 -06:00
232873819e
VRFS-2700 cleaned up broken tests
2015-02-18 06:33:06 +00:00
Seth Call
39415cdf22
* remove BPM from jam_tracks
2015-02-17 10:41:49 -06:00
Steven Miers
Seth Call
Jonathan Kolyer