Permalink
Commits on Mar 16, 2015
  1. Add missing api key in product picker.

    Fixes #6185
    frahugo committed with JDutil Mar 16, 2015
  2. call to main_app for root path

    fixes #6180
    BenMorganIO committed with JDutil Mar 14, 2015
  3. Fixing issue where only incomplete orders where displayed when not ch…

    …ecking _show_only_complete_orders
    
    added spec to test returning complete and incomplete orders;
    
    Fixes #6173
    Fixes #6177
    
    Conflicts:
    	backend/spec/features/admin/orders/listing_spec.rb
    frankmt committed with JDutil Mar 13, 2015
Commits on Mar 13, 2015
  1. Fixes missing </div> on order edit page @ frontend/app/views/spree/or…

    …ders/edit.html.erb
    
    Fixes #6178
    beneggett committed with JDutil Mar 13, 2015
  2. Remove currency from being merged into options in OrdersController [F…

    …ixes #6165]
    
    Fixes #6175
    Josh Farneman committed with JDutil Mar 13, 2015
Commits on Mar 12, 2015
  1. Fix the backend logo sizing.

    The former value of `100%` will show logos (especially) SVGs too large (this only happens in Safari for me).
    
    Since the top bar is always `20px` high, it makes sense to also set this height to the logo. This way retina images and svgs always get the right height. In order to keep the ratio we need to set the `width` value as well.
    
    Fixes #6163
    Thomas von Deyen committed with JDutil Mar 12, 2015
  2. Moves the inline table-filter style into css file.

    The list table filter was hidden via an inline css style. Changing this to be part of the already existing `#table-filter` css rule, we are able to feature specs without the javascript driver.
    
    This speeds up the test suite and hopefully prevents "every now and then" failing specs from failing.
    
    Fixes #5877
    Fixes #6161
    Thomas von Deyen committed with JDutil Mar 12, 2015
Commits on Mar 11, 2015
  1. Fix variant sorting

    The fix for Spree::Image sorting in #5947 inadvertantly broke sorting for
    models that don't explicitly include acts_as_list (thus gaining access to the
    set_list_position method). Taxon sorting was fixed in #6037, but variant
    sorting was still broken. This commit adds acts_as_list to Spree::Variant as
    well.
    
    Fixes #6155
    dougjohnston committed with JDutil Mar 11, 2015
Commits on Mar 10, 2015
  1. Update guides.

    Conflicts:
    	guides/Gemfile.lock
    JDutil committed Mar 10, 2015
  2. Add Price#maximum_amount docs.

    Fixes #6145
    ronzalo committed with JDutil Mar 10, 2015
Commits on Mar 9, 2015
  1. Remove defunkt config.

    JDutil committed Mar 9, 2015
  2. Replace outdated Spree::Config[:mails_from] with Spree::Store.current…

    ….mail_from_address.
    
    Fixes #6096
    Fixes #6097
    romul committed with JDutil Mar 2, 2015
  3. Comments no longer valid.

    JDutil committed Mar 9, 2015
  4. Find refund payment by number instead of ID

    You couldn’t create a refund of a payment because the resource
    controller was finding the payment by ID. A payment number was passed
    so it errored. I changed this in the controller so a number is passed
    now, changed the specs for this as well.
    
    fixes #6100
    reinaris committed with JDutil Mar 3, 2015
  5. Fixed rake db:bootstrap

    If you use spree_i18n rake db:boostrap stop working due to the use of dynamic find.
    
    fixes #6134
    alessani committed with JDutil Mar 9, 2015
Commits on Mar 8, 2015
Commits on Mar 7, 2015
  1. Fixed a bug in payments js at backend

    fixes #6129
    shibata committed with JDutil Mar 6, 2015