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
..
admin	* VRFS-2876 cleaning up preview downloadability in jam-admin	2015-03-11 09:20:45 -05:00
assets	VRFS-1890 : Mechanism to move track up/down, hook up in admin UI.	2014-12-06 14:04:31 -06:00
controllers	* VRFS-2839 - add check to admin	2015-02-25 22:05:18 -06:00
helpers	* icecast working locally on my mac (VRFS-1002)	2014-01-21 14:51:03 +00:00
mailers	merging jam-admin into admin	2013-09-16 03:15:31 +00:00
models	VRFS-1576 error handling; referral page; new admin menu	2014-04-22 01:55:40 +00:00
uploaders	* VRFS-1089 - jamadmin creation of recordings done	2014-02-13 16:41:50 +00:00
views	Merge branch 'develop' into feature/jam_track_ui_2	2015-03-12 08:51:52 -05:00