diff options
author | =Corey Hulen <corey@hulen.com> | 2015-12-08 13:02:33 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-12-08 13:02:33 -0800 |
commit | 69ecfe4cb1763b10f1690b543ee1828aed94aefa (patch) | |
tree | 53c70c2984b2e4144d3cc0e539ef1b52b8eb4552 /doc | |
parent | 8b29404525f036633be6b25dc18c536d2aafee02 (diff) | |
parent | 90791dd98ea0f26439a13c1ec05a610514988b5c (diff) | |
download | chat-69ecfe4cb1763b10f1690b543ee1828aed94aefa.tar.gz chat-69ecfe4cb1763b10f1690b543ee1828aed94aefa.tar.bz2 chat-69ecfe4cb1763b10f1690b543ee1828aed94aefa.zip |
Fixing merge
Diffstat (limited to 'doc')
-rw-r--r-- | doc/help/Account-Settings.md | 9 | ||||
-rw-r--r-- | doc/help/Markdown.md | 13 | ||||
-rw-r--r-- | doc/help/Messaging.md | 12 |
3 files changed, 32 insertions, 2 deletions
diff --git a/doc/help/Account-Settings.md b/doc/help/Account-Settings.md index a0c55d3e9..1e05ef2ad 100644 --- a/doc/help/Account-Settings.md +++ b/doc/help/Account-Settings.md @@ -93,6 +93,9 @@ Outgoing webhooks use trigger words to fire new message events to external integ ##Display Settings to configure clock and teammate name display preferences. +#### Display Font +Select what font is used. + #### Clock Display Choose a 12-hour or 24-hour time preference that appears on the time stamp for all posts. @@ -104,3 +107,9 @@ Setting to configure when messages are sent. #### Send Messages on Ctrl+Enter If enabled, press **Enter** to insert a new line and **Ctrl + Enter** posts the message. If disabled, **Shift + Enter** inserts a new line and **Enter** posts the message. + +#### Preview pre-release features +Turn on preview features to view them early, ahead of their official release: +- **Show markdown preview option in message input box:** Turning this on will show a "Preview" option when typing in the text input box. Pressing "Preview" shows what the Markdown formatting in the message looks like before the message is sent. +- **Show preview snippet of links below message:** Turning this on will show a preview snippet posted below links from select websites. + diff --git a/doc/help/Markdown.md b/doc/help/Markdown.md index 1befed8d4..64ce4fc83 100644 --- a/doc/help/Markdown.md +++ b/doc/help/Markdown.md @@ -88,7 +88,7 @@ and ## Emojis -Check out a full list of emojis [here](http://www.emoji-cheat-sheet.com/). +Emoji provided free by [Emoji One](http://emojione.com/). Check out a full list of emojis [here](http://http://emoji.codes/). ``` :smile: :+1: :sheep: @@ -132,6 +132,17 @@ Renders as: 1. Item one 2. Item two +Make a task list by including square brackets: +``` +- [ ] Item one +- [ ] Item two +- [x] Completed item +``` +Renders as: +- [ ] Item one +- [ ] Item two +- [x] Completed item + ## Tables: Create a table by placing a dashed line under the header row and separating the columns with a pipe `|`. (The columns don’t need to line up exactly for it to work). Choose how to align table columns by including colons `:` within the header row. diff --git a/doc/help/Messaging.md b/doc/help/Messaging.md index cc26a948e..548892650 100644 --- a/doc/help/Messaging.md +++ b/doc/help/Messaging.md @@ -18,7 +18,8 @@ Mattermost messages are formatted using a standard called "markdown". Here are e |`![embedded image](https://travis-ci.org/mattermost/platform.svg)`|![embedded image](https://travis-ci.org/mattermost/platform.svg)| |`:smile:` `:sheep:` `:alien:`|:smile: :sheep: :alien:| -Check out a full list of Emojis [here](http://www.emoji-cheat-sheet.com/). +Emojis provided free from [Emoji One](http://emojione.com/). Check out a full list of Emojis [here](http://emoji.codes/). + ## Mentioning Teammates @@ -35,3 +36,12 @@ Which sends a special mention notification to **alice** to check your message. To mention a teammate, press `@` and you should see a list of team members who can be messaged. You can either type their username or use the **Up** and **Down** arrow keys and then **ENTER** to select them to be mentioned. You can configure how you'd like to be alerted about mentions of your username, your first name, your nickname, or other keywords from **Account Settings** > **Notifications** and you can set channel-specific preferences from **[Channel Name]** > **Notification Preferences** + +## Messages Dropdown Menu + +To get to the Messages Dropdown Menu, hover over a message and click on the [...] menu. This shows a dropdown list containing additional actions you can perform on a message: + +- **Reply:** Opens up the sidebar so you can reply to a message in a comment thread. +- **Permalink:** Creates a link to the message. Sharing this link with other users in the channel lets them view the linked message in the Message Archives. +- **Delete:** Deletes the message so it is no longer visible. Team Administrators and System Administrators can also delete another user's message. +- **Edit:** Lets you edit your own message. |