diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-03-02 17:48:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-02 17:48:56 -0500 |
| commit | 3a91d4e5e419a43ff19a0736ce697f8d611d36e3 (patch) | |
| tree | e57ad85d49f8768a575f27c89d338a4ccaeda521 /app/email_batching.go | |
| parent | 8c5cee9521656bcffb371aad9dae4bea8fc70e29 (diff) | |
| download | chat-3a91d4e5e419a43ff19a0736ce697f8d611d36e3.tar.gz chat-3a91d4e5e419a43ff19a0736ce697f8d611d36e3.tar.bz2 chat-3a91d4e5e419a43ff19a0736ce697f8d611d36e3.zip | |
PLT-3077 Add group messaging (#5489)
* Implement server changes for group messaging
* Majority of client-side implementation
* Some server updates
* Added new React multiselect component
* Fix style issues
* Add custom renderer for options
* Fix model test
* Update ENTER functionality for multiselect control
* Remove buttons from multiselect UI control
* Updating group messaging UI (#5524)
* Move filter controls up a component level
* Scroll with arrow keys
* Updating mobile layout for multiselect (#5534)
* Fix race condition when backspacing quickly
* Hidden or new GMs show up for regular messages
* Add overriding of number remaining text
* Add UI filtering for team if config setting set
* Add icon to channel switcher and class prop to status icon
* Minor updates per feedback
* Improving group messaging UI (#5563)
* UX changes per feedback
* Update email for group messages
* UI fixes for group messaging (#5587)
* Fix missing localization string
* Add maximum users message when adding members to GM
* Fix input clearing on Android
* Updating group messaging UI (#5603)
* Updating UI for group messaging (#5604)
Diffstat (limited to 'app/email_batching.go')
| -rw-r--r-- | app/email_batching.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/email_batching.go b/app/email_batching.go index fc2fb1cea..055656f30 100644 --- a/app/email_batching.go +++ b/app/email_batching.go @@ -244,6 +244,8 @@ func renderBatchedPost(template *utils.HTMLTemplate, post *model.Post, teamName return "" } else if channel := result.Data.(*model.Channel); channel.Type == model.CHANNEL_DIRECT { template.Props["ChannelName"] = translateFunc("api.email_batching.render_batched_post.direct_message") + } else if channel.Type == model.CHANNEL_GROUP { + template.Props["ChannelName"] = translateFunc("api.email_batching.render_batched_post.group_message") } else { template.Props["ChannelName"] = channel.DisplayName } |