Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates required to make master compatible with current spree master (2.1.0.beta) #15

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open

Updates required to make master compatible with current spree master (2.1.0.beta) #15

wants to merge 41 commits into from

Commits on May 9, 2013

  1. Change value of original_button_text

    @sohara
    sohara committed May 9, 2013
    Configuration menu
    Copy the full SHA
    bb2447c View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2013

  1. Target latest master branch version of spree and other dependencies

    @sohara
    sohara committed Jun 7, 2013
    Configuration menu
    Copy the full SHA
    66801c6 View commit details
    Browse the repository at this point in the history

  2. Bring Rakefile and spec_helper in line with current spree dependencies, 

    etc.
    @sohara
    sohara committed Jun 7, 2013
    Configuration menu
    Copy the full SHA
    ff1f508 View commit details
    Browse the repository at this point in the history

  3. Get all specs passing on spree 2.1.0.beta

    @sohara
    sohara committed Jun 7, 2013
    Configuration menu
    Copy the full SHA
    b6919db View commit details
    Browse the repository at this point in the history

  4. Fix existing cards partial: 

    - Use Spree namespaced i18n helper
- Correct path for 'delete' icon
    @sohara
    sohara committed Jun 7, 2013
    Configuration menu
    Copy the full SHA
    89611f4 View commit details
    Browse the repository at this point in the history

  5. Remove remaining incorrect data-hook names, now corrected in Spree

    @sohara
    sohara committed Jun 7, 2013
    Configuration menu
    Copy the full SHA
    69602aa View commit details
    Browse the repository at this point in the history

  6. Clean up _card_admin partial a bit

    @sohara
    sohara committed Jun 7, 2013
    Configuration menu
    Copy the full SHA
    a8651f1 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2013

  1. Put card setup stuff into its own before_filter instead of overriding

    @sohara
    sohara committed Jun 30, 2013
    Configuration menu
    Copy the full SHA
    b113cb5 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2013

  1. Loosen gemspec dependency on spree core

    @sohara
    sohara committed Jul 24, 2013
    Configuration menu
    Copy the full SHA
    d3dc336 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2013

  1. Make labels for radio buttons clickable

    @sohara
    sohara committed Jul 29, 2013
    Configuration menu
    Copy the full SHA
    b34cb5b View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2013

  1. Fixed error in js file.

    Ned Zimmerman committed Aug 6, 2013
    Configuration menu
    Copy the full SHA
    87f190c View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2013

  1. Change appearance of existing cards table

    @sohara
    sohara committed Nov 8, 2013
    Configuration menu
    Copy the full SHA
    7c4d99b View commit details
    Browse the repository at this point in the history

  2. JS fix: Don't leave 'please select cc' msg after selected

    @sohara
    sohara committed Nov 8, 2013
    Configuration menu
    Copy the full SHA
    859187a View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2014

  1. Add support for spree 2-2

    @jtapia
    jtapia committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    6272a41 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from jtapia/2-2-stable 

    Add support for spree 2-2
    @sohara
    sohara committed Feb 24, 2014
    Configuration menu
    Copy the full SHA
    c543134 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2014

  1. Update to point to spree 2.2 release

    @jtapia
    jtapia committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    0b98193 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from jtapia/2-2-stable 

    Update to point to spree 2.2 release
    @sohara
    sohara committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    63898b7 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2014

  1. Move assets to correct folder root

    @jtapia
    jtapia committed May 5, 2014
    Configuration menu
    Copy the full SHA
    3b820ae View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from jtapia/2-2-stable 

    Move assets to correct folder root
    @sohara
    sohara committed May 5, 2014
    Configuration menu
    Copy the full SHA
    39ffbc4 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2014

  1. WIP Refactor existing credit cards view

    Fernando C. Barajas Chavez committed Oct 20, 2014
    Configuration menu
    Copy the full SHA
    a87d069 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2014

  1. - Refactor js to show / hide the notification display 

    - Since there's no longer a table, the check for credit cards on the
  list is base on the visibles div's inside the 'existing_cards' element
    Fernando C. Barajas Chavez committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    fbbdd8c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from littlebitselectronics/refactor_existing_cr… 

    …edit_cards_view

