summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2016-01-31 10:49:43 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2016-01-31 10:49:43 +0100
commitcca9bb9fdcb34085e28d3127a3f1be7519b28927 (patch)
tree623f5bb8bdae29924736a7c30e32ac9b511ce60d
parentdf65935c2b05517660cc46c60e0d22e308b8d249 (diff)
bump version
-rw-r--r--CHANGELOG.md1
-rw-r--r--appinfo/info.xml2
-rw-r--r--explore/feeds/feeds.de.json18
3 files changed, 15 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34e8b5e29..ceed3b82c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
owncloud-news (7.1.1)
* **Enhancement**: Add vk.com to allowed iframe sources
+* **Enhancement**: Add blog.fefe.de to German explore feeds
owncloud-news (7.1.0)
* **Backwards incompatible change**: Change explore URL API to request a file instead of URL parameter
diff --git a/appinfo/info.xml b/appinfo/info.xml
index c35d096ec..98d426433 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -7,7 +7,7 @@
<author>Bernhard Posselt, Alessandro Cosentino, Jan-Christoph Borchardt</author>
<category>multimedia</category>
<licence>AGPL</licence>
- <version>7.1.0</version>
+ <version>7.1.1</version>
<namespace>News</namespace>
<!-- resources -->
diff --git a/explore/feeds/feeds.de.json b/explore/feeds/feeds.de.json
index e13cc793e..4a3759a17 100644
--- a/explore/feeds/feeds.de.json
+++ b/explore/feeds/feeds.de.json
@@ -38,11 +38,19 @@
"votes": 100
}],
"FOSS": [{
- "title": "heise open news",
- "favicon": "https:\/\/www.heise.de\/favicon.ico",
- "url": "http:\/\/www.heise.de\/open\/news\/",
- "feed": "http:\/\/heise.de.open.feedsportal.com\/c\/32509\/f\/480599\/index.rss",
- "description": "Nachrichten zu Open Source",
+ "title": "heise open news",
+ "favicon": "https:\/\/www.heise.de\/favicon.ico",
+ "url": "http:\/\/www.heise.de\/open\/news\/",
+ "feed": "http:\/\/heise.de.open.feedsportal.com\/c\/32509\/f\/480599\/index.rss",
+ "description": "Nachrichten zu Open Source",
+ "votes": 100
+ }],
+ "Blogs": [{
+ "title": "Fefes Blog",
+ "favicon": "http:\/\/blog.fefe.de\/favicon.ico",
+ "url": "http:\/\/blog.fefe.de\/",
+ "feed": "http:\/\/blog.fefe.de\/rss.xml?html",
+ "description": "Verschw\u00f6rungen und Obskures aus aller Welt",
"votes": 100
}
],