diff options
| author | JoramWilander <jwawilander@gmail.com> | 2015-06-29 08:10:59 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2015-06-29 08:10:59 -0400 |
| commit | 366557b101f318b69ad854349c2414783ce1c82a (patch) | |
| tree | 4ea6caf1e890703b4bb4e727ebce0099dfc88327 | |
| parent | a8089fec3a1ece728408cbaf015d1ea1a33926fd (diff) | |
| download | chat-366557b101f318b69ad854349c2414783ce1c82a.tar.gz chat-366557b101f318b69ad854349c2414783ce1c82a.tar.bz2 chat-366557b101f318b69ad854349c2414783ce1c82a.zip | |
rebase touch-ups
| -rw-r--r-- | store/sql_channel_store.go | 2 | ||||
| -rw-r--r-- | web/react/components/sidebar_right_menu.jsx | 1 | ||||
| -rw-r--r-- | web/react/components/team_settings.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/user_settings_modal.jsx | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 07e39df34..463fce16f 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -37,7 +37,7 @@ func NewSqlChannelStore(sqlStore *SqlStore) ChannelStore { } func (s SqlChannelStore) UpgradeSchemaIfNeeded() { - s.CreateColumnIfNotExists("ChannelMembers", "LastUpdateAt", "NotifyLevel", "bigint(20)", "0") + s.CreateColumnIfNotExists("ChannelMembers", "LastUpdateAt", "NotifyLevel", "bigint(20)", "0") // Remove after 6/7/2015 prod push } func (s SqlChannelStore) CreateIndexesIfNotExists() { diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx index c523ce554..22d1d9ad2 100644 --- a/web/react/components/sidebar_right_menu.jsx +++ b/web/react/components/sidebar_right_menu.jsx @@ -60,6 +60,7 @@ module.exports = React.createClass({ <div className="nav-pills__container"> <ul className="nav nav-pills nav-stacked"> <li><a href="#" data-toggle="modal" data-target="#user_settings1"><i className="glyphicon glyphicon-cog"></i>Account Settings</a></li> + { isAdmin ? <li><a href="#" data-toggle="modal" data-target="#team_settings"><i className="glyphicon glyphicon-globe"></i>Team Settings</a></li> : "" } { invite_link } { team_link } { manage_link } diff --git a/web/react/components/team_settings.jsx b/web/react/components/team_settings.jsx index 0cec30f3e..a43e5d2f0 100644 --- a/web/react/components/team_settings.jsx +++ b/web/react/components/team_settings.jsx @@ -113,7 +113,7 @@ var FeatureTab = React.createClass({ <div> <div className="modal-header"> <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> - <h4 className="modal-title" ref="title"><i className="modal-back"></i>General Settings</h4> + <h4 className="modal-title" ref="title"><i className="modal-back"></i>Feature Settings</h4> </div> <div ref="wrapper" className="user-settings"> <h3 className="tab-header">Feature Settings</h3> diff --git a/web/react/components/user_settings_modal.jsx b/web/react/components/user_settings_modal.jsx index ff001611d..1761e575a 100644 --- a/web/react/components/user_settings_modal.jsx +++ b/web/react/components/user_settings_modal.jsx @@ -50,7 +50,7 @@ module.exports = React.createClass({ updateTab={this.updateTab} /> </div> - <div className="settings-content"> + <div className="settings-content minimize-settings"> <UserSettings activeTab={this.state.active_tab} activeSection={this.state.active_section} |