diff --git a/CHANGELOG.md b/CHANGELOG.md index 3adf226..e057c9c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ Stanford Text Editor +8.x-1.8 +-------------------------------------------------------------------------------- +_Release Date: 2020-09-09_ + +- D8CORE-2499 Updated composer license (#38) (d1ad34f) +- DEVGUIDE-000 Added html pre tag to allowed html tags. (#37) (5a807e5) + 8.x-1.7 -------------------------------------------------------------------------------- _Release Date: 2020-07-13_ diff --git a/composer.json b/composer.json index d37f953..9f11a8c 100755 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "su-sws/stanford_text_editor", "description": "Input format and WYSIWYG settings for Drupal.", "type": "drupal-custom-module", - "license": "GPL-2.0+", + "license": "GPL-2.0-or-later", "minimum-stability": "dev", "repositories": [ { @@ -78,7 +78,7 @@ "drupal/editor_advanced_link": "^1.4", "drupal/embed": "~1.0", "drupal/linkit": "~5.0@beta", - "su-sws/stanford_media": "^8.2.1" + "su-sws/stanford_media": "dev-8.x-2.x" }, "extra": { "patches": { diff --git a/config/install/filter.format.stanford_html.yml b/config/install/filter.format.stanford_html.yml index fb82613..9ef2acc 100644 --- a/config/install/filter.format.stanford_html.yml +++ b/config/install/filter.format.stanford_html.yml @@ -49,7 +49,7 @@ filters: status: true weight: -50 settings: - allowed_html: '