Commits on Mar 17, 2015
  1. @huoxito
  2. @huoxito @JDutil

    Need to permit an array for option_value_ids

    Fixes #6193
    huoxito committed with JDutil Mar 17, 2015
  3. @mvidaurre @JDutil

    Add missing indexes to several tables

    Fixing alerts from houndci styling guidelines
    
    Fixing the Align the parameters of a method call if they span more than one line
    
    Fixes #6192
    mvidaurre committed with JDutil Mar 13, 2015
  4. @parndt @JDutil
  5. @smartacus @JDutil

    Use InventoryUnitBuilder in order importer

    Match shipments up to InventoryUnits
    
    Fixes #6159
    smartacus committed with JDutil Mar 11, 2015
  6. @tvdeyen @JDutil

    Change all order state search filters to selects.

    Closes #6143
    Fixes #6162
    tvdeyen committed with JDutil Mar 12, 2015
  7. @smartacus @JDutil

    Order importer should create line items before shipments

    Updated the order importer spec to test creating a shipment with a line item present
    
    Fixes #6088
    smartacus committed with JDutil Feb 26, 2015
  8. @tvdeyen @JDutil

    Better table filter tags.

    Before the table filter tags shown below a filtered table did not show what attribute is filtered. This is somehow confusing, if there are a lot of filters active (especially in the orders listing).
    
    This also takes into account, that a attribute filtered by a select uses the text and not the value for the tag display.
    
    Fixes #6169
    tvdeyen committed with JDutil Mar 12, 2015
Commits on Mar 16, 2015
  1. @frahugo @JDutil

    Add missing api key in product picker.

    Fixes #6185
    frahugo committed with JDutil Mar 16, 2015
  2. @parndt @JDutil
  3. @BenMorganIO @JDutil

    call to main_app for root path

    fixes #6180
    BenMorganIO committed with JDutil Mar 14, 2015
  4. @frankmt @JDutil

    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. @beneggett @JDutil

    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. @JDutil

    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. @tvdeyen @JDutil

    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
    tvdeyen committed with JDutil Mar 12, 2015
  2. @JDutil
  3. @JDutil
  4. @JDutil
  5. @tvdeyen @JDutil

    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
    tvdeyen committed with JDutil Mar 12, 2015
Commits on Mar 11, 2015
  1. @dougjohnston @JDutil

    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
  2. @JDutil
  3. @JDutil
  4. @smartacus @JDutil
Commits on Mar 10, 2015
  1. @JDutil
  2. @JDutil

    Update guides.

    Conflicts:
    	guides/Gemfile.lock
    JDutil committed Mar 10, 2015
  3. @reinaris @JDutil
  4. @ronzalo @JDutil

    Add Price#maximum_amount docs.

    Fixes #6145
    ronzalo committed with JDutil Mar 10, 2015
  5. @reinaris @JDutil
  6. @reinaris @JDutil
Commits on Mar 9, 2015
  1. @JDutil
  2. @JDutil

    Remove defunkt config.

    JDutil committed Mar 9, 2015
  3. @romul @JDutil

    Replace outdated Spree::Config[:mails_from] with Spree::Store.current…

    ….mail_from_address.
    
    Fixes #6096
    Fixes #6097
    romul committed with JDutil Mar 2, 2015
  4. @reinaris @JDutil
  5. @bryanmtl @JDutil
  6. @JDutil