Merge branch 'master' into PLT-340

web/react/components/admin_console/team_analytics.jsx

@@ -56,6 +56,8 @@ export default class TeamAnalytics extends React.Component {
             teamId,
             'post_counts_day',
             (data) => {
+                data.reverse();
+
                 var chartData = {
                     labels: [],
                     datasets: [{
@@ -89,6 +91,8 @@ export default class TeamAnalytics extends React.Component {
             teamId,
             'user_counts_with_posts_day',
             (data) => {
+                data.reverse();
+
                 var chartData = {
                     labels: [],
                     datasets: [{

web/react/components/admin_console/team_users.jsx

@@ -33,14 +33,6 @@ export default class UserList extends React.Component {
         this.getTeamProfiles(this.props.team.id);
     }
 
-    // this.setState({
-    //     teamId: this.state.teamId,
-    //     users: this.state.users,
-    //     serverError: this.state.serverError,
-    //     showPasswordModal: this.state.showPasswordModal,
-    //     user: this.state.user
-    // });
-
     getTeamProfiles(teamId) {
         Client.getProfilesForTeam(
             teamId,
@@ -95,8 +87,6 @@ export default class UserList extends React.Component {
     }
 
     doPasswordResetDismiss() {
-        this.state.showPasswordModal = false;
-        this.state.user = null;
         this.setState({
             teamId: this.state.teamId,
             users: this.state.users,

web/react/utils/utils.jsx

@@ -211,11 +211,15 @@ export function displayDateTime(ticks) {
     }
 
     interval = Math.floor(seconds / 60);
-    if (interval > 1) {
+    if (interval >= 2) {
         return interval + ' minutes ago';
     }
 
-    return '1 minute ago';
+    if (interval >= 1) {
+        return '1 minute ago';
+    }
+
+    return 'just now';
 }
 
 export function displayCommentDateTime(ticks) {

web/sass-files/sass/partials/_admin-console.scss

@@ -38,7 +38,6 @@
 
     .recent-active-users {
         width: 365px;
-        height: 375px;
         border: 1px solid #ddd;
         padding: 5px 10px 10px 10px;
         margin: 10px 10px 10px 10px;