summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Brahmer <info@b-brahmer.de>2020-05-14 19:33:41 +0200
committerBenjamin Brahmer <info@b-brahmer.de>2020-05-22 11:06:10 +0200
commit04cf7d669c0f11135b214fc7cb1609bfc2c906e6 (patch)
treef429947e39b743da5faef9c3ba94ed96115f08db
parent1e1a6d83a380e26561fb5d0608cdbde2ba7abb69 (diff)
Release 14.1.814.1.8
Changed - Update feed-io to v4.7.0 - Update js dependencies Fixed - Do not create spurious links in item body (#699) Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
-rw-r--r--AUTHORS.md2
-rw-r--r--CHANGELOG.md9
-rw-r--r--composer.lock22
-rw-r--r--js/package-lock.json24
-rw-r--r--js/package.json4
5 files changed, 36 insertions, 25 deletions
diff --git a/AUTHORS.md b/AUTHORS.md
index 82cc5dce8..84512d9e1 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -80,6 +80,8 @@
* [Florian Hülsmann](mailto:fh@cbix.de)
* [Flurin Rindisbacher](mailto:flurischt@users.noreply.github.com)
* [Frank Karlitschek](mailto:frank@owncloud.org)
+* [Freddo](mailto:f.falk@protonmail.com)
+* [Freddo3000](mailto:f.falk@protonmail.com)
* [Hanzei](mailto:Hanzei@users.noreply.github.com)
* [Hendrik Leppelsack](mailto:hendrik@leppelsack.de)
* [Jasper Knockaert](mailto:jasper@knockaert.nl)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 851b04654..27ae01cc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file.
## Unreleased
+## 14.1.8
+
+### Changed
+- Update feed-io to v4.7.0
+- Update js dependencies
+
+### Fixed
+- Do not create spurious links in item body (#699)
+
## 14.1.7
### Changed
diff --git a/composer.lock b/composer.lock
index 1ca2fb7fd..9f861df53 100644
--- a/composer.lock
+++ b/composer.lock
@@ -111,16 +111,16 @@
},
{
"name": "debril/feed-io",
- "version": "v4.6.0",
+ "version": "v4.7.0",
"source": {
"type": "git",
"url": "https://github.com/alexdebril/feed-io.git",
- "reference": "3feaf0fd9350db77660a1b36f8c28c710265daa1"
+ "reference": "015527be60189b3a7bf384d297f92848c65c5c86"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/alexdebril/feed-io/zipball/3feaf0fd9350db77660a1b36f8c28c710265daa1",
- "reference": "3feaf0fd9350db77660a1b36f8c28c710265daa1",
+ "url": "https://api.github.com/repos/alexdebril/feed-io/zipball/015527be60189b3a7bf384d297f92848c65c5c86",
+ "reference": "015527be60189b3a7bf384d297f92848c65c5c86",
"shasum": ""
},
"require": {
@@ -173,7 +173,7 @@
"type": "github"
}
],
- "time": "2020-04-29T14:07:17+00:00"
+ "time": "2020-05-15T07:22:06+00:00"
},
{
"name": "ezyang/htmlpurifier",
@@ -1806,16 +1806,16 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.15.0",
+ "version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14"
+ "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
- "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
+ "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"shasum": ""
},
"require": {
@@ -1827,7 +1827,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.15-dev"
+ "dev-master": "1.17-dev"
}
},
"autoload": {
@@ -1874,7 +1874,7 @@
"type": "tidelift"
}
],
- "time": "2020-02-27T09:26:54+00:00"
+ "time": "2020-05-12T16:14:59+00:00"
},
{
"name": "symfony/service-contracts",
diff --git a/js/package-lock.json b/js/package-lock.json
index 54b4c5054..d1d2c559e 100644
--- a/js/package-lock.json
+++ b/js/package-lock.json
@@ -1446,9 +1446,9 @@
"dev": true
},
"entities": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
- "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.2.tgz",
+ "integrity": "sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==",
"dev": true
}
}
@@ -1743,9 +1743,9 @@
}
},
"eventemitter3": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
- "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==",
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
+ "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
"dev": true
},
"exit": {
@@ -3622,9 +3622,9 @@
"dev": true
},
"jshint": {
- "version": "2.11.0",
- "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.11.0.tgz",
- "integrity": "sha512-ooaD/hrBPhu35xXW4gn+o3SOuzht73gdBuffgJzrZBJZPGgGiiTvJEgTyxFvBO2nz0+X1G6etF8SzUODTlLY6Q==",
+ "version": "2.11.1",
+ "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.11.1.tgz",
+ "integrity": "sha512-WXWePB8ssAH3DlD05IoqolsY6arhbll/1+i2JkRPpihQAuiNaR/gSt8VKIcxpV5m6XChP0hCwESQUqpuQMA8Tg==",
"dev": true,
"requires": {
"cli": "~1.0.0",
@@ -3668,9 +3668,9 @@
"dev": true
},
"karma": {
- "version": "5.0.4",
- "resolved": "https://registry.npmjs.org/karma/-/karma-5.0.4.tgz",
- "integrity": "sha512-UGqTe2LBiGQBXRN+Fygeiq63tbfOX45639SKSbPkLpARwnxROWJZg+froGkpHxr84FXCe8UGCf+1PITM6frT5w==",
+ "version": "5.0.5",
+ "resolved": "https://registry.npmjs.org/karma/-/karma-5.0.5.tgz",
+ "integrity": "sha512-Q4Su7kNwkTgqS+KbSCYgH0p4a/0JIxVLyp7qKNV7vgPNhIF4kIoh0GlUfMKpw67BrR3hgPQSJoxgF7xnzUtPpg==",
"dev": true,
"requires": {
"body-parser": "^1.16.1",
diff --git a/js/package.json b/js/package.json
index ebcd5a81f..0673d984f 100644
--- a/js/package.json
+++ b/js/package.json
@@ -42,8 +42,8 @@
"gulp-terser": "^1.2.0",
"jasmine-core": "^3.5.0",
"jquery": "^3.5.0",
- "jshint": "^2.11.0",
- "karma": "^5.0.4",
+ "jshint": "^2.11.1",
+ "karma": "^5.0.5",
"karma-chrome-launcher": "^3.1.0",
"karma-coverage": "^2.0.2",
"karma-firefox-launcher": "^1.3.0",