Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sprangular/sprangular
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: sprangular/sprangular
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: temporary-amalgam-branch
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 12 files changed
  • 1 contributor

Commits on Jun 9, 2015

  1. Splits Delivery and Payment Checkout Steps 

    Several Spree modules rely on certain checkout-transition callbacks
being triggered during checkout. As a result of smushing delivery and
payment steps together, Sprangular inadvertently skips these callbacks,
which causes some weird behaviours.

This commit attempts to correct this issue by performing the two steps
discretely.
    Daniel Wright committed Jun 9, 2015
    Configuration menu
    Copy the full SHA
    cfa83ff View commit details
    Browse the repository at this point in the history

  2. Delinting

    Daniel Wright committed Jun 9, 2015
    Configuration menu
    Copy the full SHA
    adeec6b View commit details
    Browse the repository at this point in the history

  3. More delinting

    Daniel Wright committed Jun 9, 2015
    Configuration menu
    Copy the full SHA
    d7e6b58 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2015

  1. Rewrites Template Helper Methods

    Daniel Wright committed Jun 17, 2015
    Configuration menu
    Copy the full SHA
    b01ea7c View commit details
    Browse the repository at this point in the history

  2. Fix for Production Environments 

    Turns out assets_environment isn't instantiated in production!
    Daniel Wright committed Jun 17, 2015
    Configuration menu
    Copy the full SHA
    098d541 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2015

  1. Whitelist Asset Host in SCE Mode

    Daniel Wright committed Jun 18, 2015
    1 Configuration menu
    Copy the full SHA
    b7a85bd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'discrete-delivery-and-payment' into temporary-amalgam-b… 

    …ranch

* discrete-delivery-and-payment:
  More delinting
  Delinting
  Splits Delivery and Payment Checkout Steps
    Daniel Wright committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    fc6e7d6 View commit details
    Browse the repository at this point in the history
Loading