Code

More email templates#1557

Code

Merged

kieckhafer merged 61 commits intorelease-0.18.0reactioncommerce/reaction:release-0.18.0from more-email-templatesreactioncommerce/reaction:more-email-templatesCopy head branch name to clipboardNov 10, 2016

+2,111-937

Commits

Commits on Oct 18, 2016

• Merge branch 'development' into email-template-expansion

  kieckhafer

  committed
  ec9e275

  Copy full SHA for ec9e275

Commits on Oct 19, 2016

• Merge branch 'development' into email-template-expansion

  kieckhafer

  committed
  5049213

  Copy full SHA for 5049213

• added some comments to break up html table

  kieckhafer

  committed
  98f3d3d

  Copy full SHA for 98f3d3d

Commits on Oct 20, 2016

• Merge branch 'development' into email-template-expansion

  kieckhafer

  committed
  fa8a693

  Copy full SHA for fa8a693

• reorganized data for email template

  Show description for 1a88803
  kieckhafer

  committed
  1a88803

  Copy full SHA for 1a88803

• welcome to the shop email template

  kieckhafer

  committed
  c7491e0

  Copy full SHA for c7491e0

• extract social from template, add on/off switch

  kieckhafer

  committed
  ae8bdef

  Copy full SHA for ae8bdef

• invite shop member email

  kieckhafer

  committed
  b41797e

  Copy full SHA for b41797e

• shopName variable updates

  kieckhafer

  committed
  a9043f7

  Copy full SHA for a9043f7

Commits on Oct 24, 2016

• update reaction address

  Show description for 68be5af
  kieckhafer

  committed
  68be5af

  Copy full SHA for 68be5af

• Merge remote-tracking branch 'origin/release-0.18.0' into email-template-expansion

  kieckhafer

  committed
  e9190c3

  Copy full SHA for e9190c3

• add Collections imports for Accounts, Cart, Shopts

  kieckhafer

  committed
  9c05ad1

  Copy full SHA for 9c05ad1

• password reset emails

  kieckhafer

  committed
  7daa9d1

  Copy full SHA for 7daa9d1

• update subject of order confirmation email

  kieckhafer

  committed
  c29493b

  Copy full SHA for c29493b

• lint fix

  kieckhafer

  committed
  b069d72

  Copy full SHA for b069d72

• renamed file for email template

  kieckhafer

  committed
  62afaf5

  Copy full SHA for 62afaf5

• removed test text

  kieckhafer

  committed
  860526b

  Copy full SHA for 860526b

• Merge remote-tracking branch 'origin/release-0.18.0' into email-template-expansion

  kieckhafer

  committed
  6ccd086

  Copy full SHA for 6ccd086

• Merge remote-tracking branch 'origin/release-0.18.0' into email-template-expansion-v2

  kieckhafer

  committed
  8a08542

  Copy full SHA for 8a08542

Commits on Oct 26, 2016

• path file organization

  kieckhafer

  committed
  41a6dca

  Copy full SHA for 41a6dca

• mail -> SMTP for clarification

  kieckhafer

  committed
  d3df652

  Copy full SHA for d3df652

• Merge branch 'release-0.18.0' into email-template-expansion-v2

  Show description for 5863af4
  kieckhafer

  committed
  5863af4

  Copy full SHA for 5863af4

Commits on Oct 31, 2016

• Merge branch 'release-0.18.0' into email-template-expansion-v2

  Show description for 78af213
  kieckhafer

  committed
  78af213

  Copy full SHA for 78af213

• i18n for email template admin

  kieckhafer

  committed
  74e5209

  Copy full SHA for 74e5209

• publication for Templates

  kieckhafer

  committed
  fa7a887

  Copy full SHA for fa7a887

• conflict fix

  kieckhafer

  committed
  2717f4a

  Copy full SHA for 2717f4a

Commits on Nov 1, 2016

• add email subject into saved DB data

  kieckhafer

  committed
  4c59cf0

  Copy full SHA for 4c59cf0

• add server methods for deleting email templates

  kieckhafer

  committed
  ae63b66

  Copy full SHA for ae63b66

