Skip to content

Commit

Permalink
chore: dev to master (#927)
Browse files Browse the repository at this point in the history 
* 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 <dmelissa216@gmail.com>

* 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 <dmelissa216@gmail.com>

* Jacky/email (#900)

* fix: change to mchacks 10 in email templates

* fix: dates

* fix: move confirmation date +1 day

Co-authored-by: Jacky Zhang <jackyyzhang@gmail.com>

* 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 <dmelissa216@gmail.com>
Co-authored-by: Yun Kai Peng <45922265+pengyk@users.noreply.github.com>
  • Loading branch information
@jackyyzhang03 @brarsanmol
@meldunn @pengyk
4 people authored Jan 17, 2024
1 parent 267f13b commit c4eac3c
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 40 deletions.
6 changes: 1 addition & 5 deletions assets/email/statusEmail/Accepted.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,11 +400,7 @@
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">hacker
dashboard</a> so we can pass your spot along to someone else.
<br><br>
In the meantime, follow us on <a href="https://facebook.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook</a>,
<a href="https://twitter.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Twitter</a>,
and <a href="https://instagram.com/mcgillhacks"
In the meantime, follow us on <a href="https://instagram.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Instagram</a>
for important updates and news about McHacks! If you have any questions,
feel free to reach out at <a href="mailto:contact@mchacks.ca"
Expand Down
6 changes: 1 addition & 5 deletions assets/email/statusEmail/Applied.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,11 +397,7 @@
3rd at
11:59 PM ET</b>.
<br><br>
In the meantime, follow us on <a href="https://facebook.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook</a>,
<a href="https://twitter.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Twitter</a>,
and <a href="https://instagram.com/mcgillhacks"
In the meantime, follow us on <a href="https://instagram.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Instagram</a>
for important updates and news about McHacks! If you have any questions,
feel free to reach out at <a href="mailto:contact@mchacks.ca"
Expand Down
6 changes: 1 addition & 5 deletions assets/email/statusEmail/Checked-in.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,11 +404,7 @@


<br><br>
Follow us on <a href="https://facebook.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook</a>,
<a href="https://twitter.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Twitter</a>,
and <a href="https://instagram.com/mcgillhacks"
Follow us on <a href="https://instagram.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Instagram</a>
for important updates and news about McHacks! If you have any questions,
feel free to reach out at <a href="mailto:contact@mchacks.ca"
Expand Down
6 changes: 1 addition & 5 deletions assets/email/statusEmail/Confirmed.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,11 +391,7 @@
as excited as we are. Keep an eye out for our week-of email with more
details regarding McHacks. Happy hacking!
<br><br>
Follow us on <a href="https://facebook.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook</a>,
<a href="https://twitter.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Twitter</a>,
and <a href="https://instagram.com/mcgillhacks"
Follow us on <a href="https://instagram.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Instagram</a>
for important updates about McHacks! If you have any questions,
feel free to reach out at <a href="mailto:contact@mchacks.ca"
Expand Down
6 changes: 1 addition & 5 deletions assets/email/statusEmail/Declined.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,11 +394,7 @@
unfortunately can't accept everyone. We hope you understand and
encourage you to apply again in the future.
<br><br>
Follow us on <a href="https://facebook.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook</a>,
<a href="https://twitter.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Twitter</a>,
and <a href="https://instagram.com/mcgillhacks"
Follow us on <a href="https://instagram.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Instagram</a>
for important updates about McHacks.
<br><br>
Expand Down
6 changes: 1 addition & 5 deletions assets/email/statusEmail/None.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,11 +399,7 @@
be sure to
click submit before then to be considered.
<br><br>
In the meantime, follow us on <a href="https://facebook.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook</a>,
<a href="https://twitter.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Twitter</a>,
and <a href="https://instagram.com/mcgillhacks"
In the meantime, follow us on <a href="https://instagram.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Instagram</a>
for important updates and news about McHacks! If you have any questions,
feel free to reach out at <a href="mailto:contact@mchacks.ca"
Expand Down
6 changes: 1 addition & 5 deletions assets/email/statusEmail/Waitlisted.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,11 +399,7 @@
But don't sweat yet, we've placed your application among the
others to be considered in the final round of applications.
<br><br>
In the meantime, follow us on <a href="https://facebook.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook</a>,
<a href="https://twitter.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Twitter</a>,
and <a href="https://instagram.com/mcgillhacks"
In the meantime, follow us on <a href="https://instagram.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Instagram</a>
for important updates and news about McHacks! If you have any questions,
feel free to reach out at <a href="mailto:contact@mchacks.ca"
Expand Down
6 changes: 1 addition & 5 deletions assets/email/statusEmail/Withdrawn.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,11 +390,7 @@
We're sorry to hear that you won't be able to attend McHacks this year.
😢
<br><br>
Follow us on <a href="https://facebook.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook</a>,
<a href="https://twitter.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Twitter</a>,
and <a href="https://instagram.com/mcgillhacks"
Follow us on <a href="https://instagram.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Instagram</a>
for important updates and news about McHacks.
<br><br>
Expand Down

0 comments on commit c4eac3c

Please sign in to comment.