wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-06 13:41:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into events

Browse Source
This commit is contained in:
Wyatt Johnson
2018-02-16 16:43:03 -07:00
parent 91aeb9dbae 950efba3fe
commit 0b547b173a
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-framework/utils/user.js
+1 -1
View File
@@ -21,7 +21,7 @@ export const getReliability = reliabilityValue => {
*/
export const isSuspended = user => {
const suspensionUntil = get(user, 'status.suspension.until');
const suspensionUntil = get(user, 'state.status.suspension.until');
return user && suspensionUntil && new Date(suspensionUntil) > new Date();
};
views/admin/confirm-email.ejs
+1 -1
View File
@@ -5,7 +5,7 @@
<title>Email Verification</title>
<link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
<link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">
<%- include partials/head %>
<%- include ../partials/head %>
</head>
<body class="confirm-email-page">
<div id="root">
views/admin/docs.ejs
+1 -1
View File
@@ -24,7 +24,7 @@
font-weight: bold;
}
</style>
<%- include partials/head %>
<%- include ../partials/head %>
</head>
<body class="docs-page">
<div id="root"></div>
views/admin/password-reset.ejs
+1 -1
View File
@@ -5,7 +5,7 @@
<title>Password Reset</title>
<link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
<link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">
<%- include partials/head %>
<%- include ../partials/head %>
</head>
<body class="password-reset-page">
<div id="root">