 Seth Call
|
ccd60aa631
|
* merged develop
|
2015-03-24 11:27:26 -05:00 |
|
Seth Call
|
301b365044
|
* VRFS-2968 - escape strings passed to JamTrack builder
|
2015-03-20 09:44:25 -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
|
a10705c163
|
* VRFS-2909 - jam tracks importer
|
2015-03-09 09:44:12 -05:00 |
Steven Miers
|
003b06cae0
|
VRFS-2782 : Fix error found by test.
|
2015-03-04 16:14:26 -06: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
|
5396e66c67
|
Merge with develop
|
2015-02-27 11:51:45 -06:00 |
|
Steven Miers
|
d314c3327c
|
VRFS-2782 : Fix error found by test.
|
2015-02-27 11:38:40 -06:00 |
|
Seth Call
|
8205b5ea58
|
* VRFS-2841 - load jmep into the backend
|
2015-02-27 08:37:12 -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
|
9dbf1a3e56
|
* VRFS-2634 adding version to jamtrack
|
2015-02-23 09:12:34 -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
|
af83a4f6a1
|
* VRFS-2608 - refactor and slight cleanup of UI towards new spec
|
2015-01-06 16:51:19 -06:00 |
|
Seth Call
|
7df0258015
|
* VRFS-2600 - tracks saved as id.ext to expose metadata
|
2015-01-06 09:36:05 -06:00 |
|
Seth Call
|
d677b43c28
|
* VRFS-2603 private key now stored
|
2015-01-05 15:19:20 -06:00 |
|
Seth Call
|
1f72d1cca4
|
* debug test that messes with websocket gateway
|
2015-01-04 09:00:50 -06:00 |
|
Steven Miers
|
bb298dd6b9
|
VRFS-2548 : Config-ize location of jamtracks python tool
|
2014-12-29 15:05:19 -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
|
795cb6f536
|
Dedicated spec for testing cleaner. Some cleanup/renaming.
|
2014-12-15 23:57:57 -06:00 |
|
Steven Miers
|
ff42a84598
|
VRFS-2482 : Jam Tracks cleanup and initial spec.
|
2014-12-15 20:30:46 -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
|
ac2daed4da
|
VRFS-2481 : Jam Tracks python layer and source.
|
2014-12-15 12:16:19 -06:00 |