github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-25 00:32:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Don't convert :) into Emoji when emojis or emoji shurtcuts are disabled

Browse Source
This commit is contained in:
Gerhard Schlager
2019-05-21 16:56:51 +02:00
parent e8799f0ba4
commit e224100023
8 changed files with 146 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/javascripts/helpers/site-settings.js
View File

@ -91,6 +91,7 @@ Discourse.SiteSettingsOriginal = {
highlighted_languages:
"apache|bash|cs|cpp|css|coffeescript|diff|xml|http|ini|json|java|javascript|makefile|markdown|nginx|objectivec|ruby|perl|php|python|sql|handlebars",
enable_emoji: true,
enable_emoji_shortcuts: true,
emoji_set: "emoji_one",
desktop_category_page_style: "categories_and_latest_topics",
enable_mentions: true,