From faa0074c92a074cb69ec67dec37581adbb519dff Mon Sep 17 00:00:00 2001 From: lfbrock Date: Mon, 14 Dec 2015 15:52:23 -0500 Subject: [PATCH 1/3] Update syntax-highlighting.md --- doc/developer/tests/test-syntax-highlighting.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/developer/tests/test-syntax-highlighting.md b/doc/developer/tests/test-syntax-highlighting.md index 7f8f4cdaa8..b1568c385f 100644 --- a/doc/developer/tests/test-syntax-highlighting.md +++ b/doc/developer/tests/test-syntax-highlighting.md @@ -133,7 +133,7 @@ echo "Hello World" ### CoffeeScript -``` coffee +``` coffeescript console.log(“Hello world!”); ``` From 61716d434c2ab7fc263ddb41ba323ef285e8510a Mon Sep 17 00:00:00 2001 From: lfbrock Date: Mon, 14 Dec 2015 15:55:00 -0500 Subject: [PATCH 2/3] Update Markdown.md --- doc/help/Markdown.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/help/Markdown.md b/doc/help/Markdown.md index 64ce4fc836..d185a41607 100644 --- a/doc/help/Markdown.md +++ b/doc/help/Markdown.md @@ -31,7 +31,7 @@ code block To add syntax highlighting, type the language to be highlighted after the ``` at the beginning of the code block. Supported languages are: -`diff, apache, makefile, http, json, markdown, javascript, css, nginx, objectivec, python, xml, perl, bash, php, coffee (CoffeeScript), cs (C#), cpp (C++), sql, go, ruby, java, ini, latex` +`diff, apache, makefile, http, json, markdown, javascript, css, nginx, objectivec, python, xml, perl, bash, php, coffeescript, cs (C#), cpp (C++), sql, go, ruby, java, ini, latex` Example: From cdeddd344f174b36348941d7f3bcc1987b8ebca5 Mon Sep 17 00:00:00 2001 From: lfbrock Date: Mon, 14 Dec 2015 15:56:19 -0500 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9dad17985..9b50b7fc14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -124,7 +124,7 @@ To limit the impact of this security issue, Mattermost v1.2.0 has been removed f #### Syntax Highlighting -- Syntax highlight for code blocks now available for `Diff, Apache, Makefile, HTTP, JSON, Markdown, JavaScript, CSS, nginx, ObjectiveC, Python, XML, Perl, Bash, PHP, Coffee, C, SQL, Go, Ruby, Java, and ini` +- Syntax highlight for code blocks now available for `Diff, Apache, Makefile, HTTP, JSON, Markdown, JavaScript, CSS, nginx, ObjectiveC, Python, XML, Perl, Bash, PHP, CoffeeScript, C, SQL, Go, Ruby, Java, and ini` #### Usability Improvements @@ -161,7 +161,7 @@ User Interface - Member list in Channel display now scrollable, and includes Message button to message channel members directly - Added ability to edit previous message by hitting UP arrow - Syntax highlighting added for code blocks - - Languages include `Diff, Apache, Makefile, HTTP, JSON, Markdown, Java, CSS, nginx, ObjectiveC, Python, XML, Perl, Bash, PHP, Coffee, C, SQL, Go, Ruby, Java, and ini`. + - Languages include `Diff, Apache, Makefile, HTTP, JSON, Markdown, Java, CSS, nginx, ObjectiveC, Python, XML, Perl, Bash, PHP, CoffeeScript, C, SQL, Go, Ruby, Java, and ini`. - Use by adding the name of the language on the first link of the code block, for example: ```python - Syntax color theme can be defined under **Account Settings** > **Appearance Settings** > **Custom Theme** - Updated Drag & Drop UI