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

Admin Invite & Password reset emails #1523

Merged
merged 17 commits into from
Oct 24, 2016
Merged

Admin Invite & Password reset emails #1523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ec9e275
Merge branch 'development' into email-template-expansion
kieckhafer Oct 18, 2016
5049213
Merge branch 'development' into email-template-expansion
kieckhafer Oct 19, 2016
98f3d3d
added some comments to break up html table
kieckhafer Oct 19, 2016
fa8a693
Merge branch 'development' into email-template-expansion
kieckhafer Oct 20, 2016
1a88803
reorganized data for email template
kieckhafer Oct 20, 2016
c7491e0
welcome to the shop email template
kieckhafer Oct 20, 2016
ae8bdef
extract social from template, add on/off switch
kieckhafer Oct 20, 2016
b41797e
invite shop member email
kieckhafer Oct 20, 2016
a9043f7
shopName variable updates
kieckhafer Oct 20, 2016
68be5af
update reaction address
kieckhafer Oct 24, 2016
e9190c3
Merge remote-tracking branch 'origin/release-0.18.0' into email-templ…
kieckhafer Oct 24, 2016
9c05ad1
add Collections imports for Accounts, Cart, Shopts
kieckhafer Oct 24, 2016
7daa9d1
password reset emails
kieckhafer Oct 24, 2016
c29493b
update subject of order confirmation email
kieckhafer Oct 24, 2016
b069d72
lint fix
kieckhafer Oct 24, 2016
62afaf5
renamed file for email template
kieckhafer Oct 24, 2016
860526b
removed test text
kieckhafer Oct 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions private/data/Shops.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3064,11 +3064,11 @@
"addressBook": [{
"company": "Reaction Commerce",
"fullName": "Ongo Works",
"address1": "1119 Colorado Ave",
"address2": "Ste. 7",
"address1": "2110 Main Street",
"address2": "Suite 207",
"city": "Santa Monica",
"region": "CA",
"postal": "90401",
"postal": "90405",
"country": "US",
"phone": "8885551212",
"isCommercial": true,
Expand Down
Loading