Skip to content

Commit 0d4e00e

Browse files
committed
chore(master): merge dev into master.
2 parents 85cdbf3 + 069cb7d commit 0d4e00e

File tree

4 files changed

+31
-7
lines changed

4 files changed

+31
-7
lines changed

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2018 HackMcGill
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

assets/email/AccountInvitation.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,10 +392,10 @@
392392
have resume access you will be able to download hacker resumes through
393393
the dashboard.
394394
<br><br>
395-
Sponsor check-in starts at 6:00 pm on Friday, January 29th on the
395+
Sponsor check-in starts at 6:00 pm on Friday, January 21st on the
396396
McHacks Discord server and opening ceremonies will begin at 7:00 pm. Be
397397
sure to get set up on the McHacks Discord server at <a
398-
href="https://discord.gg/g4Pya8jcxM"
398+
href="https://discord.gg/XVSdW9pc"
399399
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">https://discord.gg/g4Pya8jcxM</a>
400400
and contact your coordinator to set up your server roles.
401401
<br><br>

assets/email/statusEmail/Accepted.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@
392392
<br><br>
393393
Confirm your attendance on our <a href="https://app.mchacks.ca/"
394394
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">hacker
395-
dashboard</a> no later than <b>January 25th at 11:59PM EST</b>.
395+
dashboard</a> no later than <b>January 17th at 11:59PM EST</b>.
396396
<br><br>
397397
If you can no longer attend McHacks, please let us know as soon as
398398
possible by withdrawing your application on our <a

middlewares/hacker.middleware.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,17 @@ function validateConfirmedStatus(account) {
127127
message: Constants.Error.ACCOUNT_404_MESSAGE,
128128
data: { account: account }
129129
};
130-
} else if (!account.confirmed) {
130+
}
131+
/*
132+
else if (!account.confirmed) {
131133
return {
132134
status: 403,
133135
message: Constants.Error.ACCOUNT_403_MESSAGE,
134136
data: { account: { id: account.id, confirmed: account.confirmed } }
135137
};
136-
} else if (account.accountType !== Constants.General.HACKER) {
138+
}
139+
*/
140+
else if (account.accountType !== Constants.General.HACKER) {
137141
return {
138142
status: 409,
139143
message: Constants.Error.ACCOUNT_TYPE_409_MESSAGE,
@@ -837,8 +841,7 @@ async function checkDuplicateAccountLinks(req, res, next) {
837841
*/
838842
async function findSelf(req, res, next) {
839843
if (
840-
req.user.accountType != Constants.General.HACKER ||
841-
!req.user.confirmed
844+
req.user.accountType != Constants.General.HACKER /*|| !req.user.confirmed*/
842845
) {
843846
return next({
844847
status: 409,

0 commit comments

Comments
 (0)