Skip to content
Snippets Groups Projects
Commit 1da24cca authored by Kevin Paxman's avatar Kevin Paxman
Browse files

Merge branch 'feature/ISTWCMS-6110-kpaxman-add_mark_support' into '1.1.x'

Feature/istwcms 6110 kpaxman add mark support

See merge request !308
parents cf2c637c 1a7058ad
No related branches found
No related tags found
1 merge request!308Feature/istwcms 6110 kpaxman add mark support
......@@ -79,13 +79,13 @@ settings:
- CodeMirror
- TextSelection
plugins:
language:
language_list: un
drupallink:
linkit_enabled: true
linkit_profile: default
language:
language_list: un
stylescombo:
styles: "p.highlight|Highlight\r\np.caption|Caption\r\nins|Inserted text\r\ndel|Deleted text\r\ncode|Inline code\r\nkbd|Key input\r\nsamp|Sample output\r\nvar|Variable\r\naddress|Address\r\n"
styles: "p.highlight|Highlight\r\np.caption|Caption\r\nins|Inserted text\r\ndel|Deleted text\r\ncode|Inline code\r\nkbd|Key input\r\nsamp|Sample output\r\nvar|Variable\r\naddress|Address\r\nmark|Highlight mark"
image_upload:
status: false
scheme: public
......
......@@ -87,7 +87,7 @@ settings:
linkit_enabled: true
linkit_profile: default
stylescombo:
styles: "p.highlight|Highlight\r\np.caption|Caption\r\nins|Inserted text\r\ndel|Deleted text\r\ncode|Inline code\r\nkbd|Key input\r\nsamp|Sample output\r\nvar|Variable\r\naddress|Address\r\n"
styles: "p.highlight|Highlight\r\np.caption|Caption\r\nins|Inserted text\r\ndel|Deleted text\r\ncode|Inline code\r\nkbd|Key input\r\nsamp|Sample output\r\nvar|Variable\r\naddress|Address\r\nmark|Highlight mark"
image_upload:
status: true
scheme: public
......
......@@ -21,7 +21,7 @@ filters:
status: true
weight: -46
settings:
allowed_html: '<a class data-entity-substitution data-entity-type data-entity-uuid download href hreflang id name rel rev> <abbr title> <acronym title> <address> <b> <blockquote> <br> <caption> <cite> <code> <col span width> <colgroup span width> <dd> <del> <dfn> <div class id> <dl> <dt> <em> <h2 class id> <h3 class id> <h4 class id> <h5 class id> <h6 class id> <hr> <i> <img alt height longdesc src width> <ins> <kbd> <li value> <ol class start> <p class> <pre> <s> <samp> <span class> <strike> <strong> <sub> <sup> <table class id width> <tbody> <td abbr axis colspan headers rowspan scope width> <tfoot> <th abbr axis colspan headers rowspan scope width> <thead> <tr> <ul class> <var>'
allowed_html: '<a class data-entity-substitution data-entity-type data-entity-uuid download href hreflang id name rel rev> <abbr title> <acronym title> <address> <b> <blockquote> <br> <caption> <cite> <code> <col span width> <colgroup span width> <dd> <del> <dfn> <div class id> <dl> <dt> <em> <h2 class id> <h3 class id> <h4 class id> <h5 class id> <h6 class id> <hr> <i> <img alt height longdesc src width> <ins> <kbd> <li value> <mark> <ol class start> <p class> <pre> <s> <samp> <span class> <strike> <strong> <sub> <sup> <table class id width> <tbody> <td abbr axis colspan headers rowspan scope width> <tfoot> <th abbr axis colspan headers rowspan scope width> <thead> <tr> <ul class> <var>'
filter_html_help: true
filter_html_nofollow: false
editor_file_reference:
......
......@@ -23,7 +23,7 @@ filters:
status: false
weight: -47
settings:
allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <u> <s> <sup> <sub> <img src alt data-entity-type data-entity-uuid> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <p> <h1> <pre> <hr> <span lang dir> <drupal-media data-entity-type data-entity-uuid data-view-mode data-align data-caption alt title>'
allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol type start> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <u> <s> <sup> <sub> <img src alt data-entity-type data-entity-uuid> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <h1> <pre> <hr> <drupal-media data-entity-type data-entity-uuid data-view-mode data-align data-caption alt title> <span dir lang class="math-tex"> <p class="highlight caption"> <ins> <del> <kbd> <samp> <var> <address> <mark>'
filter_html_help: true
filter_html_nofollow: false
media_embed:
......
......@@ -17,7 +17,7 @@ filters:
status: true
weight: -48
settings:
allowed_html: '<a class data-entity-substitution data-entity-type data-entity-uuid download href hreflang id name rel rev> <abbr title> <acronym title> <address> <b> <blockquote> <br> <caption> <cite> <code> <col span width> <colgroup span width> <dd> <del> <dfn> <div class id> <dl> <drupal-media alt data-align data-caption data-entity-type data-entity-uuid data-height data-view-mode data-width title> <dt> <em> <footer> <h2 class id> <h3 class id> <h4 class id> <h5 class id> <h6 class id> <hr> <i> <img alt height longdesc src width> <ins> <kbd> <li value> <ol class start> <p class> <pre> <s> <samp> <span class> <strike> <strong> <sub> <sup> <table class id width> <tbody> <td abbr axis colspan headers rowspan scope width> <tfoot> <th abbr axis colspan headers rowspan scope width> <thead> <tr> <ul class> <var>'
allowed_html: '<a data-entity-substitution data-entity-type data-entity-uuid download href hreflang id name rel rev class> <abbr title> <acronym title> <address> <b> <blockquote> <br> <caption> <cite> <code> <col width span> <colgroup width span> <dd> <del> <dfn> <div id class> <dl> <drupal-media alt data-align data-caption data-entity-type data-entity-uuid data-height data-view-mode data-width title> <dt> <em> <footer> <h2 id class> <h3 id class> <h4 id class> <h5 id class> <h6 id class> <hr> <i> <img alt longdesc src width height> <ins> <kbd> <li value> <mark> <ol start class> <p class> <pre> <s> <samp> <span class> <strike> <strong> <sub> <sup> <table id width class> <tbody> <td abbr axis colspan headers rowspan scope width> <tfoot> <th abbr axis colspan headers rowspan scope width> <thead> <tr> <ul class> <var>'
filter_html_help: true
filter_html_nofollow: false
filter_htmlcorrector:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment