Merge remote-tracking branch 'origin/master' into css-tweak-tablet-sc…

…reen * origin/master: (32 commits) prevent menu actions from collapsing sidebar (nextcloud#504) add "mark read" floating button mobile. Fixes nextcloud#469 (nextcloud#505) [tx-robot] updated from transifex [tx-robot] updated from transifex update js dependencies (nextcloud#500) [tx-robot] updated from transifex removed warning about non utf8mb4 charset for mysql/mariadb - nextcloud#496 (nextcloud#497) [tx-robot] updated from transifex [tx-robot] updated from transifex Update feed-io: adds UT timezone (nextcloud#495) [tx-robot] updated from transifex [tx-robot] updated from transifex Release 13.1.6 (nextcloud#490) Use nextclouds temp dir (nextcloud#493) [tx-robot] updated from transifex [tx-robot] updated from transifex UI: Make BasicAuth Credentials less important in subscribtion form Set tmp dir as cache for favicon embed codecov status remove coverage from integration run, upload to codecov ... Signed-off-by: nachoparker <nacho@ownyourbits.com>
nachoparker · May 11, 2019 · e2bda14 · e2bda14
2 parents 167622b + a363aab
commit e2bda14
Show file tree

Hide file tree

Showing 166 changed files with 2,460 additions and 1,901 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,50 @@
+---
+name: Bug report
+about: Create a report to help us fix an issue you are having
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+# IMPORTANT
+
+Read and tick the following checkbox after you have created the issue or place an x inside the brackets ;)
+
+* [ ] I have read the [CONTRIBUTING.md](https://github.com/nextcloud/news/blob/master/CONTRIBUTING.md) and followed the provided tips
+
+
+## Explain the Problem
+What problem did you encounter?
+
+## Steps to Reproduce
+Explain what you did to encounter the issue
+1.
+2.
+3.
+
+## System Information
+* News app version:
+* Nextcloud version:
+* Cron type: 
+* PHP version:
+* Database and version:
+* Browser and version:
+* Distribution and version:
+
+## Contents of nextcloud/data/nextcloud.log
+
+```json
+
+Paste output here
+
+```
+
+## Contents of Browser Error Console
+Read http://ggnome.com/wiki/Using_The_Browser_Error_Console if you are unsure what to put here
+
+```
+
+Paste output here
+
+```
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+Read and tick the following checkbox after you have created the issue or place an x inside the brackets ;)
+
+* [ ] I have read the [CONTRIBUTING.md](https://github.com/nextcloud/news/blob/master/CONTRIBUTING.md) and followed the provided tips
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.travis.yml b/.travis.yml
@@ -58,6 +58,9 @@ script:
 after_failure:
     - cat ../../data/nextcloud.log
 
+after_success:
+    - bash <(curl -s https://codecov.io/bash)
+
 addons:
     firefox: "latest-beta"
     postgresql: "9.6"

diff --git a/AUTHORS.md b/AUTHORS.md
@@ -4,15 +4,15 @@
 * [Robin Appelman](mailto:icewind@owncloud.com)
 * [Gregor Tätzner](mailto:gregor@freenet.de)
 * [Morris Jobke](mailto:hey@morrisjobke.de)
-* [Jan-Christoph Borchardt](mailto:hey@jancborchardt.net)
+* [Benjamin Brahmer](mailto:info@b-brahmer.de)
 * [Sean Molenaar](mailto:SMillerDev@users.noreply.github.com)
+* [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)
-* [Benjamin Brahmer](mailto:info@b-brahmer.de)
+* [Sean Molenaar](mailto:sean@seanmolenaar.eu)
 * [bastei](mailto:bastei@users.noreply.github.com)
 * [Bernhard Posselt](mailto:bep@foryouandyourcustomers.com)
-* [Sean Molenaar](mailto:sean@seanmolenaar.eu)
 * [Thomas Müller](mailto:thomas.mueller@tmit.eu)
 * [Hoàng Đức Hiếu](mailto:hdhoang@zahe.me)
 * [Daniel Opitz](mailto:git@copynpaste.de)
@@ -56,6 +56,7 @@
 * [Allan Nordhøy](mailto:epost@anotheragency.no)
 * [Alwaysin](mailto:adrien@demma.fr)
 * [Andrea Boero](mailto:mail@tsumi.it)
+* [Andreas Demmelbauer](mailto:git@notice.at)
 * [Arthur Schiwon](mailto:blizzz@arthur-schiwon.de)
 * [Benedikt Geißler](mailto:benedikt@g5r.eu)
 * [Bernhard Posselt](mailto:bernhard@desktop.localdomain)
@@ -84,6 +85,7 @@
 * [Piotr Dobrowolski](mailto:admin@tastycode.pl)
 * [Raspbeguy](mailto:raspbeguy@users.noreply.github.com)
 * [Roeland Jago Douma](mailto:roeland@famdouma.nl)
+* [Simon](mailto:sschubert89@gmail.com)
 * [Simon Gilliot](mailto:simon@gilliot.fr)
 * [TexasGamer](mailto:tpgaubert@gmail.com)
 * [The Gitter Badger](mailto:badger@gitter.im)
@@ -104,6 +106,7 @@
 * [joeplus](mailto:joerg@honululu.Speedport_W_723V_1_32_000)
 * [kondou](mailto:kondou@ts.unde.re)
 * [markusj](mailto:markusj@users.noreply.github.com)
+* [nachoparker](mailto:nacho@ownyourbits.com)
 * [nexus-uw](mailto:you@example.com)
 * [repat](mailto:repat@repat.de)
 * [ritchiewilson](mailto:rawilson52@gmail.com)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,25 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 13.1.6
+
+### Changed
+- Replaced "Advanced settings" for feed credentials by a checkbox #488
+
+### Fixed
+- Fixed signature error caused by favicon cache #485
+
+## 13.1.5
+
+### Changed
+- Added new android (and iOS) client 'newsout' to list #475
+- News requires php 7.0 please update to 7.1+ if possible #476
+
+### Fixed
+- Fixed some feeds with a empty body #474
+- Restored full text by default for some feeds #479
+- Some smaller adjustments for the design #463 #464 
+
 ## 13.1.4
 
 ### Fixed

diff --git a/Makefile b/Makefile
@@ -190,6 +190,6 @@ test:
 	cd js && $(npm) run test
 	./vendor/phpunit/phpunit/phpunit -c phpunit.xml --coverage-clover build/php-unit.clover
 	# \Test\TestCase is only allowed to access the db if TRAVIS environment variable is set
-	env TRAVIS=1 ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml --coverage-clover build/php-unit.clover
+	env TRAVIS=1 ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
 	$(MAKE) phpcs
 	./bin/tools/generate_authors.php
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 **We need help with the frontend, check the issue tracker if you are interessted!**
 
-[![Build Status](https://travis-ci.org/nextcloud/news.svg?branch=master)](https://travis-ci.org/nextcloud/news) [![irc](https://img.shields.io/badge/irc%20channel-%23nextcloud--news%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-news)
+[![Build Status](https://travis-ci.org/nextcloud/news.svg?branch=master)](https://travis-ci.org/nextcloud/news) [![Code coverage](https://img.shields.io/codecov/c/github/nextcloud/news.svg?style=flat-square)](https://codecov.io/gh/nextcloud/news/) [![irc](https://img.shields.io/badge/irc%20channel-%23nextcloud--news%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-news)
 
 The News app is an RSS/Atom feed aggregator. It offers a [RESTful API](https://github.com/nextcloud/news/tree/master/docs/externalapi) for app developers. The source code is [available on GitHub](https://github.com/nextcloud/news)
 
@@ -29,8 +29,9 @@ Please read the [appropriate section in the contributing notices](https://github
 ## Sync Clients
 Nextcloud News can be synced with the following apps:
   * [RSS Guard (Windows, Linux, OS/2, Mac OS)](https://github.com/martinrotter/rssguard), [open source](https://github.com/martinrotter/rssguard)
-  * [ownCloud News Reader (Android)](https://play.google.com/store/apps/details?id=de.luhmer.owncloudnewsreader), [open source](https://github.com/owncloud/news-android-app)
+  * [Nextcloud News Reader (Android)](https://play.google.com/store/apps/details?id=de.luhmer.owncloudnewsreader), [open source](https://github.com/nextcloud/news-android-app)
   * [OCReader (Android)](https://f-droid.org/repository/browse/?fdid=email.schaal.ocreader), [open source](https://github.com/schaal/ocreader)
+  * [Newsout (Android)](https://play.google.com/store/apps/details?id=com.inspiredandroid.newsout), [open source](https://github.com/SimonSchubert/NewsOut)
   * [CloudNews (iOS)](https://itunes.apple.com/app/cloudnews-owncloud-news-reader/id683859706), [open source](https://github.com/owncloud/news-ios-app)
   * [News Checker (Chrome extension)](https://chrome.google.com/webstore/detail/owncloud-news-checker/hnmagnmdnfdhabdlicankfbfhcdgbfhe)
   * [own News (BlackBerry)](http://appworld.blackberry.com/webstore/content/32767887/)

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -8,11 +8,13 @@
 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>13.1.4</version>
+    <version>13.1.6</version>
     <licence>agpl</licence>
-    <author>Bernhard Posselt</author>
-    <author>Alessandro Cosentino</author>
-    <author>Jan-Christoph Borchardt</author>
+    <author>Benjamin Brahmer</author>
+    <author>Sean Molenaar</author>
+    <author>Bernhard Posselt (former)</author>
+    <author>Alessandro Cosentino (former)</author>
+    <author>Jan-Christoph Borchardt (former)</author>
     <namespace>News</namespace>
     <documentation>
         <admin>https://github.com/nextcloud/news#readme</admin>
@@ -26,7 +28,7 @@ Before you update to a new version, [check the changelog](https://github.com/nex
     <screenshot small-thumbnail="https://github.com/raw/nextcloud/news/master/screenshots/2-small.png">https://github.com/raw/nextcloud/news/master/screenshots/2.png</screenshot>
     <screenshot small-thumbnail="https://github.com/raw/nextcloud/news/master/screenshots/3-small.png">https://github.com/raw/nextcloud/news/master/screenshots/3.png</screenshot>
     <dependencies>
-        <php min-version="5.6"/>
+        <php min-version="7.0"/>
         <database min-version="9.4">pgsql</database>
         <database>sqlite</database>
         <database min-version="5.5">mysql</database>

diff --git a/composer.json b/composer.json
@@ -41,14 +41,14 @@
     "riimu/kit-pathjoin": "1.2.0",
     "debril/feed-io": "^3.1",
     "arthurhoaro/favicon": "^1.2",
-    "guzzlehttp/guzzle": "^6.3",
     "ext-json": "*",
     "ext-simplexml": "*",
     "ext-libxml": "*"
   },
   "require-dev": {
     "phpunit/phpunit": "^6.5",
-    "squizlabs/php_codesniffer": "^3.3"
+    "squizlabs/php_codesniffer": "^3.3",
+    "guzzlehttp/guzzle": "^6.3"
   },
   "replace": {
     "guzzlehttp/guzzle": "*"