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
Seth Call
9415593244
* merged
2015-02-27 08:41:49 -06:00
Seth Call
dbaeb8d996
merged
2015-02-25 10:43:21 -06:00
c961c1fdc5
fix test
2015-02-22 22:36:15 -05:00
20ac47a2e1
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-21 23:36:06 -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
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
39415cdf22
* remove BPM from jam_tracks
2015-02-17 10:41:49 -06:00
Seth Call
42a2abe99c
* merged
2015-02-15 22:01:06 -06: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
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
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
7352fa9b19
* VRFS-2613 - optimizing hourly cleanup by moving it to the score report routine
2015-01-30 10:46:02 -06: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
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
4741312294
Fix test, cleanup
2015-01-21 15:10:02 -06:00
cefce67e89
Merge branch 'develop' into feature/backing_tracks
2015-01-19 15:21:13 -06:00
Seth Call
c5af644a38
* do not accept latency above 10000ms on user model
2015-01-16 17:20:07 -06: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
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
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
e28db48e94
* resolving VRFS-2624 - if nil recording_ids, just exit early
2015-01-08 10:25:54 -06:00
Seth Call
3fb5ab89d9
* typo in user wipe to fix test
2015-01-07 18:24:48 -06:00
Seth Call
ef03b8886a
* missed merge conflict
2015-01-07 17:45:47 -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
99f5e46ff6
* another quick fix for broken databasecleaner transaction cleanup
2015-01-07 16:57:25 -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
2ff30946e8
* VRFS-2606 - add new tap in fields, support them in activeadmin
2015-01-07 09:30:05 -06:00
Seth Call
eb26c33858
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-05 20:26:42 -06:00
Seth Call
4e6ca425d9
* trying to fix tests
2015-01-05 20:26:36 -06:00
02aef2fe17
Fix test failures for jam_track rights.
2015-01-05 19:02:48 -06:00
Seth Call
6906e4454a
* VRFS-2601 - REST API to return keys
2015-01-05 16:53:43 -06:00
Seth Call
aabbd90b02
* VRFS-2602 change jka to jkz
2015-01-05 14:39:55 -06:00
Seth Call
aed848c507
Merge branch 'develop' into feature/jam_tracks
...
Conflicts:
db/manifest
pb/src/client_container.proto
ruby/lib/jam_ruby.rb
web/config/environments/development.rb
web/config/environments/test.rb
2015-01-04 09:31:33 -06:00
Seth Call
5758096f33
* fix bug in connection stats
2015-01-01 21:45:07 -06:00
Seth Call
786486026b
* wip
2014-12-30 17:10:16 -06:00
Brian Smith
Seth Call
Steven Miers