diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/developer/tests/test-attachments.md | 144 | ||||
-rw-r--r-- | doc/developer/tests/test-markdown-lists.md | 53 | ||||
-rw-r--r-- | doc/developer/tests/test-syntax-highlighting.md | 231 | ||||
-rw-r--r-- | doc/developer/tests/test-tables.md | 80 | ||||
-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 | ||||
-rw-r--r-- | doc/help/Sign-in.md | 14 | ||||
-rw-r--r-- | doc/install/Configuration-Settings.md | 22 | ||||
-rw-r--r-- | doc/install/Upgrade-Guide.md | 2 | ||||
-rw-r--r-- | doc/process/overview.md | 8 |
11 files changed, 556 insertions, 32 deletions
diff --git a/doc/developer/tests/test-attachments.md b/doc/developer/tests/test-attachments.md new file mode 100644 index 000000000..71cc496ce --- /dev/null +++ b/doc/developer/tests/test-attachments.md @@ -0,0 +1,144 @@ +# Testing Files and Attachments +This test contains instructions for the core team to manually test common attachment types. All files for testing are stored in the [mm_file_testing](https://www.dropbox.com/sh/i7ft8is5hbhk8ii/AAAyM-WG-X2jiQOgg6-E3MmLa?dl=0) dropbox folder. Follow these instructions: + +1. Download the entire [mm_file_testing](https://www.dropbox.com/sh/i7ft8is5hbhk8ii/AAAyM-WG-X2jiQOgg6-E3MmLa?dl=0) folder. +2. Drag and drop each file type into Mattermost to upload it. +3. Post the file attachment + +**Notes:** +- All file types should upload and post. +- Read the expected for details on the behavior of the thumbnail and preview window. +- The expected behavior of video and audio formats depends on the operating system, browser and plugins. View the permalinks to the Public Test Channel on Pre-Release Core to see the expected cases. + + +### Images +**JPG** +`Images/JPG.jpg` +Expected: Scaled thumbnail & preview window +[Permalink](https://pre-release.mattermost.com/core/pl/bgx3wcd9ppdo7fz9zqokofg7sc) + +**PNG** +`Images/PNG.png` +Expected: Scaled thumbnail & preview window +[Permalink](https://pre-release.mattermost.com/core/pl/zra4yhm69j8ij81iy5hw7983qe) + +**BMP** +`Images/BMP.bmp` +Expected: Scaled thumbnail & preview window +[Permalink](https://pre-release.mattermost.com/core/pl/1hx7x7t1npn4jqyr5rb1qhbj3h) + +**GIF** +`Images/GIF.gif` +Expected: Scaled thumbnail & preview window. Click to play GIF. +[Permalink](https://pre-release.mattermost.com/core/pl/j49fowdkstr57g3ed9bgpfoo5w) + +**TIFF** +`Images/TIFF.tiff` +Expected: Generic attachment thumbnail & preview window +[Permalink](https://pre-release.mattermost.com/core/pl/6yad4jydaidr3pc3tihp8n8bge) + +**PSD** +`Images/PSD.psd` +Expected: Generic attachment thumbnail & preview window +[Permalink](https://pre-release.mattermost.com/core/pl/4kitwk7pi78c9ck4i98f9xnzoe) + + +### Documents + +**PDF Files** +`Documents/PDF.pdf` +Expected: Generic PDF thumbnail & preview window. +[Permalink](https://pre-release.mattermost.com/core/pl/o1dg6menetdszrhyxmtoqjfi8h) + + +**Excel** +`Documents/Excel.xlsx` +Expected: Generic Excel thumbnail & preview window. +[Permalink](https://pre-release.mattermost.com/core/pl/71wwezy3f7drze6ipundscb17y) + + +**PPT** +`Documents/PPT.pptx` +Expected: Generic Powerpoint thumbnail & preview window. +[Permalink](https://pre-release.mattermost.com/core/pl/mx37h4znwb8f5ffuoajusqhiew) + +**Word** +`Documents/Word.docx` +Expected: Generic Word thumbnail & preview window. +[Permalink](https://pre-release.mattermost.com/core/pl/d7s76wp6kjdwfp4hgrwpijsnyy) + + +### Videos + +**MP4** +`Videos/MP4.mp4` +Expected: Generic video thumbnail & playable preview window +[Permalink](https://pre-release.mattermost.com/core/pl/5dx5qx9t9brqfnhohccxjynx7c) + +**AVI** +`Videos/AVI.avi` +Expected: View Permalink. Expected depends on the operating system, browser and plugins. +[Permalink](https://pre-release.mattermost.com/core/pl/qwn9eiy7j3rkjyruxhcugpogdw) + +**MKV** +`Videos/MKV.mkv` +Expected: View Permalink. Expected depends on the operating system, browser and plugins. +[Permalink](https://pre-release.mattermost.com/core/pl/tszyjkr1cidhxjgiusa4mde3ja) + +**MOV** +`Videos/MOV.mov` +Expected: View Permalink. Expected depends on the operating system, browser and plugins. +[Permalink](https://pre-release.mattermost.com/core/pl/ienzppz5i3f7tbt5jiujn8uuir) + +**MPG** +`Videos/MPG.mpg` +Expected: View Permalink. Expected depends on the operating system, browser and plugins. +[Permalink](https://pre-release.mattermost.com/core/pl/skggdq1hfpritc6c88bi481p5a) + +**Webm** +`Videos/WEBM.webm` +Expected: View Permalink. Expected depends on the operating system, browser and plugins. +[Permalink](https://pre-release.mattermost.com/core/pl/7h8tysuxgfgsxeht3sbn7e4h6y) + +**WMV** +`Videos/WMV.wmv` +Expected: View Permalink. Expected depends on the operating system, browser and plugins. +[Permalink](https://pre-release.mattermost.com/core/pl/kaom7j7uyjra7bzhrre6qwdrbw) + +### Audio + +**MP3** +`Audio/MP3.mp3` +Expected: Generic audio thumbnail & playable preview window +[Permalink](https://pre-release.mattermost.com/core/pl/if4gn8dbrjgx8fmqmkukzefyme) + + +**M4A** +`Audio/M4a.m4a` +Expected: Generic audio thumbnail & playable preview window +[Permalink](https://pre-release.mattermost.com/core/pl/6c7qsw48ybd88bktgeykodsrrc) + +**AAC** +`Audio/AAC.aac` +Expected: View Permalink. Expected depends on the operating system, browser and plugins. +[Permalink](https://pre-release.mattermost.com/core/pl/3naoy5pr5tydbk1m6yo1ast9ny) + +**FLAC** +`Audio/FLAC.flac` +Expected: View Permalink. Expected depends on the operating system, browser and plugins. +[Permalink](https://pre-release.mattermost.com/core/pl/kf4cmy44dfya5efmse7rg43eih) + +**OGG** +`Audio/OGG.ogg` +Expected: View Permalink. Expected depends on the operating system, browser and plugins. +[Permalink](https://pre-release.mattermost.com/core/pl/dezrcpbxapyexe77rjuzkrp63r) + +**WAV** +`Audio/WAV.wav` +Expected: View Permalink. Expected depends on the operating system, browser and plugins. +[Permalink](https://pre-release.mattermost.com/core/pl/pdkxx1udepdnbmi9j8kyas5xbh) + +**WMA** +`Audio/WMA.wma` +Expected: View Permalink. Expected depends on the operating system, browser and plugins. +[Permalink](https://pre-release.mattermost.com/core/pl/756wrmdd57dcig3m4emypp6i1h) diff --git a/doc/developer/tests/test-markdown-lists.md b/doc/developer/tests/test-markdown-lists.md index 905350d31..d5bbd82ac 100644 --- a/doc/developer/tests/test-markdown-lists.md +++ b/doc/developer/tests/test-markdown-lists.md @@ -21,6 +21,7 @@ Verify that all list types render as expected. ``` **Actual:** + 3. One 2. Two 1. Three @@ -38,12 +39,13 @@ Verify that all list types render as expected. ``` **Actual:** -1. Alpha - 1. Bravo + +1. Alpha + 1. Bravo 1. Charlie 1. Delta - 1. Echo - 1. Foxtrot + 1. Echo + 1. Foxtrot ### Single-item Unordered List @@ -99,6 +101,7 @@ Verify that all list types render as expected. ``` **Actual:** + 1. One + Two - Three @@ -169,10 +172,11 @@ Verify that all list types render as expected. ``` **Actual:** + 1. One - - Two - - + - Two + + 1. One 2. Two @@ -186,7 +190,42 @@ This text should be on a new line. ``` **Actual:** + 1. One - Two This text should be on a new line. +### Task Lists + +**Expected:** +``` +[ ] One + [ ] Subpoint one + - Normal Bullet +[ ] Two +[x] Completed item +``` + +**Actual:** + +- [ ] One + - [ ] Subpoint one + - Normal Bullet +- [ ] Two +- [x] Completed item + +### Numbered Task Lists + +**Expected:** +``` +1. [ ] One +2. [ ] Two +3. [x] Completed item +``` + +**Actual:** + +1. [ ] One +2. [ ] Two +3. [x] Completed item + diff --git a/doc/developer/tests/test-syntax-highlighting.md b/doc/developer/tests/test-syntax-highlighting.md new file mode 100644 index 000000000..7f8f4cdaa --- /dev/null +++ b/doc/developer/tests/test-syntax-highlighting.md @@ -0,0 +1,231 @@ +# Code Syntax Highlighting + +Verify the following code blocks render as code blocks and highlight properly. + +### Diff + +``` diff +*** /path/to/original ''timestamp'' +--- /path/to/new ''timestamp'' +*************** +*** 1 **** +! This is a line. +--- 1 --- +! This is a replacement line. +It is important to spell +-removed line ++new line +``` + +### Apache + +``` apache +<VirtualHost *:80> +DocumentRoot /www/example1 +ServerName www.example.com +</VirtualHost> +``` + +### Makefile + +``` makefile +CC=gcc +CFLAGS=-I. + +hellomake: hellomake.o hellofunc.o + $(CC) -o hellomake hellomake.o hellofunc.o -I. +``` + +### HTTP + +``` http +HTTP/1.1 200 OK +Date: Sun, 28 Dec 2014 08:56:53 GMT +Content-Length: 44 +Content-Type: text/html + +<html><body><h1>It works!</h1></body></html> +``` + +### JSON + +``` json +{"employees":[ + {"firstName":"John", "lastName":"Doe"}, +]} +``` + +### Markdown + +``` markdown +**bold** +*italics* +[link](www.example.com) +``` + +### JavaScript + +``` javascript +document.write('Hello, world!'); +``` + +### CSS + +``` css +body { + background-color: red; +} +``` + +### NGINX + +``` nginx +server { # simple reverse-proxy + listen 80; + server_name domain2.com www.domain2.com; + access_log logs/domain2.access.log main; +``` + +### Objective C + +``` objectivec +#import <stdio.h> + +int main (void) +{ + printf ("Hello world!\n"); +} +``` + +### Python + +``` python +print "Hello, world!" +``` + +### XML + +``` xml +<employees> + <employee> + <firstName>John</firstName> <lastName>Doe</lastName> + </employee> +</employees> +``` + +### Perl + +``` perl +print "Hello, World!\n"; +``` + +### Bash + +``` bash +echo "Hello World" +``` + +### PHP + +``` php + <?php echo '<p>Hello World</p>'; ?> +``` + +### CoffeeScript + +``` coffee +console.log(“Hello world!”); +``` + +### C# + +``` cs +using System; +class Program +{ + public static void Main(string[] args) + { + Console.WriteLine("Hello, world!"); + } +} +``` + +### C++ + +``` cpp +#include <iostream.h> + +main() +{ + cout << "Hello World!"; + return 0; +} +``` + +### SQL + +``` sql +SELECT column_name,column_name +FROM table_name; +``` + +### Go + +``` go +package main +import "fmt" +func main() { + fmt.Println("Hello, 世界") +} +``` + +### Ruby + +``` ruby +puts "Hello, world!" +``` + +### Java + +``` java +import javax.swing.JFrame; //Importing class JFrame +import javax.swing.JLabel; //Importing class JLabel +public class HelloWorld { + public static void main(String[] args) { + JFrame frame = new JFrame(); //Creating frame + frame.setTitle("Hi!"); //Setting title frame + frame.add(new JLabel("Hello, world!"));//Adding text to frame + frame.pack(); //Setting size to smallest + frame.setLocationRelativeTo(null); //Centering frame + frame.setVisible(true); //Showing frame + } +} +``` + +### INI + +``` ini +; last modified 1 April 2011 by John Doe +[owner] +name=John Doe +organization=Mattermost +``` + +### Latex Equation + +``` latex +\frac{d}{dx}\left( \int_{0}^{x} f(u)\,du\right)=f(x). +``` + +### Latex Document + +``` latex +\documentclass{article} +\begin{document} +\noindent +Are $a, b \in \mathbb{R}, then applies (a+b)^{2} = a^{2} + ab + b^{2} $ \\ +better \\ +are $a, b \in \mathbb{R}, \textrm{then applies} \, (a+b)^{2 } = a^{2 } + ab + b^{2}$\\ +\end{document} +``` + diff --git a/doc/developer/tests/test-tables.md b/doc/developer/tests/test-tables.md new file mode 100644 index 000000000..87d8af856 --- /dev/null +++ b/doc/developer/tests/test-tables.md @@ -0,0 +1,80 @@ +# Markdown Tables + +Verify that all tables render as described. + +### Normal Tables + +These tables use different raw text as inputs, but all three should render as the same table. + +#### Table 1 + +Raw text: + +``` +First Header | Second Header +------------- | ------------- +Content Cell | Content Cell +Content Cell | Content Cell +``` + +Renders as: + +First Header | Second Header +------------- | ------------- +Content Cell | Content Cell +Content Cell | Content Cell + +#### Table 2 + +Raw Text: + +``` +| First Header | Second Header | +| ------------- | ------------- | +| Content Cell | Content Cell | +| Content Cell | Content Cell | +``` + +Renders as: + +| First Header | Second Header | +| ------------- | ------------- | +| Content Cell | Content Cell | +| Content Cell | Content Cell | + +#### Table 3 + +Raw Text: + +``` +| First Header | Second Header | +| ------------- | ----------- | +| Content Cell | Content Cell| +| Content Cell | Content Cell | +``` + +Renders as: + +| First Header | Second Header | +| ------------- | ----------- | +| Content Cell | Content Cell| +| Content Cell | Content Cell | + +### Tables Containing Markdown + +This table should contain A1: Strikethrough, A2: Bold, B1: Italics, B2: Dolphin emoticon. + +| Column\Row | 1 | 2 | +| ------------- | ------------- |------------- | +| A | ~~Strikethrough~~ | **Bold** | +| B | _italics_ | :dolphin: | + +### Table with Left, Center, and Right Aligned Columns + +The left column should be left aligned, the center column centered and the right column should be right aligned. + +| Left-Aligned | Center Aligned | Right Aligned | +| :------------ |:---------------:| -----:| +| 1 | this text | $100 | +| 2 | is | $10 | +| 3 | centered | $1 | 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. diff --git a/doc/help/Sign-in.md b/doc/help/Sign-in.md index f8e353cce..5b7b375c7 100644 --- a/doc/help/Sign-in.md +++ b/doc/help/Sign-in.md @@ -2,22 +2,26 @@ You can sign-in to your team from the web address of `https://domain.com/teamname`. -There are several options for signing in depending on how your System Administrator has configured your server. +There are several options for signing in to your team depending on how your System Administrator has configured your server. #### Email address and password sign-in -If available, you can sign in using the combination of email address and password used to create your account. +When enabled by your System Administrator, you can sign in using the combination of email address and password used to create your account. If you have forgotten your password, you should be able to reset it from the "I forgot my password" option on the sign-in screen, or contact your System Administrator if you need help resetting your password. #### GitLab Single-Sign-On (SSO) option -If available, you can sign in using your GitLab account using a one-click sign-in option. GitLab SSO lets you create teams, create accounts on teams, and sign-in to teams using one username, email address, and password that works across everything on the server. +When enabled by your System Administrator, you can sign-in using your GitLab account using a one-click sign-in option. GitLab SSO lets you create teams, create accounts on teams, and sign-in to teams using one username, email address, and password that works across everything on the server. #### Switching Teams -You can switch among teams you've recently signed into using the main menu in any team site on the server. By default, devices remember which teams you have signed into for 30 days, and this duration is configurable by the System Administrator. +When you've used the same email address to sign-up and sign-in to multiple teams, you can switch among those teams using the main menu in any team site on the server. By default, devices remember which teams you have signed into for 30 days. + +#### System Adminstrator Role + +If your account in a given team has been given the System Administrator role, it has access to the System Console. The System Administrator role does not apply to accounts created in other teams using the same email address, since user accounts are unique to teams. #### Logging Out -You can log out from the main menu, which is accessed by clicking the three dots in the top header on the left side of the screen. Clicking "Logout" logs you out of all the teams you are signed into on the site. +You can log out from the main menu, which is accessed by clicking the three dots in the top header on the left side of the screen. Clicking "Logout" logs you out of all the teams you are signed-in to that share the same email address. diff --git a/doc/install/Configuration-Settings.md b/doc/install/Configuration-Settings.md index 66fda15e0..46a6defdf 100644 --- a/doc/install/Configuration-Settings.md +++ b/doc/install/Configuration-Settings.md @@ -141,9 +141,16 @@ Port of SMTP email server. ```"InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS"``` 32-character (to be randomly generated via Admin Console) salt added to signing of email invites. - ```"PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL"``` -32-character (to be randomly generated via Admin Console) salt added to signing of password reset emails. +32-character (to be randomly generated via Admin Console) salt added to signing of password reset emails. + +#### Push Notification Settings + +```"SendPushNotifications": true``` +"true": Your mattermsot server sends mobile push notifications to the server specified in **PushNotificationServer**; "false": Mobile push notifications are disabled. + +```"PushNotificationServer": "https://push.mattermost.com"``` +Address of the proxy server that re-sends push notifications to their respective services like APNS (Apple Push Notification Services). ### File Settings @@ -291,17 +298,6 @@ System Console allows an IT Admin to update settings defined in `config.json`. H ```"EnableOAuthServiceProvider": false``` ”true”: Allow Mattermost to function as an OAuth provider, allowing 3rd party apps access to your user store for authentication. -### Push Notification Settings - -```"ApplePushServer": ""``` -Setting for features in development. - -```"ApplePushCertPublic": ""``` -Setting for features in development. - -```"ApplePushCertPrivate": ""``` -Setting for features in development. - ### File Settings ```"InitialFont": "luximbi.ttf"``` diff --git a/doc/install/Upgrade-Guide.md b/doc/install/Upgrade-Guide.md index e01bdb9a0..edcc754f8 100644 --- a/doc/install/Upgrade-Guide.md +++ b/doc/install/Upgrade-Guide.md @@ -15,7 +15,7 @@ If you're upgrading across multiple major releases, from 1.0.x to 1.2.x for exam 3. Review Release Notes 1. Check the release notes for the version of Mattermost you are able to install, and note any setting changes in the **Compatibility** section that apply to your deployment (Release notes across versions are available from the [CHANGELOG](https://github.com/mattermost/platform/blob/master/CHANGELOG.md)). 4. Download the `mattermost.tar.gz` file with the correct version for your upgrade - 1. You can use `wget` to retrieve a specific version. For example, to download v1.1.0 run `wget https://github.com/mattermost/platform/releases/download/v1.1.0/mattermost.tar.gz` + 1. You can use `wget` to retrieve a specific version. For example, to download v1.1.0 run `wget https://github.com/mattermost/platform/releases/download/v1.x.x/mattermost.tar.gz` 2. Stop the Mattermost Server 1. As best practice, consider posting to the Town Square channel of active teams pre-announcing the scheduled downtime to apply these upgrade procedures 2. To stop the server run `sudo stop mattermost` diff --git a/doc/process/overview.md b/doc/process/overview.md index a1201a8d6..8a4c0459d 100644 --- a/doc/process/overview.md +++ b/doc/process/overview.md @@ -1,6 +1,6 @@ # Development Process Overview -This document describes the process through which feedback and design discussions flow into community systems, then into tickets, then into merge requests, then into monthly releases based on the purpose of the product. +This document describes the process through which feedback and design discussions flow into community systems, then into tickets, then into pull requests, then into monthly releases based on the purpose of the product. ## Purpose @@ -44,7 +44,7 @@ Please consider using more mainstream processes for [filing feature ideas to be ### GitHub Pull Requests -A system for submitting merge requests for changes to Mattermost. See [Merge Requests](https://github.com/mattermost/platform/blob/master/doc/process/overview.md#merge-requests) section below. +A system for submitting pull requests for changes to Mattermost. See [Pull Requests](https://github.com/mattermost/platform/blob/master/doc/process/overview.md#merge-requests) section below. ### General Forum @@ -80,7 +80,7 @@ Release planning sets the "Fix Version" of tickets to one of the upcoming monthl Tickets to be completed in the upcoming two weeks are organized on Tuesdays, with input from developers, and finalized on Fridays. -## Merge Requests +## Pull Requests ### Core Team Weekly Rhythm @@ -92,7 +92,7 @@ Key contributors might also pick up tickets, or through conversations with the c ### Community Contributions -Community members following the Contribution Guidelines might also submit pull requests. +Community members following the [Contribution Guidelines](https://github.com/mattermost/platform/blob/master/CONTRIBUTING.md) might also submit pull requests. Pull requests should not disable existing functionality without a Jira ticket, which are opened [via the feature ideas process](http://www.mattermost.org/feature-requests/). #### Bug Fixes |