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
Seth Call
3d43f123b1
* VRFS-2992 -make mp3 as well as ogg preview
2015-03-29 21:51:14 -05: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
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
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
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
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
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
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
Seth Call
7c73e2ab5c
* VRFS-2922 - show spinner for pending metronome
2015-03-12 21:53:23 -05: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
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
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
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
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
5396e66c67
Merge with develop
2015-02-27 11:51:45 -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
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
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
Seth Call
9345d65f06
* merged
2015-02-19 14:31:00 -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
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
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
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
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
6f8113b374
Merge branch 'develop' into feature/backing_tracks
2015-01-26 12:11:57 -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
cefce67e89
Merge branch 'develop' into feature/backing_tracks
2015-01-19 15:21:13 -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
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
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
3028e421fb
VRFS-2614 : Allow jam track to be hidden to non-admin users by setting available=false.
...
Model, controller, admin UI, web UI, and spec to verify non-available
jam_tracks can only be seen by admin users.
2015-01-07 12:33:49 -06:00
Seth Call
405c155c71
* VRFS-2606 get offset time into MM:SS:MLS format
2015-01-07 11:07:26 -06:00
Seth Call
2ff30946e8
* VRFS-2606 - add new tap in fields, support them in activeadmin
2015-01-07 09:30:05 -06:00
67b1132d24
VRFS-2554 fixed notification for scheduled session with TBD date/time
2015-01-06 21:20:41 -05:00
18d06096b5
Revert "Fix spec that was magically passing sporadically."
...
This reverts commit 4cc70f2082
2015-01-05 19:04:08 -06:00
f677714e9a
Revert change.
2015-01-05 19:03:28 -06:00
Steven Miers
Seth Call
Jonathan Kolyer
Brian Smith
Brian Smith