Refactor existing credit cards view
    @hecbuma
    hecbuma committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    ea3ea6f View commit details
    Browse the repository at this point in the history

  3. - Fix credit card list style on mobile

    Fernando C. Barajas Chavez committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    677ea59 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5 from littlebitselectronics/refactor_existing_cr… 

    …edit_cards_view

- Fix credit card list style on mobile
    @hecbuma
    hecbuma committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    686f0b2 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2014

  1. - Avoid hiding the credit card list when selecting a different paymen… 

    …t method
    Fernando C. Barajas Chavez committed Oct 22, 2014
    Configuration menu
    Copy the full SHA
    62cd18b View commit details
    Browse the repository at this point in the history

  2. - Fix typo

    Fernando C. Barajas Chavez committed Oct 22, 2014
    Configuration menu
    Copy the full SHA
    f07ded6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6 from littlebitselectronics/refactor_existing_cr… 

    …edit_cards_view

Refactor existing credit cards view
    @hecbuma
    hecbuma committed Oct 22, 2014
    Configuration menu
    Copy the full SHA
    b8276fe View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2014

  1. Refactor existing card list 

    - Hide the delete option for existing card
- Credit card type and last digits in the same column
    Fernando C. Barajas Chavez committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    bdc2599 View commit details
    Browse the repository at this point in the history

  2. Fix alignment

    Fernando C. Barajas Chavez committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    7208971 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2014

  1. Merge pull request #7 from littlebitselectronics/refactor_existing_cr… 

    …edit_cards_view

Refactor existing card list
    @hecbuma
    hecbuma committed Nov 4, 2014
    Configuration menu
    Copy the full SHA
    6d77cb8 View commit details
    Browse the repository at this point in the history

  2. Change add new ccredit card message

    Fernando C. Barajas Chavez committed Nov 4, 2014
    Configuration menu
    Copy the full SHA
    3e438ea View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8 from littlebitselectronics/refactor_existing_cr… 

    …edit_cards_view

Change add new credit card message
    @hecbuma
    hecbuma committed Nov 4, 2014
    Configuration menu
    Copy the full SHA
    8760032 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2014

  1. - Fix mobile style for existing credit cards list

    Fernando C. Barajas Chavez committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    fb24493 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #9 from littlebitselectronics/refactor_existing_cr… 

    …edit_cards_view

Existing credit cards style
    @hecbuma
    hecbuma committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    d00cdbb View commit details
    Browse the repository at this point in the history

  3. Always show the Add new credit card option

    Fernando C. Barajas Chavez committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    7f1f252 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #10 from littlebitselectronics/refactor_existing_c… 

    …redit_cards_view

Always show the Add new credit card option
    @hecbuma
    hecbuma committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    356b9bc View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2014

  1. - Switch payment methods by clicking on the text labels

    Fernando C. Barajas Chavez committed Dec 3, 2014
    Configuration menu
    Copy the full SHA
    db17dee View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2014

  1. Merge pull request #11 from littlebitselectronics/refactor_existing_c… 

    …redit_cards_view

Refactor existing credit cards view
    @hecbuma
    hecbuma committed Dec 4, 2014
    Configuration menu
    Copy the full SHA
    632f129 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2015

  1. - Show the list of saved credit cards on checkout

    Fernando Barajas committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    b65a939 View commit details
    Browse the repository at this point in the history

  2. - Fix closing element

    Fernando Barajas committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    b25adaf View commit details
    Browse the repository at this point in the history

  3. Merge pull request #12 from littlebitselectronics/feature/show_user_s… 

    …aved_credit_cards

Show user saved credit cards
    @hecbuma
    hecbuma committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    47f4028 View commit details
    Browse the repository at this point in the history