Seth Call
fefd5a3fda
* jamtrack UI fixes: VRFS-3041 (ordering fixed), VRFS-3004 - loading/no more jamtrack notice fixes, and VRFS-3005 - filter by band works
2015-04-16 15:44:38 -05:00
Seth Call
4cf4e21552
* VRFS-2938 - packaging phase now shows % indicator
2015-04-16 14:45:29 -05:00
4db40f6d3b
VRFS-2874 : Some prerequisite functionality required for analytics.
2015-04-15 18:22:55 -05:00
Seth Call
e42b926a5e
* VRFS-3028 - switch to using Recurly Adjustments for JamTrack purchases
2015-04-10 15:19:08 -05:00
Seth Call
fd02e23572
* updated home page VRFS-2868
2015-04-08 22:44:21 -05:00
3fd659c3df
VRFS-3019 : Fix :group_artist option on JamTrack query to not also group by id, like the regular version of the query.
2015-04-08 12:53:09 -05:00
Seth Call
b1b2d3ad24
* VRFS-2869 - band landing page
2015-03-31 16:17:17 -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
4f08f6acad
Merge and fix
2015-03-27 09:54:01 -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
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
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
b137d7586f
* VRFS-2973 - fix pagination in jam trackdialog
2015-03-20 21:27:11 -05:00
Seth Call
ab72438a3f
* VRFS-2932 - make preview apply to all jam track tracks
2015-03-16 17:50:38 -05:00
f4cd225142
VRFS-2823 : Bugfix and cleanup.
2015-03-15 19:45:58 -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
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
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
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
bd08b40e71
VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders.
2015-02-26 17:00:01 -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
dbaeb8d996
merged
2015-02-25 10:43:21 -06:00
Seth Call
9dbf1a3e56
* VRFS-2634 adding version to jamtrack
2015-02-23 09:12:34 -06:00
Seth Call
39415cdf22
* remove BPM from jam_tracks
2015-02-17 10:41:49 -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
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
2ff30946e8
* VRFS-2606 - add new tap in fields, support them in activeadmin
2015-01-07 09:30:05 -06:00
Seth Call
aabbd90b02
* VRFS-2602 change jka to jkz
2015-01-05 14:39:55 -06:00
2853c77b7e
VRFS-2597 : Fix some broken tests:
...
* Naming issues
* Restore method that was caught by friendly fire in a cleanup session
* Add a few new specs to properly exercise controller methods to catch
errors sooner, i.e., not in feature specs.
* Restore deleted route
2015-01-04 16:24:31 -06:00
34cb617f5f
VRFS-1960 : download API for JamTracks, including a new message type, rescue job that builds the JKZ, and specs that exercise it all.
2014-12-17 17:19:36 -06:00
ff42a84598
VRFS-2482 : Jam Tracks cleanup and initial spec.
2014-12-15 20:30:46 -06:00
Seth Call
Steven Miers
Jonathan Kolyer