• Add a duplicate, editable template to the template collection (#1548)

  Show description for 60a400d
  mikemurray

  authored
  60a400d

  Copy full SHA for 60a400d

Commits on Nov 2, 2016

• server methods for updating email templates

  kieckhafer

  committed
  a7e3a27

  Copy full SHA for a7e3a27

• added check for original template

  kieckhafer

  committed
  f9cbc0f

  Copy full SHA for f9cbc0f

Commits on Nov 4, 2016

• new translations

  kieckhafer

  committed
  9c821b4

  Copy full SHA for 9c821b4

• Merge branch 'release-0.18.0' into email-template-expansion-v2

  kieckhafer

  committed
  00b3622

  Copy full SHA for 00b3622

• Merge branch 'release-0.18.0' into email-template-expansion-v2

  kieckhafer

  committed
  6c212f9

  Copy full SHA for 6c212f9

Commits on Nov 7, 2016

• Merge branch 'release-0.18.0' into more-email-templates

  kieckhafer

  committed
  cacbe5d

  Copy full SHA for cacbe5d

• core workflow emails - processing & completed

  kieckhafer

  committed
  48b1548

  Copy full SHA for 48b1548

• test - new workflow email exports

  kieckhafer

  committed
  49fd050

  Copy full SHA for 49fd050

• Merge branch 'release-0.18.0' into more-email-templates

  kieckhafer

  committed
  d6ae42e

  Copy full SHA for d6ae42e

Commits on Nov 9, 2016

• Update email schema

  kieckhafer

  committed
  6313696

  Copy full SHA for 6313696

• Merge branch 'release-0.18.0' into email-template-expansion-v2

  kieckhafer

  committed
  55ee75d

  Copy full SHA for 55ee75d

• shipping email

  kieckhafer

  committed
  fe24ae5

  Copy full SHA for fe24ae5

• conflict fixes

  kieckhafer

  committed
  a62de1c

  Copy full SHA for a62de1c

• Merge branch 'email-template-expansion-v2' into more-email-templates

  Show description for 784f581
  kieckhafer

  committed
  784f581

  Copy full SHA for 784f581

• removed comments

  kieckhafer

  committed
  b7d58c3

  Copy full SHA for b7d58c3

• removed comments

  kieckhafer

  committed
  5a7e6fb

  Copy full SHA for 5a7e6fb

• import new email schema

  kieckhafer

  committed
  292c8c8

  Copy full SHA for 292c8c8

• template updates

  kieckhafer

  committed
  dbc1bc7

  Copy full SHA for dbc1bc7

Commits on Nov 10, 2016

• removed commented code

  kieckhafer

  committed
  403749b

  Copy full SHA for 403749b

• organize templates

  kieckhafer

  committed
  f5b8fcb

  Copy full SHA for f5b8fcb

• added todo to schema

  kieckhafer

  committed
  0cdf1ae

  Copy full SHA for 0cdf1ae

• updated comments

  kieckhafer

  committed
  2ea3e01

  Copy full SHA for 2ea3e01

• cleanup methods file

  kieckhafer

  committed
  ad5bf15

  Copy full SHA for ad5bf15

• updated error messaging

  kieckhafer

  committed
  6cbb296

  Copy full SHA for 6cbb296

• schema update

  kieckhafer

  committed
  f32c3f4

  Copy full SHA for f32c3f4

• update comments

  kieckhafer

  committed
  c8d183b

  Copy full SHA for c8d183b

• i18n updates

  kieckhafer

  committed
  16924ad

  Copy full SHA for 16924ad

• removed testing alerts

  kieckhafer

  committed
  e620cff

  Copy full SHA for e620cff

• i18n updates

  kieckhafer

  committed
  c0b46cc

  Copy full SHA for c0b46cc

• file organization

  kieckhafer

  committed
  0cfe9cf

  Copy full SHA for 0cfe9cf

• Merge branch 'release-0.18.0' into more-email-templates

  kieckhafer

  committed
  f605a96

  Copy full SHA for f605a96

• fixed conflicts

  Show description for 8fb9948
  kieckhafer

  committed
  8fb9948

  Copy full SHA for 8fb9948