Merge branch 'master' of https://github.com/rylxes/outline into rylxes-master

.env.sample

@@ -55,4 +55,4 @@ SMTP_PORT=
 SMTP_USERNAME=
 SMTP_PASSWORD=
 SMTP_FROM_EMAIL=
-SMTP_REPLY_EMAIL=
+SMTP_REPLY_EMAIL=

app/models/User.js

@@ -7,6 +7,7 @@ class User extends BaseModel {
   name: string;
   email: string;
   isAdmin: boolean;
+  lastActiveAt: string;
   isSuspended: boolean;
   createdAt: string;
 }

app/scenes/Settings/components/UserListItem.js

@@ -51,7 +51,7 @@ class UserListItem extends React.Component<Props> {
         subtitle={
           <React.Fragment>
             {user.email ? `${user.email} · ` : undefined}
-            Joined <Time dateTime={user.createdAt} /> ago
+            Last Active <Time dateTime={user.lastActiveAt} /> ago
             {user.isAdmin && <Badge admin={user.isAdmin}>Admin</Badge>}
             {user.isSuspended && <Badge>Suspended</Badge>}
           </React.Fragment>

server/presenters/user.js

@@ -18,6 +18,7 @@ export default (user: User, options: Options = {}): ?UserPresentation => {
   const userData = {};
   userData.id = user.id;
   userData.createdAt = user.createdAt;
+  userData.lastActiveAt = user.lastActiveAt;
   userData.name = user.name;
   userData.isAdmin = user.isAdmin;
   userData.isSuspended = user.isSuspended;