From 9423b6abf25683d4d8c92d8299289503a5910acb Mon Sep 17 00:00:00 2001 From: John Bickar Date: Wed, 5 Sep 2018 10:05:24 -0700 Subject: [PATCH 1/2] 7.x-2.6 --- CHANGELOG.txt | 4 ++++ README.md | 2 +- stanford_wysiwyg.info | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 6148fe8..af2b7e8 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,10 @@ Stanford WYSIWYG x.x-x.x xxxx-xx-xx ----------------------------------- +Stanford WYSIWYG 7.x-2.6 2018-09-05 +----------------------------------- +- Re-exported Feature to be compatible with wysiwyg >= 7.x-2.5 + Stanford WYSIWYG 7.x-2.5 2018-06-27 ----------------------------------- - Added codeclimate.yml diff --git a/README.md b/README.md index 8002284..93d5f99 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # [Stanford WYSIWYG](https://github.com/SU-SWS/stanford_wysiwyg) -##### Version: 7.x-2.6-dev +##### Version: 7.x-2.6 Maintainers: [jbickar](https://github.com/jbickar), [sherakama](https://github.com/sherakama) [Changelog.txt](CHANGELOG.txt) diff --git a/stanford_wysiwyg.info b/stanford_wysiwyg.info index 5203599..6fe15ec 100644 --- a/stanford_wysiwyg.info +++ b/stanford_wysiwyg.info @@ -2,7 +2,7 @@ name = Stanford WYSIWYG description = Baseline WYSIWYG Feature core = 7.x package = Stanford -version = 7.x-2.6-dev +version = 7.x-2.6 project = stanford_wysiwyg dependencies[] = better_formats dependencies[] = features From c247faee815b9c941c58c01b975dc421aa02e95e Mon Sep 17 00:00:00 2001 From: Sherakama Date: Wed, 5 Sep 2018 13:38:01 -0700 Subject: [PATCH 2/2] Update CHANGELOG.txt --- CHANGELOG.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index af2b7e8..b14d7da 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,6 +4,8 @@ Stanford WYSIWYG x.x-x.x xxxx-xx-xx Stanford WYSIWYG 7.x-2.6 2018-09-05 ----------------------------------- - Re-exported Feature to be compatible with wysiwyg >= 7.x-2.5 +- Added wysiwyg dependency to composer.json at version ~2.5 +- Updated .info file depedency constraint to 2.5 Stanford WYSIWYG 7.x-2.5 2018-06-27 -----------------------------------