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
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
..
assets/images * VRFS-783 - the filepicker service behaves different; workaround added. test attempted, but does not work because phantomjs crashes 2013-10-22 14:27:20 -05:00
controllers Merge branch 'develop' into feature/jam_track_ui_2 2015-03-12 08:51:52 -05:00
features * VRFS-2913 - allow /client to be accessed without being logged in 2015-03-11 16:53:37 -05:00
files VRFS-2782 : Add api controller test for multiple bitrates. Fix bug found as a result. 2015-03-04 16:13:58 -06:00
fixtures/files merging jam-web into web 2013-09-15 18:04:37 +00:00
helpers * fix issues with music session 'other count' and tests 2014-11-09 10:59:31 -06:00
javascripts Merge with develop 2015-02-27 11:51:45 -06:00
managers VRFS-2785 : Factory recurly client into ruby project. Fix references and specs as appropriate. 2015-02-19 01:06:50 -06:00
requests * merge in faster score searches (VRFS-2202) 2014-09-30 10:51:23 -05:00
support * VRFS-2913 - allow /client to be accessed without being logged in 2015-03-11 16:53:37 -05:00
factories.rb * VRFS-2876 - pro licensing added and 20 second snippet 2015-03-10 22:10:22 -05:00
spec_db.rb wip 2014-05-29 14:34:18 -05:00
spec_helper.rb * merged 2015-02-15 22:01:06 -06:00
teaspoon_env.rb * merged 2014-09-22 14:20:58 -05:00
testing_oauth.txt VRFS-2540 : Fix. Remove usage of recaptcha; refactor nocaptcha check in google_client (was youtube_client). Fix and add tests. 2015-01-11 19:17:18 -06:00