Skip to content

Emilkovacev patch 1 #12

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

Merged
merged 12 commits into from
Sep 13, 2021
Merged

Emilkovacev patch 1 #12

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3a0d621
created dev branch with dev settings
Sep 1, 2021
2e6cc94
updated discord join information and added discord link in navbar
Sep 2, 2021
2b4d85d
fixed navbar and moved stuff around
Sep 2, 2021
1973534
fixed discord join, again
Sep 3, 2021
d7bb309
checking new discord route
Sep 3, 2021
bbc026e
checking new discord link in page layouts
Sep 3, 2021
68fd227
changed discord redirects
Sep 3, 2021
4b1e64b
resolved email formatting
russella26 Sep 10, 2021
8addbce
Merge branch 'production' into dev
russella26 Sep 10, 2021
9f84ee2
corrected a typo, 404 error should be resolved
russella26 Sep 13, 2021
57d5b7c
Merge pull request #10 from makeopensource/404fix
emilkovacev Sep 13, 2021
03e9bf5
Update settings.py to reflect deployment branch
emilkovacev Sep 13, 2021
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
4 changes: 2 additions & 2 deletions join/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
def index(request):

if 'join_status' in request.session and request.session['join_status'] == 'joined':
render(request, 'join/send_verification.html')
return render(request, 'join/send_verification.html')

elif request.method == "POST":
form = JoinForm(request.POST)
Expand Down Expand Up @@ -53,7 +53,7 @@ def index(request):
send_mail(
subject='Verify your identity: Thank you for joining MakeOpenSource!',
html_message = html_content,
plain_message = strip_tags(html_content),
message = strip_tags(html_content),
from_email='no-reply@makeopensource.org',
recipient_list=[email],
fail_silently=False,
Expand Down