diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-12-08 08:18:17 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-12-08 08:18:17 -0500 |
| commit | d7df0695e3d8f288ccf7593a6f4bd360bffb20d8 (patch) | |
| tree | ce8baacd63bf3c136833db940e1f004b525e243c | |
| parent | 38c313c93472fc9d2a313212985f02e8d033c2cc (diff) | |
| parent | 2b0cd7e619651c6c6a01b405512fd725f092e71d (diff) | |
| download | chat-d7df0695e3d8f288ccf7593a6f4bd360bffb20d8.tar.gz chat-d7df0695e3d8f288ccf7593a6f4bd360bffb20d8.tar.bz2 chat-d7df0695e3d8f288ccf7593a6f4bd360bffb20d8.zip | |
Merge pull request #1636 from mattermost/plt-1354
PLT-1354 Show channel member count up to 100 now
| -rw-r--r-- | api/channel.go | 2 | ||||
| -rw-r--r-- | web/react/utils/constants.jsx | 2 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_headers.scss | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/api/channel.go b/api/channel.go index 659121bf0..f17594c0a 100644 --- a/api/channel.go +++ b/api/channel.go @@ -740,7 +740,7 @@ func getChannelExtraInfo(c *Context, w http.ResponseWriter, r *http.Request) { } scm := Srv.Store.Channel().GetMember(id, c.Session.UserId) - ecm := Srv.Store.Channel().GetExtraMembers(id, 20) + ecm := Srv.Store.Channel().GetExtraMembers(id, 100) ccm := Srv.Store.Channel().GetMemberCount(id) if cmresult := <-scm; cmresult.Err != nil { diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index b4d56bccb..c4fa38e91 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -149,7 +149,7 @@ export default { ], MONTHS: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'], MAX_DMS: 20, - MAX_CHANNEL_POPOVER_COUNT: 20, + MAX_CHANNEL_POPOVER_COUNT: 100, DM_CHANNEL: 'D', OPEN_CHANNEL: 'O', PRIVATE_CHANNEL: 'P', diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index bd0392a52..e73680b38 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -218,7 +218,7 @@ font-size: 14px; line-height: 56px; #member_popover { - width: 45px; + width: 50px; color: #999; cursor: pointer; .fa { |