Merge branch 'master' into post-metadata

koox00 · Nov 23, 2018 · fa4abeb · fa4abeb
2 parents e005b58 + a0b36ae
commit fa4abeb
Show file tree

Hide file tree

Showing 130 changed files with 4,911 additions and 5,360 deletions.
diff --git a/actions/websocket_actions.jsx b/actions/websocket_actions.jsx
@@ -706,7 +706,7 @@ function handleChannelDeletedEvent(msg) {
  browserHistory.push(teamUrl + '/channels/' + Constants.DEFAULT_CHANNEL);
  }
 
- dispatch({type: ChannelTypes.RECEIVED_CHANNEL_DELETED, data: {id: msg.data.channel_id, team_id: msg.broadcast.team_id, deleteAt: msg.data.delete_at}});
+ dispatch({type: ChannelTypes.RECEIVED_CHANNEL_DELETED, data: {id: msg.data.channel_id, team_id: msg.broadcast.team_id, deleteAt: msg.data.delete_at, viewArchivedChannels}});
 }
 
 function handlePreferenceChangedEvent(msg) {

diff --git a/components/admin_console/admin_sidebar/admin_sidebar.jsx b/components/admin_console/admin_sidebar/admin_sidebar.jsx
@@ -288,7 +288,7 @@ export default class AdminSidebar extends React.Component {
  title={
  <FormattedMessage
  id='admin.sidebar.data_retention'
- defaultMessage='Data Retention Policy (Beta)'
+ defaultMessage='Data Retention Policy'
  />
  }
  />

diff --git a/components/admin_console/data_retention_settings.jsx b/components/admin_console/data_retention_settings.jsx
@@ -162,7 +162,7 @@ export default class DataRetentionSettings extends AdminSettings {
  return (
  <FormattedMessage
  id='admin.data_retention.title'
- defaultMessage='Data Retention Policy (Beta)'
+ defaultMessage='Data Retention Policy'
  />
  );
  }