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
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
..
bin Whack files no longer needed. 2014-12-15 12:26:38 -06:00
config * VRFS-1403 - maxmind single step import done 2014-07-19 21:11:16 -05:00
lib Merge branch 'develop' into feature/jam_track_ui_2 2015-03-12 08:51:52 -05:00
scripts merging jam-ruby into ruby 2013-09-15 18:04:03 +00:00
spec Merge branch 'develop' into feature/jam_track_ui_2 2015-03-12 08:51:52 -05:00
.gitignore VRFS-689 band setup work 2013-11-21 01:24:40 -05:00
.pg_migrate merging jam-ruby into ruby 2013-09-15 18:04:03 +00:00
.rspec * VRFS-1403 - maxmind single step import done 2014-07-19 21:11:16 -05:00
.ruby-gemset merging jam-ruby into ruby 2013-09-15 18:04:03 +00:00
.ruby-version fix warning related to ruby- prefix in .ruby-version files 2013-12-27 16:28:28 -05:00
.simplecov * trying rcov formatter for jenkins integration (VRFS-1103) 2014-02-13 21:17:47 +00:00
Gemfile VRFS-2785 : Factory recurly client into ruby project. Fix references and specs as appropriate. 2015-02-19 01:06:50 -06:00
LICENSE merging jam-ruby into ruby 2013-09-15 18:04:03 +00:00
README.md * build poke 2014-12-06 15:47:20 -06:00
Rakefile merging jam-ruby into ruby 2013-09-15 18:04:03 +00:00
build * allowing tests to be skipped, and mostly done with VRFS-1200 2014-02-20 22:23:44 +00:00
jam_ruby.gemspec merging jam-ruby into ruby 2013-09-15 18:04:03 +00:00
jenkins * VRFS-1016 2014-01-31 14:25:17 -06:00
migrate.sh merging jam-ruby into ruby 2013-09-15 18:04:03 +00:00

README.md

JamRuby

Environment

Create development database 'jam_ruby' createdb jam_ruby

Once you've created your database, migrate it: bundle exec jam_ruby up