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

Admin Invite & Password reset emails #1523

Merged
merged 17 commits into from
Oct 24, 2016
Merged

Admin Invite & Password reset emails #1523

merged 17 commits into from
Oct 24, 2016

Commits on Oct 18, 2016

  1. Merge branch 'development' into email-template-expansion

    @kieckhafer
    kieckhafer committed Oct 18, 2016
    Configuration menu
    Copy the full SHA
    ec9e275 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2016

  1. Merge branch 'development' into email-template-expansion

    @kieckhafer
    kieckhafer committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    5049213 View commit details
    Browse the repository at this point in the history

  2. added some comments to break up html table

    @kieckhafer
    kieckhafer committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    98f3d3d View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2016

  1. Merge branch 'development' into email-template-expansion

    @kieckhafer
    kieckhafer committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    fa8a693 View commit details
    Browse the repository at this point in the history

  2. reorganized data for email template 

    removed all [0]. type variables from new.html email template, so all
variables are set in orders.js for easy manipulation
    @kieckhafer
    kieckhafer committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    1a88803 View commit details
    Browse the repository at this point in the history

  3. welcome to the shop email template

    @kieckhafer
    kieckhafer committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    c7491e0 View commit details
    Browse the repository at this point in the history

  4. extract social from template, add on/off switch

    @kieckhafer
    kieckhafer committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    ae8bdef View commit details
    Browse the repository at this point in the history

  5. invite shop member email

    @kieckhafer
    kieckhafer committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    b41797e View commit details
    Browse the repository at this point in the history

  6. shopName variable updates

    @kieckhafer
    kieckhafer committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    a9043f7 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2016

  1. update reaction address 

    This was driving me crazy seeing the wrong address in all these emails
being tested.
    @kieckhafer
    kieckhafer committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    68be5af View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/release-0.18.0' into email-templ… 

    …ate-expansion
    @kieckhafer
    kieckhafer committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    e9190c3 View commit details
    Browse the repository at this point in the history

  3. add Collections imports for Accounts, Cart, Shopts

    @kieckhafer
    kieckhafer committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    9c05ad1 View commit details
    Browse the repository at this point in the history

  4. password reset emails

    @kieckhafer
    kieckhafer committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    7daa9d1 View commit details
    Browse the repository at this point in the history

  5. update subject of order confirmation email

    @kieckhafer
    kieckhafer committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    c29493b View commit details
    Browse the repository at this point in the history

  6. lint fix

    @kieckhafer
    kieckhafer committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    b069d72 View commit details
    Browse the repository at this point in the history

  7. renamed file for email template

    @kieckhafer
    kieckhafer committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    62afaf5 View commit details
    Browse the repository at this point in the history

  8. removed test text

    @kieckhafer
    kieckhafer committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    860526b View commit details
    Browse the repository at this point in the history