From c4eac3c83efc919d17c707e79b338b57c5681786 Mon Sep 17 00:00:00 2001 From: Jacky Zhang <81784897+jackyyzhang03@users.noreply.github.com> Date: Tue, 16 Jan 2024 22:17:13 -0500 Subject: [PATCH] chore: dev to master (#927) * feat(hacker.js,hacker.middleware.js): add ability for discord verification. (#795) * feat(hacker.js,hacker.middleware.js): add ability for discord verification.. * fix(hacker.js): typo in middleware function call. * add postDiscord role/route * Fix hacker discord route Co-authored-by: meldunn * change invite to disc (#799) * change invite to disc * remove fb group * fix/update emails (#882) * feat(hacker.js,hacker.middleware.js): add ability for discord verification.. * fix(hacker.js): typo in middleware function call. * add postDiscord role/route * fix: update applied email Co-authored-by: meldunn * Jacky/email (#900) * fix: change to mchacks 10 in email templates * fix: dates * fix: move confirmation date +1 day Co-authored-by: Jacky Zhang * Fix/check in discord (#905) * fix: change to mchacks 10 in email templates * fix: dates * fix: move confirmation date +1 day * Fix: check in discord --------- * feat: add field for reimbursement reason (#922) * feat: set cookie SameSite using env variable * feat: update status update emails * feat: remove facebook and twitter from status emails --------- Co-authored-by: Anmol Brar <83686967+brarsanmol@users.noreply.github.com> Co-authored-by: meldunn Co-authored-by: Yun Kai Peng <45922265+pengyk@users.noreply.github.com> --- assets/email/statusEmail/Accepted.hbs | 6 +----- assets/email/statusEmail/Applied.hbs | 6 +----- assets/email/statusEmail/Checked-in.hbs | 6 +----- assets/email/statusEmail/Confirmed.hbs | 6 +----- assets/email/statusEmail/Declined.hbs | 6 +----- assets/email/statusEmail/None.hbs | 6 +----- assets/email/statusEmail/Waitlisted.hbs | 6 +----- assets/email/statusEmail/Withdrawn.hbs | 6 +----- 8 files changed, 8 insertions(+), 40 deletions(-) diff --git a/assets/email/statusEmail/Accepted.hbs b/assets/email/statusEmail/Accepted.hbs index cf187496..8e0bc5d3 100644 --- a/assets/email/statusEmail/Accepted.hbs +++ b/assets/email/statusEmail/Accepted.hbs @@ -400,11 +400,7 @@ style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">hacker dashboard so we can pass your spot along to someone else.

- In the meantime, follow us on Facebook, - Twitter, - and Instagram for important updates and news about McHacks! If you have any questions, feel free to reach out at .

- In the meantime, follow us on Facebook, - Twitter, - and Instagram for important updates and news about McHacks! If you have any questions, feel free to reach out at
- Follow us on Facebook, - Twitter, - and Instagram for important updates and news about McHacks! If you have any questions, feel free to reach out at
- Follow us on Facebook, - Twitter, - and Instagram for important updates about McHacks! If you have any questions, feel free to reach out at
- Follow us on Facebook, - Twitter, - and Instagram for important updates about McHacks.

diff --git a/assets/email/statusEmail/None.hbs b/assets/email/statusEmail/None.hbs index 5f4218f0..f31d90f6 100644 --- a/assets/email/statusEmail/None.hbs +++ b/assets/email/statusEmail/None.hbs @@ -399,11 +399,7 @@ be sure to click submit before then to be considered.

- In the meantime, follow us on Facebook, - Twitter, - and Instagram for important updates and news about McHacks! If you have any questions, feel free to reach out at
- In the meantime, follow us on Facebook, - Twitter, - and Instagram for important updates and news about McHacks! If you have any questions, feel free to reach out at
- Follow us on Facebook, - Twitter, - and Instagram for important updates and news about McHacks.