summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Brahmer <info@b-brahmer.de>2020-08-28 13:04:33 +0200
committerBenjamin Brahmer <info@b-brahmer.de>2020-08-30 17:00:04 +0200
commit2511867814cf1d82e3ce98c1a86fb5be431713a7 (patch)
treeb60028c7f000e3c3dc526fc55a0bbe812e57a2a1
parentdd266ed05f46ef35ccc5393a42c73b94334fe461 (diff)
Release 14.2.014.2.0
Changed - JS library updates #737 #741 - Allow data URI scheme inside the body of an item #733 - Update to new BackgroudJob logic #704 - Update feed-io to v4.7.8 Fixed - fixed double escaped intro (not rendering html) #694 - translation updates and fixes Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
-rw-r--r--AUTHORS.md2
-rw-r--r--CHANGELOG.md12
-rw-r--r--composer.lock10
3 files changed, 18 insertions, 6 deletions
diff --git a/AUTHORS.md b/AUTHORS.md
index 7538b7e9a..d1256cf30 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -9,8 +9,8 @@
* [Jan-Christoph Borchardt](mailto:hey@jancborchardt.net)
* [Daniel Schaal](mailto:daniel@schaal.email)
* [Davide Saurino](mailto:davide.saurino@alcacoop.it)
-* [raghunayyar](mailto:me@iraghu.com)
* [Sean Molenaar](mailto:sean@seanmolenaar.eu)
+* [raghunayyar](mailto:me@iraghu.com)
* [bastei](mailto:bastei@users.noreply.github.com)
* [Bernhard Posselt](mailto:bep@foryouandyourcustomers.com)
* [Thomas Müller](mailto:thomas.mueller@tmit.eu)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f8b7b648..06516a994 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file.
## Unreleased
+## 14.2.0
+
+### Changed
+- JS library updates #737 #741
+- Allow data URI scheme inside the body of an item #733
+- Update to new BackgroudJob logic #704
+- Update feed-io to v4.7.8
+
+### Fixed
+- fixed double escaped intro (not rendering html) #694
+- translation updates and fixes
+
## 14.1.11
### Changed
diff --git a/composer.lock b/composer.lock
index d417450dd..d615c90ab 100644
--- a/composer.lock
+++ b/composer.lock
@@ -823,16 +823,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "0.12.38",
+ "version": "0.12.40",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "ad606c5f1c641b465b739e79a3a0f1a5a57cf1b4"
+ "reference": "dce7293ad7b59fc09a9ab9b0b5b44902c092ca17"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ad606c5f1c641b465b739e79a3a0f1a5a57cf1b4",
- "reference": "ad606c5f1c641b465b739e79a3a0f1a5a57cf1b4",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dce7293ad7b59fc09a9ab9b0b5b44902c092ca17",
+ "reference": "dce7293ad7b59fc09a9ab9b0b5b44902c092ca17",
"shasum": ""
},
"require": {
@@ -875,7 +875,7 @@
"type": "tidelift"
}
],
- "time": "2020-08-19T08:13:30+00:00"
+ "time": "2020-08-26T19:06:20+00:00"
},
{
"name": "phpunit/php-code-coverage",