seth
/
jam-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
jam-cloud/admin/config/initializers
History
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
..
jam_ruby vrfs-927: carrrierwave integration 2014-01-04 03:15:19 -06:00
active_admin.rb VRFS-1483 added authoritzation for email_batch 2014-04-05 21:42:56 +00:00
backtrace_silencers.rb merging jam-admin into admin 2013-09-16 03:15:31 +00:00
bugsnag.rb * fixing bad constant 2013-09-22 02:18:33 +00:00
carrierwave.rb * VRFS-1089 - jamadmin creation of recordings done 2014-02-13 16:41:50 +00:00
constants.rb merging jam-admin into admin 2013-09-16 03:15:31 +00:00
devise.rb merging jam-admin into admin 2013-09-16 03:15:31 +00:00
email.rb * parameterizing email configs and trying to speed up build on server 2014-01-14 16:55:34 -06:00
eventmachine.rb * VRFS-2104 - client update dialog happens when it needs to; not just on startup 2014-08-31 10:30:59 -05:00
gon.rb * fixing some admin pathing/url issues 2014-07-28 10:05:16 -05:00
inflections.rb merging jam-admin into admin 2013-09-16 03:15:31 +00:00
influxdb-rails.rb * wip 2014-12-30 17:10:16 -06:00
jam_ruby_user.rb * VRFS-2485 - allow user to tweak to lower framesizes if they experience bad i/o or audio quality 2014-11-14 20:47:56 -06:00
jam_tracks.rb Merge branch 'develop' into feature/jam_track_ui_2 2015-03-12 08:51:52 -05:00
kaminari.rb merging jam-admin into admin 2013-09-16 03:15:31 +00:00
mime_types.rb merging jam-admin into admin 2013-09-16 03:15:31 +00:00
resque.rb * VRFS-801 still working out some mixer devops issues now; 2014-01-13 22:48:55 +00:00
secret_token.rb merging jam-admin into admin 2013-09-16 03:15:31 +00:00
session_store.rb merging jam-admin into admin 2013-09-16 03:15:31 +00:00
wrap_parameters.rb merging jam-admin into admin 2013-09-16 03:15:31 +00:00