summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/api-integration-tests.yml2
-rw-r--r--.github/workflows/api-php-static-code-check.yml2
-rw-r--r--.github/workflows/api-php-tests.yml2
-rw-r--r--.github/workflows/build-release.yml2
-rw-r--r--.github/workflows/changelog-enforcer.yml4
-rw-r--r--.github/workflows/documentation.yml4
-rw-r--r--.github/workflows/frontend-nodejs-tests.yml2
-rw-r--r--.github/workflows/post-merge-tasks.yml9
-rw-r--r--AUTHORS.md13
-rw-r--r--CHANGELOG.md48
-rw-r--r--CONTRIBUTING.md6
-rw-r--r--Makefile2
-rw-r--r--README.md2
-rw-r--r--appinfo/info.xml7
-rw-r--r--composer.json20
-rw-r--r--composer.lock357
-rw-r--r--css/navigation.css8
-rw-r--r--docs/clients.md1
-rw-r--r--img/add_folder.svg1
-rw-r--r--img/rss_unread.svg6
-rw-r--r--js/gui/KeyboardShortcuts.js2
-rw-r--r--js/package-lock.json429
-rw-r--r--js/package.json10
-rw-r--r--l10n/cs.js2
-rw-r--r--l10n/cs.json2
-rw-r--r--l10n/de.js4
-rw-r--r--l10n/de.json4
-rw-r--r--l10n/de_DE.js2
-rw-r--r--l10n/de_DE.json2
-rw-r--r--l10n/es.js2
-rw-r--r--l10n/es.json2
-rw-r--r--l10n/eu.js2
-rw-r--r--l10n/eu.json2
-rw-r--r--l10n/fi.js22
-rw-r--r--l10n/fi.json22
-rw-r--r--l10n/fr.js3
-rw-r--r--l10n/fr.json3
-rw-r--r--l10n/hr.js14
-rw-r--r--l10n/hr.json14
-rw-r--r--l10n/hu.js110
-rw-r--r--l10n/hu.json110
-rw-r--r--l10n/nl.js2
-rw-r--r--l10n/nl.json2
-rw-r--r--l10n/pl.js4
-rw-r--r--l10n/pl.json4
-rw-r--r--l10n/pt_BR.js4
-rw-r--r--l10n/pt_BR.json4
-rw-r--r--l10n/ro.js17
-rw-r--r--l10n/ro.json17
-rw-r--r--l10n/ru.js2
-rw-r--r--l10n/ru.json2
-rw-r--r--l10n/sc.js121
-rw-r--r--l10n/sc.json121
-rw-r--r--l10n/sk.js8
-rw-r--r--l10n/sk.json8
-rw-r--r--l10n/sl.js2
-rw-r--r--l10n/sl.json2
-rw-r--r--l10n/tr.js2
-rw-r--r--l10n/tr.json2
-rw-r--r--l10n/zh_HK.js2
-rw-r--r--l10n/zh_HK.json2
-rw-r--r--l10n/zh_TW.js2
-rw-r--r--l10n/zh_TW.json2
-rw-r--r--lib/Command/Updater/UpdateUser.php70
-rwxr-xr-xlib/Fetcher/FeedFetcher.php61
-rw-r--r--lib/Scraper/Scraper.php2
-rw-r--r--templates/part.content.php2
-rw-r--r--templates/part.navigation.addfolder.php2
-rw-r--r--templates/part.navigation.unreadfeed.php2
-rw-r--r--tests/Unit/Command/UpdateUserTest.php140
-rw-r--r--tests/Unit/Fetcher/FeedFetcherTest.php12
71 files changed, 1332 insertions, 552 deletions
diff --git a/.github/workflows/api-integration-tests.yml b/.github/workflows/api-integration-tests.yml
index 297ee7446..b6828ecdf 100644
--- a/.github/workflows/api-integration-tests.yml
+++ b/.github/workflows/api-integration-tests.yml
@@ -43,7 +43,7 @@ jobs:
experimental: true
steps:
- name: Checkout
- uses: actions/checkout@v2.3.4
+ uses: actions/checkout@v2.4.0
- name: Setup PHP
uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/api-php-static-code-check.yml b/.github/workflows/api-php-static-code-check.yml
index 5f9216a4b..8e0cb32f0 100644
--- a/.github/workflows/api-php-static-code-check.yml
+++ b/.github/workflows/api-php-static-code-check.yml
@@ -13,7 +13,7 @@ jobs:
name: "phpstan: Nextcloud ${{ matrix.nextcloud }}"
steps:
- name: Checkout
- uses: actions/checkout@v2.3.4
+ uses: actions/checkout@v2.4.0
- name: Set up php
uses: shivammathur/setup-php@master
with:
diff --git a/.github/workflows/api-php-tests.yml b/.github/workflows/api-php-tests.yml
index 838522bae..ca97dce69 100644
--- a/.github/workflows/api-php-tests.yml
+++ b/.github/workflows/api-php-tests.yml
@@ -15,7 +15,7 @@ jobs:
experimental: [false]
steps:
- name: Checkout
- uses: actions/checkout@v2.3.4
+ uses: actions/checkout@v2.4.0
- name: Setup PHP
uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index ab1e77fa3..f130204f7 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -19,7 +19,7 @@ jobs:
database: ['sqlite']
steps:
- name: Checkout
- uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+ uses: actions/checkout@v2.4.0
- name: Setup PHP
uses: shivammathur/setup-php@afefcaf556d98dc7896cca380e181decb609ca44
diff --git a/.github/workflows/changelog-enforcer.yml b/.github/workflows/changelog-enforcer.yml
index b7140c344..234bf3484 100644
--- a/.github/workflows/changelog-enforcer.yml
+++ b/.github/workflows/changelog-enforcer.yml
@@ -8,8 +8,8 @@ jobs:
changelog:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2.3.4
- - uses: dangoslen/changelog-enforcer@v2.2.0
+ - uses: actions/checkout@v2.4.0
+ - uses: dangoslen/changelog-enforcer@v2.3.1
with:
changeLogPath: 'CHANGELOG.md'
skipLabels: 'Skip-Changelog' \ No newline at end of file
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 409fb4da8..6fb51112a 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -3,6 +3,8 @@ on:
push:
branches:
- master
+ paths:
+ - 'docs/*'
jobs:
build:
@@ -10,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout master
- uses: actions/checkout@v2
+ uses: actions/checkout@v2.4.0
- name: Deploy docs
uses: mhausenblas/mkdocs-deploy-gh-pages@master
diff --git a/.github/workflows/frontend-nodejs-tests.yml b/.github/workflows/frontend-nodejs-tests.yml
index 5035cd589..40a28b690 100644
--- a/.github/workflows/frontend-nodejs-tests.yml
+++ b/.github/workflows/frontend-nodejs-tests.yml
@@ -15,7 +15,7 @@ jobs:
experimental: [false]
steps:
- name: Checkout
- uses: actions/checkout@v2.3.4
+ uses: actions/checkout@v2.4.0
- name: Setup PHP
uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/post-merge-tasks.yml b/.github/workflows/post-merge-tasks.yml
index dd6b1454d..e3738e585 100644
--- a/.github/workflows/post-merge-tasks.yml
+++ b/.github/workflows/post-merge-tasks.yml
@@ -4,13 +4,6 @@ on:
branches:
- master
jobs:
- update-release-draft:
- runs-on: ubuntu-latest
- name: "Release Drafter"
- steps:
- - uses: release-drafter/release-drafter@v5
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
php:
runs-on: ubuntu-latest
continue-on-error: false
@@ -20,7 +13,7 @@ jobs:
nextcloud: ['stable22']
steps:
- name: Checkout
- uses: actions/checkout@v2.3.4
+ uses: actions/checkout@v2.4.0
- name: Setup PHP
uses: shivammathur/setup-php@v2
diff --git a/AUTHORS.md b/AUTHORS.md
index afeda70f2..a13867fd3 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -6,9 +6,9 @@
* [Robin Appelman](mailto:icewind@owncloud.com)
* [Sean Molenaar](mailto:sean@seanmolenaar.eu)
* [Gregor Tätzner](mailto:gregor@freenet.de)
+* [anoy](mailto:anoymouserver+github@mailbox.org)
* [Sean Molenaar](mailto:SMillerDev@users.noreply.github.com)
* [Morris Jobke](mailto:hey@morrisjobke.de)
-* [anoy](mailto:anoymouserver+github@mailbox.org)
* [Jimmy Huynh](mailto:jimmy.huynh@etu.unistra.fr)
* [Aurélien](mailto:dav.aurelien@gmail.com)
* [Jan-Christoph Borchardt](mailto:hey@jancborchardt.net)
@@ -29,6 +29,7 @@
* [IBBoard](mailto:dev@ibboard.co.uk)
* [Koen Martens](mailto:gmc@sonologic.nl)
* [Lukas Reschke](mailto:lukas@owncloud.com)
+* [Tucker McKnight](mailto:tucker.mcknight@gmail.com)
* [Bart Visscher](mailto:bartv@thisnet.nl)
* [Christian Elmer](mailto:christian@keinkurt.de)
* [Nicolas Wendling](mailto:nicolas.wendling1011@gmail.com)
@@ -36,6 +37,7 @@
* [Volkan Gezer](mailto:volkangezer@gmail.com)
* [Xéfir Destiny](mailto:xefir@crystalyx.net)
* [Daniel Opitz](mailto:danopz@users.noreply.github.com)
+* [Daniel Rheinbay](mailto:danielrheinbay@gmail.com)
* [Lars Bensmann](mailto:lars@almosthappy.de)
* [Robin Appelman](mailto:robin@icewind.nl)
* [bluehaze](mailto:francesco.sportolari@gmail.com)
@@ -73,12 +75,14 @@
* [davidak](mailto:git@davidak.de)
* [lsmooth](mailto:ls@lsmooth.de)
* [s17t.net](mailto:mail+github@s17t.net)
+* [Alec Kojaev](mailto:alec@kojaev.name)
* [Alessandro](mailto:cosenal@gmail.com)
* [Alexander Grüßung](mailto:alexander@gruessung-online.de)
* [Allan Nordhøy](mailto:epost@anotheragency.no)
* [Alwaysin](mailto:adrien@demma.fr)
* [Andrea Boero](mailto:mail@tsumi.it)
* [Andreas Demmelbauer](mailto:git@notice.at)
+* [Artem Lavrukhin](mailto:lavryha4590@gmail.com)
* [Arthur Schiwon](mailto:blizzz@arthur-schiwon.de)
* [Aurelien DAVID](mailto:aurelien.david@etu.unistra.fr)
* [Aurelien DAVID](mailto:dav.aurelien@gmail.com)
@@ -95,6 +99,7 @@
* [Colin W](mailto:cwmke@users.noreply.github.com)
* [Daniel Aleksandersen](mailto:code@daniel.priv.no)
* [Daniel S](mailto:daniel@while-true-do.org)
+* [David Baucum](mailto:david@baucum.me)
* [David Engster](mailto:deng@randomsample.de)
* [Detlev Zundel](mailto:dzu@member.fsf.org)
* [Doron Behar](mailto:doron.behar@gmail.com)
@@ -109,6 +114,8 @@
* [Frank Karlitschek](mailto:frank@owncloud.org)
* [Freddo](mailto:f.falk@protonmail.com)
* [Freddo3000](mailto:f.falk@protonmail.com)
+* [Greg](mailto:greg@toolstack.com)
+* [Hagen](mailto:derhagen@users.noreply.github.com)
* [Hanzei](mailto:Hanzei@users.noreply.github.com)
* [Hendrik Leppelsack](mailto:hendrik@leppelsack.de)
* [Jasper Knockaert](mailto:jasper@knockaert.nl)
@@ -128,6 +135,7 @@
* [Pierre Ozoux](mailto:pierre@ozoux.net)
* [Piotr Dobrowolski](mailto:admin@tastycode.pl)
* [Raspbeguy](mailto:raspbeguy@users.noreply.github.com)
+* [René Henrich](mailto:contact@rene-henrich.de)
* [Rodrigo Aguilera](mailto:rodrigo.aguilera@amazee.com)
* [Roeland Jago Douma](mailto:roeland@famdouma.nl)
* [Simon](mailto:sschubert89@gmail.com)
@@ -140,13 +148,13 @@
* [Thomas Wouters](mailto:twouters@users.noreply.github.com)
* [Tilo Spannagel](mailto:development@tilosp.de)
* [Timo Schmidt](mailto:timo@xinterchange.net)
-* [Tucker McKnight](mailto:tucker.mcknight@gmail.com)
* [WENDLING NICOLAS](mailto:nicolas.wendling1011@gmail.com)
* [Welling Guzmán](mailto:WellingGuzman@users.noreply.github.com)
* [Xaver Maierhofer](mailto:xaver.maierhofer@xwissen.info)
* [Xemle](mailto:xemle@phtagr.org)
* [YMHuang](mailto:ymhuang@fmbase.tw)
* [Zach DeCook](mailto:zachdecook@gmail.com)
+* [Zach DeCook](mailto:zachdecook@librem.one)
* [amittel](mailto:arnulf.mittelstaedt@gmail.com)
* [b_b](mailto:brunobergot@gmail.com)
* [bjoerns1983](mailto:bjoern@sengotta.net)
@@ -161,6 +169,7 @@
* [kondou](mailto:kondou@ts.unde.re)
* [markusj](mailto:markusj@users.noreply.github.com)
* [mnassabain](mailto:34754819+mnassabain@users.noreply.github.com)
+* [mormegil](mailto:mormegil@centrum.cz)
* [nexus-uw](mailto:you@example.com)
* [repat](mailto:repat@repat.de)
* [ritchiewilson](mailto:rawilson52@gmail.com)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cfc50b20..d4fa552ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is almost based on [Keep a Changelog](https://keepachangelog.com/en/1
## [16.x.x]
### Changed
+<<<<<<< HEAD
- Added vue and ng-vue packages (#1421)
- Added new `news:updater:update-user` command to update the feeds of a single user (#1360).
### Fixed
@@ -18,6 +19,53 @@ The format is almost based on [Keep a Changelog](https://keepachangelog.com/en/1
### Fixed
- Set icon offset explicitly for navigation items (#1465)
+=======
+
+### Fixed
+
+# Releases
+## [16.2.1] - 2021-11-15
+### Fixed
+- Catch network errors while fetching feed logos. (#1572, #1570)
+
+## [16.2.0] - 2021-11-03
+No notable changes compared to the beta versions.
+
+## [16.2.0-beta2] - 2021-10-23
+### Changed
+- Updated "New Folder" and "All articles" icons to differentiate them from "Subscribe" and "All articles". (#1542)
+
+### Fixed
+- Mark the latest post in a feed as read when clicking on the right arrow key. (#1546)
+
+## [16.2.0-beta1] - 2021-10-18
+### Changed
+- Add changelog and DCO notice to CONTRIBUTING.md (#1521)
+- Download feed logos via guzzle to have better error handling (#1533)
+
+## [16.1.0] - 2021-10-07
+### Changed
+- Remove dependency's large test files from release (#1519)
+- Fix spelling of "receive" in log files (#1520)
+
+Note: Nextcloud 20 support will be dropped in Oct 2021, this is very likely the last version to support Nextcloud 20. This also means that PHP 7.2, will no longer be supported by news.
+
+# Releases
+## [16.1.0-beta1] - 2021-09-02
+### Changed
+- Added new `news:updater:update-user` command to update the feeds of a single user (#1360).
+
+### Fixed
+- Removed spurious requests for `.../apps/news/%7B%7B%20::Content.getFeed(item.feedId).faviconLink%20%7D%7D` (#1488)
+
+## [16.0.1] - 2021-08-02
+### Changed
+- Reimplemented relative time formatting as a filter (#1450)
+
+### Fixed
+- Set icon offset explicitly for navigation items (#1465)
+
+>>>>>>> master
## [16.0.0] - 2021-06-16
There are no additional changes compared to the latest beta.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1621cc03c..282fd068b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -94,3 +94,9 @@ The PHP code should all adhere to [PSR-2](https://www.php-fig.org/psr/psr-2/).
To test the codestyle you can run `make phpcs`.
For linting JavaScript, a [jshint file](https://github.com/nextcloud/news/blob/master/js/.jshintrc) is used that is run before compiling the JavaScript
+
+### Developer Certificate of Origin (DCO)
+When you commit your change, remember to sign off that you adhere to [DCO requirements](https://developercertificate.org/) as described by [Probot](https://probot.github.io/apps/dco/).
+
+### Change log
+Before you create a pull request, please remember to add an entry to [CHANGELOG.md](https://github.com/nextcloud/news/blob/master/CHANGELOG.md), using the format [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). \ No newline at end of file
diff --git a/Makefile b/Makefile
index 447cff328..a6392be30 100644
--- a/Makefile
+++ b/