 Seth Call
|
53ef0f1b4f
|
VRFS-2975 - change jam track Id to varchar(64)
|
2015-03-25 11:11:10 -05:00 |
|
Seth Call
|
ccd60aa631
|
* merged develop
|
2015-03-24 11:27:26 -05:00 |
|
Seth Call
|
cfd80927f9
|
* fix broken tests that occurred when removing mount_uploader from jam_track_track
|
2015-03-17 13:39:21 -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
|
9279d88d8d
|
* VRFS-2876 - pro licensing added and 20 second snippet
|
2015-03-10 22:10:22 -05:00 |
|
Seth Call
|
a10705c163
|
* VRFS-2909 - jam tracks importer
|
2015-03-09 09:44:12 -05:00 |
Steven Miers
|
63c45e0a6e
|
VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders.
|
2015-03-04 16:03:57 -06:00 |
|
Steven Miers
|
2004d48fa1
|
Merge
|
2015-03-04 16:03:28 -06:00 |
|
Steven Miers
|
bd08b40e71
|
VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders.
|
2015-02-26 17:00:01 -06:00 |
|
Steven Miers
|
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
|
2c798e8860
|
* VRFS-2629 - one can follow the progression of a jam track being signed with detail
|
2015-01-09 11:23:20 -06:00 |
|
Steven Miers
|
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 |
|
Steven Miers
|
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 |
|
Steven Miers
|
ff42a84598
|
VRFS-2482 : Jam Tracks cleanup and initial spec.
|
2014-12-15 20:30:46 -06:00 |
|
Steven Miers
|
361d88a0fa
|
VRFS-1959 : jam_tracks#list_downloads API and model methods, as well as associated tests to verify.
|
2014-12-15 19:21:27 -06:00 |
|
Steven Miers
|
8ac9d19e73
|
VRFS-2481 : Use jam_tracks object hierarchy to create jkz file, and upload to AWS. Meshed out spec to verify creation and upload, including a real ogg file (required by the python tool).
|
2014-12-15 18:02:51 -06:00 |
|
Steven Miers
|
6407d2f22a
|
Merge from working branch
|
2014-12-15 12:16:19 -06:00 |
|
Steven Miers
|
433fe0be74
|
Initial merge and manual conflict and fix for tests.
|
2014-11-04 14:55:12 -06:00 |