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/web/spec/controllers
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
..
api_claimed_recordings_spec.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
api_corporate_controller_spec.rb * VRFS-1100 - can only download 100 times before 404 given for client downloads, VRFS-862 - quick change to unblock 2014-02-24 16:55:56 +00:00
api_favorites_controller_spec.rb * wip 2014-05-06 08:34:38 -05:00
api_feeds_controller_spec.rb VRFS-2427 fixed broken test 2014-11-02 14:26:56 -05:00
api_icecast_controller_spec.rb Conflicts: 2014-12-18 15:13:55 -06:00
api_jam_tracks_controller_spec.rb Merge branch 'develop' into feature/jam_track_ui_2 2015-03-12 08:51:52 -05:00
api_latency_tests_controller_spec.rb *wip 2014-05-29 14:44:37 -05:00
api_mixes_controller_spec.rb * VRFS-1100 - can only download 100 times before 404 given for client downloads, VRFS-862 - quick change to unblock 2014-02-24 16:55:56 +00:00
api_music_sessions_controller_spec.rb VRFS-2498, VRFS-2618 : API, routes and specs for backing tracks/metronomes. 2015-01-13 10:15:46 -06:00
api_recordings_controller_spec.rb Merge with develop 2015-02-27 11:51:45 -06:00
api_recurly_spec.rb VRFS-2785 : Factory recurly client into ruby project. Fix references and specs as appropriate. 2015-02-19 01:06:50 -06:00
api_scoring_controller_spec.rb * merge in faster score searches (VRFS-2202) 2014-09-30 10:51:23 -05:00
api_shopping_carts_controller_spec.rb * VRFS-2917 - shopping cart can be anonymous 2015-03-11 20:55:11 -05:00
api_user_syncs_controller_spec.rb * recording file/manager fixes and aging of recordings 2014-11-07 16:12:36 -06:00
api_users_controller_spec.rb VRFS-2700 added rec_* site types to site validation 2015-02-12 08:16:54 +00:00
sessions_controller_spec.rb VRFS-2033 : Spec and fixes for google_oauth2 provider-type 2014-10-15 13:41:49 -05:00
share_tokens_controller_spec.rb * wip 2014-05-06 08:34:38 -05:00