Steven Miers
|
5f953d1b19
|
VRFS-2830 : Merge / manual fix
|
2015-03-25 10:56:24 -05:00 |
 Seth Call
|
661c4ed446
|
* wip
|
2015-03-20 08:48:00 -05:00 |
|
Steven Miers
|
e6b09e5728
|
VRFS-2892 : Reset main form error to hidden upon re-entering purchase flow.
|
2015-03-15 20:30:39 -05:00 |
|
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 |
|
Seth Call
|
a10705c163
|
* VRFS-2909 - jam tracks importer
|
2015-03-09 09:44:12 -05:00 |
|
Steven Miers
|
c8ad1d3856
|
VRFS-2805 : Use jquery.payment to make the credit card and verification more user-friendly. Also use jquery.payment for validation.
|
2015-03-02 13:30:45 -06:00 |
|
Steven Miers
|
5396e66c67
|
Merge with develop
|
2015-02-27 11:51:45 -06:00 |
|
Seth Call
|
3496aa999f
|
* wip
|
2015-01-29 14:17:55 -06:00 |
|
Steven Miers
|
41096f08ad
|
VRFS-2480: Additional back-end and UI functionality required for checking out.
|
2014-12-01 18:45:41 -06:00 |
|
Steven Miers
|
09163d2778
|
Fix javascript to get credit card expiration year from correct field.
|
2014-11-25 13:59:24 -06:00 |
|
Steven Miers
|
9e95f75e2e
|
VRFS-2480 : Card number was getting whacked from submittal due to a bad javascript assignment.
|
2014-11-24 15:06:45 -06:00 |
|
Steven Miers
|
433fe0be74
|
Initial merge and manual conflict and fix for tests.
|
2014-11-04 14:55:12 -06:00 |