seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
jam-cloud/ruby/spec/jam_ruby
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
..
lib * wip 2014-12-30 17:10:16 -06:00
models Merge branch 'develop' into feature/jam_track_ui_2 2015-03-12 08:51:52 -05:00
resque Merge branch 'develop' into feature/jam_track_ui_2 2015-03-12 08:51:52 -05:00
connection_manager_spec.rb * VRFS-1073 - support multiple websocket gateways 2014-09-24 14:27:56 -05:00
jam_track_importer_spec.rb * VRFS-2876 - pro licensing added and 20 second snippet 2015-03-10 22:10:22 -05:00
jam_tracks_manager_spec.rb * VRFS-2909 - jam tracks importer 2015-03-09 09:44:12 -05:00
mq_router_spec.rb Conflicts: 2014-12-18 15:13:55 -06:00
recurly_client_spec.rb * VRFS-2909 - jam tracks importer 2015-03-09 09:44:12 -05:00