thunderstrike/plane
thunderstrike/plane
2
0
Fork 0
forked from github/plane
Code Pull Requests Activity

Merge branch 'develop' of github.com:makeplane/plane into dev/update_emails

Browse Source
This commit is contained in:
pablohashescobar 2023-11-30 00:21:31 +05:30
commit 75d18adfd3
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apiserver/plane/bgtasks/forgot_password_task.py
View File

@ -73,6 +73,7 @@ def forgot_password(first_name, email, uidb64, token, current_site):
context = {
"first_name": first_name,
"forgot_password_url": abs_url,
"email": email,
}
html_content = render_to_string("emails/auth/forgot_password.html", context)

2
apiserver/plane/license/api/views/instance.py
View File

@ -116,7 +116,7 @@ class InstanceEndpoint(BaseAPIView):
if instance is None:
return Response(
{"is_activated": False, "is_setup_done": False},
status=status.HTTP_400_BAD_REQUEST,
status=status.HTTP_200_OK,
)
# Return instance
serializer = InstanceSerializer(instance)

16
apiserver/templates/emails/auth/magic_signin.html
View File

@ -225,11 +225,16 @@
padding-top: 5px !important;
}
.r24-o {
border-style: solid !important;
margin-right: 8px !important;
width: 32px !important;
}
.r25-o {
border-style: solid !important;
margin-right: 0px !important;
width: 32px !important;
}
.r25-i {
.r26-i {
padding-bottom: 0px !important;
padding-top: 5px !important;
text-align: center !important;
@ -1246,14 +1251,13 @@
role="presentation"
width="100%"
class="r22-o"
class="r24-o"
style="
table-layout: fixed;
width: 100%;
"
>
<tr>
<td
class="r23-i"
class="r17-i"
style="
font-size: 0px;
line-height: 0px;
@ -1305,7 +1309,7 @@
border="0"
role="presentation"
width="100%"
class="r24-o"
class="r25-o"
style="
table-layout: fixed;
width: 100%;
@ -1437,7 +1441,7 @@
<td
align="center"
valign="top"
class="r25-i nl2go-default-textstyle"
class="r26-i nl2go-default-textstyle"
style="
color: #3b3f44;
font-family: georgia, serif;