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

2019-09-21 13:11:31 -07:00
parent dd5e30f414 02f2868d06
commit 1797a0e90c
4 changed files with 4 additions and 2 deletions
--- a/app/models/User.js
+++ b/app/models/User.js
@@ -7,6 +7,7 @@ class User extends BaseModel {
  name: string;
  email: string;
  isAdmin: boolean;
+  lastActiveAt: string;
  isSuspended: boolean;
  createdAt: string;
 }
--- a/app/scenes/Settings/components/UserListItem.js
+++ b/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>