summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Brahmer <info@b-brahmer.de>2020-12-17 12:59:04 +0100
committerBenjamin Brahmer <info@b-brahmer.de>2020-12-23 15:56:22 +0100
commitd542cf5376ca5869d19aa45849428354596d74d2 (patch)
tree2bc0c97bc867ed6a0c90a4fa9a41e5b8a62f5938
parent2b6ddf4c9338cbd9a226927cf1e00d8ac4373cca (diff)
Release 15.1.1-rc215.1.1-rc2
Changed - add background & hover for entries for compact mode Fixed - Handle unauthorized users #985 - Call to undefined method OCA\News\Db\FeedMapperV2::find() #981 Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
-rw-r--r--AUTHORS.md1
-rw-r--r--CHANGELOG.md10
-rw-r--r--appinfo/info.xml2
-rw-r--r--composer.lock14
4 files changed, 16 insertions, 11 deletions
diff --git a/AUTHORS.md b/AUTHORS.md
index 171f443cf..d81d5e579 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -35,6 +35,7 @@
* [darkside40](mailto:darkside401@googlemail.com)
* [nachoparker](mailto:nacho@ownyourbits.com)
* [Brice Maron](mailto:brice@bmaron.net)
+* [Christoph Stenglein](mailto:christoph@christophstenglein.com)
* [Daniel Kesselberg](mailto:mail@danielkesselberg.de)
* [Jakob Sack](mailto:mail@jakobsack.de)
* [Qingping Hou](mailto:dave2008713@gmail.com)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index acbfef692..5bcd99f01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,15 @@
All notable changes to this project will be documented in this file.
## Unreleased
-- add background & hover for entries
+
+## 15.1.1-rc2
+
+### Changed
+- add background & hover for entries for compact mode
### Fixed
-- Fix #985
-- Fix #981
+- Handle unauthorized users #985
+- Call to undefined method OCA\News\Db\FeedMapperV2::find() #981
## 15.1.1-rc1
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 5d19ea2bb..7362e93fe 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -8,7 +8,7 @@
Before you update to a new version, [check the changelog](https://github.com/nextcloud/news/blob/master/CHANGELOG.md) to avoid surprises.
**Important**: To enable feed updates you will need to enable either [Nextcloud system cron](https://docs.nextcloud.org/server/latest/admin_manual/configuration_server/background_jobs_configuration.html#cron) or use [an updater](https://github.com/nextcloud/news-updater) which uses the built in update API and disable cron updates. More information can be found [in the README](https://github.com/nextcloud/news).]]></description>
- <version>15.1.1-rc1</version>
+ <version>15.1.1-rc2</version>
<licence>agpl</licence>
<author>Benjamin Brahmer</author>
<author>Sean Molenaar</author>
diff --git a/composer.lock b/composer.lock
index 924f443d3..f1e50de55 100644
--- a/composer.lock
+++ b/composer.lock
@@ -875,16 +875,16 @@
},
{
"name": "phpspec/prophecy",
- "version": "1.12.1",
+ "version": "1.12.2",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "8ce87516be71aae9b956f81906aaf0338e0d8a2d"
+ "reference": "245710e971a030f42e08f4912863805570f23d39"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/8ce87516be71aae9b956f81906aaf0338e0d8a2d",
- "reference": "8ce87516be71aae9b956f81906aaf0338e0d8a2d",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/245710e971a030f42e08f4912863805570f23d39",
+ "reference": "245710e971a030f42e08f4912863805570f23d39",
"shasum": ""
},
"require": {
@@ -896,7 +896,7 @@
},
"require-dev": {
"phpspec/phpspec": "^6.0",
- "phpunit/phpunit": "^8.0 || ^9.0 <9.3"
+ "phpunit/phpunit": "^8.0 || ^9.0"
},
"type": "library",
"extra": {
@@ -936,9 +936,9 @@
],
"support": {
"issues": "https://github.com/phpspec/prophecy/issues",
- "source": "https://github.com/phpspec/prophecy/tree/1.12.1"
+ "source": "https://github.com/phpspec/prophecy/tree/1.12.2"
},
- "time": "2020-09-29T09:10:42+00:00"
+ "time": "2020-12-19T10:15:11+00:00"
},
{
"name": "phpstan/phpstan",