Seth Call
9279d88d8d
* VRFS-2876 - pro licensing added and 20 second snippet
2015-03-10 22:10:22 -05:00
d865d0a1fa
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-09 20:25:28 -04:00
Seth Call
882f2267cf
* fixing urls getting messed with my mount uploader
2015-03-09 16:35:39 -05:00
e91ee68d58
VRFS-2822 : Add options to query for both filtering on artist and grouping on artist (to get a list of artists through existing query infrastructure).
2015-03-09 10:11:47 -05:00
Seth Call
a10705c163
* VRFS-2909 - jam tracks importer
2015-03-09 09:44:12 -05:00
e658e6f4b5
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-05 02:18:55 -05:00
c6497c8457
Kill puts.
2015-03-04 16:31:03 -06:00
003b06cae0
VRFS-2782 : Fix error found by test.
2015-03-04 16:14:26 -06:00
a34031728e
Cleanup
2015-03-04 16:14:01 -06:00
ead2921e84
VRFS-2782 : Add api controller test for multiple bitrates. Fix bug found as a result.
2015-03-04 16:13:58 -06:00
63c45e0a6e
VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders.
2015-03-04 16:03:57 -06:00
2004d48fa1
Merge
2015-03-04 16:03:28 -06:00
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
4d133e0043
merge develop
2015-02-28 02:24:23 -05:00
5396e66c67
Merge with develop
2015-02-27 11:51:45 -06:00
d314c3327c
VRFS-2782 : Fix error found by test.
2015-02-27 11:38:40 -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
2823645a60
Merge with develop & fix manifest.
2015-02-26 17:49:10 -06:00
718e43df5d
Cleanup
2015-02-26 17:43:30 -06:00
030fa1a351
VRFS-2782 : Add api controller test for multiple bitrates. Fix bug found as a result.
2015-02-26 17:43:22 -06:00
bd08b40e71
VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders.
2015-02-26 17:00:01 -06:00
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
ef287187ba
VRFS-2782 : Support multiple bit rates for jam tracks: migration, model and test updates.
2015-02-25 17:19:03 -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
9c9c01b2fd
VRFS-2785 : Make id fields accessible for admin UI.
2015-02-25 09:41:51 -06:00
Seth Call
9dbf1a3e56
* VRFS-2634 adding version to jamtrack
2015-02-23 09:12:34 -06:00
20ac47a2e1
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-21 23:36:06 -05:00
20baeb8bd3
VRFS-2701 wip UI changes for musician profile enhancements
2015-02-21 09:20:11 -05:00
500af2bc05
merge develop (had lots of migration issues)
2015-02-20 08:35:59 -05:00
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
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
Seth Call
afe9f65709
* merged
2015-02-15 22:14:30 -06:00
Seth Call
42a2abe99c
* merged
2015-02-15 22:01:06 -06:00
09b4ed09a4
VRFS-2696 edit musician profile API enhancements
2015-02-15 08:23:26 -05:00
4b97807fc8
fix syntax error
2015-02-14 21:14:13 -05:00
0a1837c4e6
VRFS-2695 VRFS-2696 wip get/update musician profile API changes
2015-02-14 21:02:26 -05:00
28ff54b000
VRFS-2695 wip new profile API
2015-02-13 03:16:48 -05:00
8bd311647a
VRFS-2693 performance model/tests
2015-02-13 01:32:55 -05:00
aedcbde1f3
Merge with develop
2015-02-12 14:32:12 -06:00
895fb92365
VRFS-2693 VRFS-2694 performance sample model wip
2015-02-11 22:33:10 -05:00
e3f27eeebc
VRFS-2694 user presence model tests
2015-02-10 02:44:16 -05:00
9ede0912a1
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-07 23:22:48 -05:00
Seth Call
3563e6e08a
* VRFS-2747 - incorporating welcome message from David; made headers white
2015-02-06 17:07:18 -06:00
33aef8a380
VRFS-2694 user presence model
2015-02-05 03:34:25 -05:00
05ba1ea5d3
VRFS-2694 wip user presence model and spec
2015-02-03 23:37:20 -05:00
80305c05aa
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-02 19:22:33 -05:00
cce2ce2ffc
minor change to ensure current instance session id is used
2015-02-01 17:15:01 -05:00
79507f5f06
VRFS-2693 VRFS-2694 wip new musician profile models and specs
2015-02-01 08:42:44 -05:00
Seth Call
ac1271634d
* VRFS-2716 - changes to deal with new getBackingList format, VRFS-2661 - accepting backing_track info in Track.sync (wip)
2015-01-31 15:20:48 -06:00
8d19e4510e
VRFS-2693 VRFS-2694 wip new musician profile models
2015-01-31 16:07:34 -05:00
Seth Call
96bc9487c4
* merged
2015-01-29 16:13:40 -06:00
33177ddae6
Merge with develop.
2015-01-29 10:55:10 -06:00
5ed67cc8f6
VRFS-2667, VRFS-2668 : Fix broken spec.
2015-01-29 09:50:13 -06:00
f521f3ba4c
VRFS-2689 new ruby models supporting db schema updates
2015-01-29 00:48:24 -05:00
5a2fbab21c
VRFS-2689 user model changes for musician profile enhancements
2015-01-29 00:45:47 -05:00
63574f5a25
VRFS-2667, VRFS-2668 : list_uploads and list_downloads implementation and tests.
2015-01-28 19:22:36 -06:00
d7fc313d5f
VRFS-2665, VRFS-2666 : Create models and relationships for two new tables: backing_tracks and recorded_backing_tracks
2015-01-28 19:22:36 -06:00
Seth Call
6de64a1005
Merge branch 'develop' into feature/session_jamtracks
2015-01-26 21:22:59 -06:00
6f8113b374
Merge branch 'develop' into feature/backing_tracks
2015-01-26 12:11:57 -06:00
Seth Call
65f1f0fe79
* VRFS-2640 - double-check if jobs are concurrent safe
2015-01-23 14:50:09 -06:00
Seth Call
9c9a42c2a5
* merged
2015-01-23 13:56:10 -06:00
3f2be132bd
VRFS-2539 protect against error during notification load if the related session is missing / clean up the notifications of nonexistent sessions
2015-01-21 22:40:31 -05:00
c70a5ee2bb
Merge branch 'develop' into feature/backing_tracks
2015-01-21 14:16:04 -06:00
f80b0e4f66
VRFS-2193 show only active musicians in each feed item detail view for in-progress sessions
2015-01-20 02:21:25 -05:00
fe64995f54
Merge branch 'develop' into feature/backing_tracks
2015-01-19 17:10:28 -06:00
cefce67e89
Merge branch 'develop' into feature/backing_tracks
2015-01-19 15:21:13 -06:00
Seth Call
8f9e49ccf1
* VRFS-2660 - fixing dead links in welcome email and some corp pages
2015-01-19 15:07:52 -06:00
Seth Call
f8b3d8cc7d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-19 10:25:53 -06:00
Seth Call
c5af644a38
* do not accept latency above 10000ms on user model
2015-01-16 17:20:07 -06:00
2017fed9ce
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-12 22:37:28 -05:00
54d0f36319
VRFS-2465 use new table for text messages
2015-01-12 22:37:07 -05:00
c6f03a91b8
VRFS-2498, VRFS-2618 More coherent data model and logic for backing tracks and metronome re: active_music_session_spec.
2015-01-12 17:44:20 -06:00
Seth Call
5b17c50f83
* make reconnect messages warn
2015-01-12 14:10:26 -06:00
babd9d7d90
VRFS-2540 : Don't send welcome email if recaptcha fails. Spec to verify.
2015-01-12 12:41:44 -06:00
73e8f9ac6f
VRFS-2465 wip text message changes
2015-01-12 01:26:27 -05:00
21f25e51d0
VRFS-1985 VRFS-2252 added tests
2015-01-12 01:20:19 -05:00
Seth Call
d139966445
VRFS-2643 - run eventmachine in it's own thread
2015-01-11 16:41:49 -06:00
Seth Call
2c8a4b8483
* VRFS-2642 - reconnect at start of each job
2015-01-11 15:43:42 -06:00
Seth Call
4d8a7a9bc1
* wip
2015-01-11 15:42:12 -06:00
d0c0c6d01e
VRFS-2498, VRFS-2499 : Validations.
2015-01-11 14:15:47 -06:00
Seth Call
e8ffb9c27d
Merge branch 'develop' into feature/session_jamtracks
2015-01-09 11:24:03 -06:00
Seth Call
2c798e8860
* VRFS-2629 - one can follow the progression of a jam track being signed with detail
2015-01-09 11:23:20 -06:00
Seth Call
cc3bf2ce1f
* wip
2015-01-08 20:35:39 -06:00
Seth Call
b5c446dd04
* VRFS-2625 - adding bpm and tap_in_count to tap in row, and remove tap_in from jamtracks
2015-01-08 11:38:46 -06:00
Seth Call
e28db48e94
* resolving VRFS-2624 - if nil recording_ids, just exit early
2015-01-08 10:25:54 -06:00
Seth Call
e9e9962c42
Conflicts:
...
db/manifest
ruby/spec/jam_ruby/models/email_batch_spec.rb
2015-01-07 17:44:56 -06:00
Seth Call
d58cf2a048
* VRFS-2617 - allow only purchased jamtracks to be returned by list method. (reuse existing API)
2015-01-07 16:16:57 -06:00
Seth Call
Brian Smith
Steven Miers