PLT-3080 Added ability to disable formatting for debugging and updated marked to fix errors (#3141)

* Removed injectIntl from user_settings_advanced.jsx

* Added setting to disable formatting for debugging

* Updated fork of marked
Этот коммит содержится в:
Harrison Healey
2016-05-30 07:57:44 -04:00
коммит произвёл Joram Wilander
родитель e1bebb2d77
Коммит fe5db12374
4 изменённых файлов: 171 добавлений и 65 удалений

Просмотреть файл

@@ -1226,9 +1226,9 @@
"upload_overlay.info": "Drop a file to upload it.",
"user.settings.advance.embed_preview": "Show preview snippet of links below message",
"user.settings.advance.embed_toggle": "Show toggle for all embed previews",
"user.settings.advance.enabled": "enabled",
"user.settings.advance.feature": " Feature ",
"user.settings.advance.features": " Features ",
"user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} Enabled",
"user.settings.advance.formattingTitle": "Enable Post Formatting",
"user.settings.advance.formattingDesc": "If enabled, posts will be formatted to create links, show emoji, style the text, and add line breaks. By default, this setting is enabled. Changing this setting requires the page to be refreshed.",
"user.settings.advance.markdown_preview": "Show markdown preview option in message input box",
"user.settings.advance.off": "Off",
"user.settings.advance.on": "On",