e0d2feb84d
VRFS-2795 pagination
2015-04-04 17:29:15 +00:00
e4795d9297
VRFS-2795 fixed filter description issue
2015-04-04 15:36:15 +00:00
e563ad0d8b
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-04-04 14:56:36 +00:00
91e9e73644
VRFS-2701 adding SoundCloud/YouTube sources fully functional
2015-04-04 21:46:37 -04:00
4fbf3e694d
VRFS-2795 filter description & spec tests; support for reset, cancel buttons; proper display and update impl
2015-04-04 14:55:41 +00:00
Seth Call
821ca9d76a
* VRFS-2875 - sales record keeping as well as recurly hook processing
2015-04-03 15:34:12 -05:00
4f7c43b9d8
VRFS-2795 cloning old search code into new musician_search
2015-04-02 14:52:16 +00:00
c3ede10f1d
merging feature/musician_profile_enhancements
2015-04-02 14:51:33 +00:00
a87c08afe3
Merge branch 'develop' into feature/musician_profile_enhancements
2015-04-01 23:09:51 -04:00
Seth Call
c0e541b49d
* importer
2015-04-01 20:38:54 -05:00
Seth Call
d3cc9fa6af
* download master command
2015-04-01 20:35:23 -05:00
4c2d4958fe
VRFS-2894 Update email / user info in recurly upon finalize. Test to verify.
2015-03-31 20:25:54 -05:00
Seth Call
b1b2d3ad24
* VRFS-2869 - band landing page
2015-03-31 16:17:17 -05:00
Seth Call
47c6b3ec16
* VRFS-2870 - tests add for individual jam track song page
2015-03-31 15:17:43 -05:00
Seth Call
f7febfabcf
* VRFS-2999 - create whole track preview for master track on import
...
* VRFS-3000 - create duration for jam track
* VRFS-2996 - create jamtrack preview widget
* VRFS-2870 - individual jam track landing page (still needs tests)
2015-03-31 13:36:49 -05:00
ddc4decfd3
merging feature/musician_profile_enhancements
2015-03-30 06:07:43 +00:00
Seth Call
3d43f123b1
* VRFS-2992 -make mp3 as well as ogg preview
2015-03-29 21:51:14 -05:00
83c00ea6e4
merge develop
2015-03-29 10:12:42 -04:00
401fd43849
Merge branch 'feature/jam_track_ui_2' into develop
2015-03-27 15:48:08 -05:00
4f08f6acad
Merge and fix
2015-03-27 09:54:01 -05:00
Seth Call
e2957592ea
VRFS-2605 - audiomixer manifest updated for volume and offsets
2015-03-26 17:45:23 -05:00
3f994e3993
Merge branch 'develop' into feature/jam_track_ui_2
2015-03-26 11:59:49 -05:00
bb4ea7cd94
Merge branch 'feature/jam_track_ui_2' of bitbucket.org:jamkazam/jam-cloud into feature/jam_track_ui_2
2015-03-26 11:59:42 -05:00
Seth Call
ef78471b59
Merge cherry pick
2015-03-26 11:58:41 -05:00
Seth Call
4a36bc6982
* VRFS-2988 - relax position duplication constraint
2015-03-26 10:16:14 -05:00
21322318d8
VRFS-2795 latency ordering
2015-03-26 06:28:38 +00:00
f3344affaf
VRFS-2795 distance sort order
2015-03-26 05:56:43 +00:00
9eeb0e454b
VRFS-2795 merging with feature/musician_profile_enhancements
2015-03-26 03:31:21 +00:00
Seth Call
0848a59082
* merged develop again
2015-03-25 14:32:03 -05:00
Seth Call
f0c4647ef5
* VRFS-2981 - check for create_type = nil in scheduled_rsvp
2015-03-25 11:26:32 -05:00
Seth Call
53ef0f1b4f
VRFS-2975 - change jam track Id to varchar(64)
2015-03-25 11:11:10 -05:00
5f953d1b19
VRFS-2830 : Merge / manual fix
2015-03-25 10:56:24 -05:00
adef8c8c45
VRFS-2830 : Payment History
...
API, client, view, styles and test
2015-03-24 17:13:09 -05:00
Seth Call
18563ff065
* VRFS-2890 fix infinite scroll as well as bug with limit vs per_page style scrolling
2015-03-24 14:59:20 -05:00
Seth Call
bfe302b2f1
* merged
2015-03-24 14:43:48 -05:00
Seth Call
ccd60aa631
* merged develop
2015-03-24 11:27:26 -05:00
Seth Call
1c0407cca4
* wip
2015-03-24 10:19:21 -05:00
9face3b3f9
VRFS-2701 wip presence/sample edit
2015-03-23 16:27:36 -04:00
8c2df0bb6b
VRFS-2916 added jamtrack plays handling; worked around jam_tracks.id bigint problem (with commented dependencies); tested jamtrack play saves from JS through rspec; final cleanup of cohort reporting
2015-03-23 20:06:32 +00:00
Seth Call
04aa1a9b3c
* wip
2015-03-23 08:52:52 -05:00
96a816f317
merge develop
2015-03-21 10:06:53 -04:00
Seth Call
b137d7586f
* VRFS-2973 - fix pagination in jam trackdialog
2015-03-20 21:27:11 -05:00
Seth Call
36b4179492
* VRFS-2972 - adding test purchase feature to jam-admin for buying all JamTracks (admin users only)
2015-03-20 17:26:56 -05:00
Seth Call
f29a9d7465
* wip
2015-03-20 16:15:13 -05:00
Seth Call
49368e2e66
Merge branch 'hotfix/recording_fix' into develop
2015-03-20 11:26:50 -05:00
Seth Call
301b365044
* VRFS-2968 - escape strings passed to JamTrack builder
2015-03-20 09:44:25 -05:00
Seth Call
10f25be8c4
* replace old style of volume changes VRFS-2964
2015-03-20 08:53:34 -05:00
Seth Call
661c4ed446
* wip
2015-03-20 08:48:00 -05:00
abb31c4e40
VFFS-2830 : Jam tracks account overview
2015-03-17 13:52:30 -05:00
Seth Call
bb35535262
* VRFS-2941 - fix meddling of mount_uplaoder with existing URS
2015-03-17 10:55:16 -05:00
c91fd0cb0e
merge develop
2015-03-17 03:10:22 -04:00
Seth Call
ab72438a3f
* VRFS-2932 - make preview apply to all jam track tracks
2015-03-16 17:50:38 -05:00
Seth Call
97d469cc85
* wip
2015-03-16 13:27:39 -05:00
f4cd225142
VRFS-2823 : Bugfix and cleanup.
2015-03-15 19:45:58 -05:00
b91bc09817
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-15 11:09:21 -04:00
Seth Call
7c73e2ab5c
* VRFS-2922 - show spinner for pending metronome
2015-03-12 21:53:23 -05:00
948174f19a
VRFS-2701 musical experience bug fix
2015-03-12 21:34:20 -04:00
Seth Call
f9e02c5707
Merge branch 'develop' into feature/jam_track_ui_2
...
Conflicts:
admin/app/admin/jam_tracks.rb
admin/app/views/admin/jam_tracks/_form.html.slim
admin/app/views/admin/jam_tracks/_jam_track_track_fields.html.slim
admin/config/initializers/jam_tracks.rb
db/manifest
ruby/lib/jam_ruby.rb
ruby/lib/jam_ruby/app/uploaders/jam_track_track_uploader.rb
ruby/lib/jam_ruby/jam_tracks_manager.rb
ruby/lib/jam_ruby/models/jam_track.rb
ruby/lib/jam_ruby/models/jam_track_right.rb
ruby/lib/jam_ruby/models/jam_track_track.rb
ruby/spec/jam_ruby/models/jam_track_right_spec.rb
ruby/spec/jam_ruby/models/jam_track_track_spec.rb
ruby/spec/jam_ruby/resque/jam_tracks_builder_spec.rb
web/app/assets/javascripts/download_jamtrack.js.coffee
web/app/assets/javascripts/globals.js
web/app/assets/javascripts/jam_rest.js
web/app/assets/javascripts/order.js
web/app/assets/javascripts/playbackControls.js
web/app/assets/javascripts/session.js
web/app/assets/stylesheets/client/session.css.scss
web/app/controllers/api_jam_tracks_controller.rb
web/app/controllers/api_recurly_controller.rb
web/spec/controllers/api_jam_tracks_controller_spec.rb
2015-03-12 08:51:52 -05:00
41626860a9
VRFS-2795 replacing musician page with new search filter
2015-03-12 04:39:20 +00:00
Seth Call
9c2a0c79f6
* VRFS-2866 - making listing of JamTracks not require a logged in user
2015-03-11 21:30:56 -05:00
Seth Call
f2b453ea19
* VRFS-2917 - shopping cart can be anonymous
2015-03-11 20:55:11 -05:00
4ebbff42cc
VRFS-2823 : Jam Tracks shopping page updates
...
* Remove individual labels from search and show a “Filter JamTracks”
label.
* Style
* Add filter box for artist & populate
* Bind events in JS and pass through to api
* Tweak api park from “artist_name” to “artist”
2015-03-11 15:40:12 -05:00
Seth Call
6c82e00d00
* VRFS-2876 cleaning up preview downloadability in jam-admin
2015-03-11 09:20:45 -05:00
Seth Call
9279d88d8d
* VRFS-2876 - pro licensing added and 20 second snippet
2015-03-10 22:10:22 -05:00
b998d28c37
VRFS-2795 merging with feature/musician_profile_enhancements
2015-03-10 04:33:37 +00: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
33f10e3197
VRFS-2795 fixing search specs
2015-03-09 06:13:56 +00:00
8bbfdbc013
VRFS-2795 instrument selection; json posting
2015-03-08 06:13:29 +00:00
03321a8166
VRFS-2795 instrument json
2015-03-07 06:19:14 +00:00
3549ea117c
VRFS-2795 generating json from filter settings
2015-03-06 07:20:14 +00:00
2b9bebb438
VRFS-2795 generate JSON from filter settings
2015-03-06 07:03:30 +00:00
15559f593f
VRFS-2795 sortorder, refactoring
2015-03-06 06:33:38 +00:00
3810aecb00
merging feature/musician_profile_enhancements
2015-03-06 05:12:13 +00:00
e658e6f4b5
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-05 02:18:55 -05:00
d514a67be5
VRFS-2795 changed gig/studio vals to match profile enhancements branch
2015-03-05 05:51:26 +00: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
930166b213
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-02 12:00:39 +00:00
0e9f78ccdd
VRFS-2795 search filter front end start
2015-03-02 09:41:53 +00:00
bfd3f3fac6
VRFS-2795 filled out JSON_SCHEMA
2015-02-28 22:45:43 +00:00
171dcb04f0
VRFS-2795 interests filter
2015-02-28 21:18:43 +00:00
88315fcc40
VRFS-2795 instrument and genre filtering tests
2015-02-28 20:37:15 +00:00
d95279e694
VRFS-2795 merging feature/musician_profile_enhancements
2015-02-28 20:18:56 +00:00
4d133e0043
merge develop
2015-02-28 02:24:23 -05:00
2d8748d4ee
VRFS-2795 iterating on tests
2015-02-28 04:24:53 +00: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
2ea1259060
merging feature/musician_profile_enhancements
2015-02-24 06:08:33 +00:00
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
83f3d56238
VRFS-2795 musician search first draft
2015-02-23 06:21:36 +00: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
Jonathan Kolyer
Brian Smith
Seth Call
Steven Miers