Commits on Jan 24, 2012
  1. @radar

    Remove three-dot-two from Travis build

    This is due to a suspected regression (http://t.co/A1KyCcQZ) within Rails 3.2.
    
    We will wait on Rails 3.2.1 to be released and then re-attempt this again.
    radar committed Jan 24, 2012
Commits on Jan 23, 2012
  1. @radar

    attributes_for is deprecated in FactoryGirl, switch to using FactoryG…

    …irl.build in address_spec
    radar committed Jan 23, 2012
  2. @radar
Commits on Jan 22, 2012
  1. @adhlssu07 @radar
  2. @radar

    Test three-dot-two branch also

    radar committed Jan 23, 2012
  3. @radar
  4. @lucapette @radar

    Explicitly reference Spree::Admin::BaseController in

    Spree::Admin::OrdersController
    
    This fixes the issue discussed in #963 that @schof and @radar couldn't
    reproduce, but other people *could*. Very weird.
    
    Note: this may turn up in other controllers also.
    
    Closes #963 + #999.
    lucapette committed with radar Jan 19, 2012
Commits on Jan 19, 2012
  1. @joneslee85

    fixed issue with db bootstrap running twice.

    reduce noise with install_generator
    
    [fixes #977]
    cmar committed with joneslee85 Jan 19, 2012
  2. @joneslee85
  3. @radar
  4. @mikz @radar

    fix escaping issues on order details page in admin menu

    also properly escape strings in javascript template
    and properly fetch states translation from i18n with fallback
    
    Merges #991
    mikz committed with radar Jan 18, 2012
  5. @radar

    [auth] Stub apply_pending_promotions in checkout_controller_spec

    Even though we really should not need to do this, as it should only be loading auth's decorations and not promos too
    radar committed Jan 19, 2012
  6. @radar

    Only iterate through active promotions, rather than active activators…

    … when checking for pending promotions #836
    radar committed Jan 19, 2012
  7. @radar
  8. @moladukes @radar

    Remove br.clear from breadcrumb helper. We`ll let front end developer…

    …s decide how to style the breadcrumbs.
    
    Fixes #990
    moladukes committed with radar Jan 18, 2012
  9. @buddhi-desilva @radar

    Fixes/Tweaks flexi_rate.rb:5 - Doesn't have to be a float. Changed to…

    … int. flexi_rate.rb:17 - Seemingly self.preferred_max_items is returned as a string. Gives the error 'comparison of String with 0 failed'. Converting to an int before assigning. flexi_rate.rb:22, 24 - Similar issues as above. Converting to a float before calculation.
    
    Closes #974
    buddhi-desilva committed with radar Jan 14, 2012
  10. @radar

    Allow a promotion to be created that is applied to an order that a us…

    …er creates after signup [#836]
    
    This fixes the INITIAL scenario described in #836, i.e. what Sean intended when he made this option. All three scenarios described in this issue are now functional.
    radar committed Jan 19, 2012
  11. @radar

    fixing #969 and #971 - actions not appending and duplicate products

    promo/specs are passing
    cmar committed with radar Jan 18, 2012
  12. @radar

    Revert #992

    Revert "fixing #969 and #971 - actions not appending and duplicate products"
    
    This reverts commit 1277d53.
    radar committed Jan 19, 2012
  13. @radar

    Remove logger.debug from user_registrations_controller

    It has been there for > 1 year. I think we've debugged long enough?
    radar committed Jan 19, 2012
Commits on Jan 18, 2012
  1. @radar

    fixing #969 and #971 - actions not appending and duplicate products

    Merges #992
    cmar committed with radar Jan 18, 2012
  2. @ebeigarts @radar
  3. @radar

    Specify explicit version in README

    radar committed Jan 18, 2012
  4. @joneslee85
  5. @joneslee85

    Added spree_cmd into README

    joneslee85 committed Jan 18, 2012
  6. @joneslee85

    Removed INSTALL

    joneslee85 committed Jan 18, 2012
  7. @radar

    preventing rules from being added twice to a promotion

    [fixes #984 + closes #985]
    cmar committed with radar Jan 17, 2012
  8. @radar

    Only check for preferred_code in promotion specs

    Includes modifications necessary to properly testing promotion specs
    
    Oh, and this probably fixes the build.
    radar committed Jan 18, 2012
  9. @robzolkos @joneslee85
  10. @radar
  11. @radar
  12. @radar

    Ensure first order adjustment is applied if user signs up through /si…

    …gnup path
    
    Related to #836
    radar committed Jan 18, 2012
  13. @radar
  14. @radar

    first_order promotion rule should allow for eligible?(order) (i.e. an…

    … order with a user) and eligible?(order, :user => user) (i.e. an order WITHOUT a user but with user data in payload)
    radar committed Jan 18, 2012
  15. @radar

    first_order rule should return true/false [h/t @adhlssu07]

    The syntax for this rule has also slightly changed, so we need to update the test for it also
    radar committed Jan 18, 2012