From 7d3bc1b38f5fa67a2b6681c1e31d1d7502e93568 Mon Sep 17 00:00:00 2001 From: Daniel Schaal Date: Thu, 15 Jun 2017 14:16:43 +0200 Subject: Update htmlpurifier and picoFeed (#189) picoFeed moved to miniflux/picoFeed --- CONTRIBUTING.md | 2 +- composer.json | 4 ++-- composer.lock | 40 ++++++++++++++++++++-------------------- docs/README.md | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b20ba9440..649498781 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -81,7 +81,7 @@ You can help to improve our explore feeds section by [providing more feeds](http ## Fulltext configurations -Nextcloud News uses [picoFeed web scrapers](https://github.com/fguillot/picoFeed/blob/master/docs/grabber.markdown). Simply create a new configuration file if needed and open a pull request on their repository. The News app syncs regularly with the most recent changes. +Nextcloud News uses [picoFeed web scrapers](https://github.com/miniflux/picoFeed/blob/master/docs/grabber.markdown). Simply create a new configuration file if needed and open a pull request on their repository. The News app syncs regularly with the most recent changes. ## Development diff --git a/composer.json b/composer.json index 2fe0d6ab4..8546a7849 100644 --- a/composer.json +++ b/composer.json @@ -29,8 +29,8 @@ "source": "https://github.com/nextcloud/news/" }, "require": { - "ezyang/htmlpurifier": "4.9.2", - "fguillot/picofeed": "0.1.33", + "ezyang/htmlpurifier": "4.9.3", + "miniflux/picofeed": "0.1.34", "pear/net_url2": "2.2.1", "riimu/kit-pathjoin": "1.1.2" }, diff --git a/composer.lock b/composer.lock index 89a35c0b6..22b3167b8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "42e736ee493ffe0d8e66714313365d2d", - "content-hash": "19af3d601f08f25dc7de1a47cd2eb6fb", + "hash": "63a65f12a3a13c77aa65e51a30bfef52", + "content-hash": "3e09cb824fc2eb931014dc99a3b5b648", "packages": [ { "name": "ezyang/htmlpurifier", - "version": "v4.9.2", + "version": "v4.9.3", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "6d50e5282afdfdfc3e0ff6d192aff56c5629b3d4" + "reference": "95e1bae3182efc0f3422896a3236e991049dac69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/6d50e5282afdfdfc3e0ff6d192aff56c5629b3d4", - "reference": "6d50e5282afdfdfc3e0ff6d192aff56c5629b3d4", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/95e1bae3182efc0f3422896a3236e991049dac69", + "reference": "95e1bae3182efc0f3422896a3236e991049dac69", "shasum": "" }, "require": { @@ -52,20 +52,20 @@ "keywords": [ "html" ], - "time": "2017-03-13 06:30:53" + "time": "2017-06-03 02:28:16" }, { - "name": "fguillot/picofeed", - "version": "v0.1.33", + "name": "miniflux/picofeed", + "version": "v0.1.34", "source": { "type": "git", - "url": "https://github.com/fguillot/picoFeed.git", - "reference": "b44f1e1fdecfd2e7f158df86a23e1ea3dfb4e16f" + "url": "https://github.com/miniflux/picoFeed.git", + "reference": "5c8a731d4e7a3589e562e4fdaa98bcb57fa8a2ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fguillot/picoFeed/zipball/b44f1e1fdecfd2e7f158df86a23e1ea3dfb4e16f", - "reference": "b44f1e1fdecfd2e7f158df86a23e1ea3dfb4e16f", + "url": "https://api.github.com/repos/miniflux/picoFeed/zipball/5c8a731d4e7a3589e562e4fdaa98bcb57fa8a2ea", + "reference": "5c8a731d4e7a3589e562e4fdaa98bcb57fa8a2ea", "shasum": "" }, "require": { @@ -104,8 +104,8 @@ } ], "description": "Modern library to handle RSS/Atom feeds", - "homepage": "https://github.com/fguillot/picoFeed", - "time": "2017-04-07 01:57:15" + "homepage": "https://github.com/miniflux/picoFeed", + "time": "2017-06-12 00:22:06" }, { "name": "pear/net_url2", @@ -1470,16 +1470,16 @@ }, { "name": "symfony/yaml", - "version": "v3.3.0", + "version": "v3.3.2", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "885db865f6b2b918404a1fae28f9ac640f71f994" + "reference": "9752a30000a8ca9f4b34b5227d15d0101b96b063" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/885db865f6b2b918404a1fae28f9ac640f71f994", - "reference": "885db865f6b2b918404a1fae28f9ac640f71f994", + "url": "https://api.github.com/repos/symfony/yaml/zipball/9752a30000a8ca9f4b34b5227d15d0101b96b063", + "reference": "9752a30000a8ca9f4b34b5227d15d0101b96b063", "shasum": "" }, "require": { @@ -1521,7 +1521,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-05-28 10:56:20" + "time": "2017-06-02 22:05:06" }, { "name": "webmozart/assert", diff --git a/docs/README.md b/docs/README.md index f3afcb07c..63837701a 100644 --- a/docs/README.md +++ b/docs/README.md @@ -9,5 +9,5 @@ As a developer you can interact with the News app in the following ways: * [Customize the explore section](explore/) -The News app uses [picoFeed](https://github.com/fguillot/picoFeed) for parsing feeds and full text feeds. picoFeed is a fantastic library so if you [add custom full text configurations](https://github.com/fguillot/picoFeed/blob/master/docs/grabber.markdown#how-to-write-a-grabber-rules-file) or fix bugs, please consider **contributing your changes** back to the library to help others :) +The News app uses [picoFeed](https://github.com/miniflux/picoFeed) for parsing feeds and full text feeds. picoFeed is a fantastic library so if you [add custom full text configurations](https://github.com/miniflux/picoFeed/blob/master/docs/grabber.markdown#how-to-write-a-grabber-rules-file) or fix bugs, please consider **contributing your changes** back to the library to help others :) -- cgit v1.2.3