diff options
| author | bastei <bastei@users.noreply.github.com> | 2013-09-06 17:49:17 +0200 |
|---|---|---|
| committer | bastei <bastei@users.noreply.github.com> | 2013-09-06 17:49:17 +0200 |
| commit | 7a68ae03e3347e5c37879f1d21854eafdb868804 (patch) | |
| tree | e8221d61b82d4f7d165745950de7e3ce2e55c337 | |
| parent | a051d38df9094ccb6cac8e62587d08c477cd09df (diff) | |
| parent | 3a85eeade3ef2ddf464b1e13a3c9640d581eb492 (diff) | |
Merge remote-tracking branch 'upstream/master'
88 files changed, 1648 insertions, 1314 deletions
diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 034073f9b..000000000 --- a/AUTHORS +++ /dev/null @@ -1,18 +0,0 @@ -Authors: - -Alessandro Cosentino <cosenal@gmail.com> -Bernhard Posselt <dev@bernhard-posselt.com> - - -Designers: - -Jan-Christoph Borchardt (http://jancborchardt.net) -Raghu Nayyar <me@iraghu.com> -Bernhard Posselt <dev@bernhard-posselt.com> - - -Contributors: - -Robin Appelman <icewind@owncloud.com> [bugfixes] -Morris Jobke <morris.jobke@gmail.com> [bugfixes & features] -Lukas Reschke <lukas@statuscode.ch> [security fixes] diff --git a/AUTHORS.md b/AUTHORS.md new file mode 100644 index 000000000..03edb8db3 --- /dev/null +++ b/AUTHORS.md @@ -0,0 +1,28 @@ +# Authors +* [Alessandro Cosentino](https://github.com/zimba12): <cosenal@gmail.com> +* [Bernhard Posselt](https://github.com/Raydiation): <dev@bernhard-posselt.com> + +## Designers + +* [Jan-Christoph Borchardt](https://github.com/jancborchardt): <hey@jancborchardt.net> +* [Raghu Nayyar](https://github.com/raghunayyar): <me@iraghu.com> +* [Bernhard Posselt](https://github.com/Raydiation): <dev@bernhard-posselt.com> + + +## Contributors + +* [Robin Appelman](https://github.com/icewind1991): <icewind@owncloud.com> +* [Morris Jobke](https://github.com/kabum): <morris.jobke@gmail.com> +* [Lukas Reschke](https://github.com/LukasReschke): <lukas@statuscode.ch> +* [bluehaze](https://github.com/bluehaze) +* [Dave Hou Qingping](https://github.com/houqp): <dave2008713@gmail.com> +* [David Kleuker](https://github.com/davidak): <info@davidak.de> +* [bastei](https://github.com/bastei) +* [Peter Hedlund](https://github.com/phedlund): <support@peterandlinda.com> +* [benediktb](https://github.com/benediktb) +* [Maik Kulbe](https://github.com/mkzero) +* [s17t.net](https://github.com/s17t): <mail+github@s17t.net> +* [John Kristensen](https://github.com/jerrykan) +* [Lutz Schildt](https://github.com/lsmooth): <ls@lsmooth.de> +* [Christopher](https://github.com/Kondou-ger): <kondou@ts.unde.re> +* [Xemle](https://github.com/xemle): <xemle@phtagr.org>
\ No newline at end of file @@ -1,3 +1,7 @@ +owncloud-news (1.402) +* Add possibility of adding more than one xpath for article enhancer +* Fix bug that wouldn't delete old read articles + owncloud-news (1.401) * Add possibility to hook up article enhancers which fetch article content directly from the web page * Add article enhancer for explosm.net to directly fetch comics and shorts diff --git a/appinfo/info.xml b/appinfo/info.xml index c9870e286..6b37fd2ba 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,6 +5,6 @@ <description>An RSS/Atom feed reader. Requires the App Framework app and backgroundjobs need to be enabled. See the README.rst in the apps top directory</description> <licence>AGPL</licence> <author>Alessandro Cosentino, Bernhard Posselt, Jan-Christoph Borchardt. Powered by SimplePie (Ryan Parman, Geoffrey Sneddon, Ryan McCue and contributors).</author> - <version>1.401</version> + <version>1.402</version> <require>5.0.6</require> </info> diff --git a/appinfo/version b/appinfo/version index 7db38a882..0d422337b 100644 --- a/appinfo/version +++ b/appinfo/version @@ -1 +1 @@ -1.401
\ No newline at end of file +1.402
\ No newline at end of file diff --git a/db/itemmapper.php b/db/itemmapper.php index e66b8c166..0eec5f2cb 100644 --- a/db/itemmapper.php +++ b/db/itemmapper.php @@ -264,10 +264,10 @@ class ItemMapper extends Mapper implements IMapper { if($limit > 0) { $params = array($status, $row['feed_id']); - $sql = 'DELETE FROM `*PREFIX*news_items` `items` ' . + $sql = 'DELETE FROM `*PREFIX*news_items` ' . 'WHERE NOT ((`status` & ?) > 0) ' . 'AND `feed_id` = ? ' . - 'ORDER BY `items`.`id` ASC'; + 'ORDER BY `id` ASC'; $this->execute($sql, $params, $limit); } diff --git a/l10n/af_ZA/news.po b/l10n/af_ZA/news.po index 0c5914ac6..ae206c591 100644 --- a/l10n/af_ZA/news.po +++ b/l10n/af_ZA/news.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-19 01:17-0400\n" -"PO-Revision-Date: 2013-07-19 05:17+0000\n" +"POT-Creation-Date: 2013-09-05 06:31-0400\n" +"PO-Revision-Date: 2013-09-05 10:31+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgstr "" msgid "News" msgstr "" -#: businesslayer/feedbusinesslayer.php:86 +#: businesslayer/feedbusinesslayer.php:104 msgid "Can not add feed: Exists already" msgstr "" -#: businesslayer/feedbusinesslayer.php:124 +#: businesslayer/feedbusinesslayer.php:140 msgid "Can not add feed: URL does not exist or has invalid xml" msgstr "" @@ -33,52 +33,52 @@ msgstr "" msgid "Can not add folder: Exists already" msgstr "" -#: templates/main.php:26 +#: templates/main.php:37 #, php-format msgid "Undo deletion of %s" msgstr "" -#: templates/part.addnew.php:11 +#: templates/part.addnew.php:13 msgid "Add Website" msgstr "" -#: templates/part.addnew.php:16 +#: templates/part.addnew.php:21 msgid "Error: address exists already!" msgstr "" -#: templates/part.addnew.php:19 +#: templates/part.addnew.php:24 msgid "Error: folder exists already" msgstr "" -#: templates/part.addnew.php:26 +#: templates/part.addnew.php:31 msgid "Address" msgstr "" -#: templates/part.addnew.php:30 templates/part.addnew.php:33 +#: templates/part.addnew.php:35 templates/part.addnew.php:38 msgid "Add" msgstr "" -#: templates/part.addnew.php:37 templates/part.addnew.php:45 +#: templates/part.addnew.php:42 templates/part.addnew.php:50 msgid "New folder" msgstr "" -#: templates/part.addnew.php:38 +#: templates/part.addnew.php:43 msgid "Folder" msgstr "" -#: templates/part.addnew.php:43 +#: templates/part.addnew.php:48 msgid "Choose folder" msgstr "" -#: templates/part.addnew.php:55 +#: templates/part.addnew.php:60 msgid "Folder name" msgstr "" -#: templates/part.addnew.php:58 +#: templates/part.addnew.php:63 msgid "Back to folder selection" msgstr "" -#: templates/part.addnew.php:63 +#: templates/part.addnew.php:68 msgid "Create folder" msgstr "" @@ -99,6 +99,10 @@ msgstr "" msgid "Mark read" msgstr "" +#: templates/part.firstrun.php:2 +msgid "Welcome to the ownCloud News app!" +msgstr "" + #: templates/part.items.php:32 msgid "from" msgstr "" @@ -163,10 +167,10 @@ msgstr "" msgid "Error when importing: file does not contain valid JSON" msgstr "" -#: templates/part.showall.php:2 +#: templates/part.showall.php:5 msgid "Show all" msgstr "" -#: templates/part.showall.php:6 +#: templates/part.showall.php:11 msgid "Show only unread" msgstr "" diff --git a/l10n/ar/news.po b/l10n/ar/news.po index b62a8c2cb..b073f8330 100644 --- a/l10n/ar/news.po +++ b/l10n/ar/news.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-21 07:04-0400\n" -"PO-Revision-Date: 2013-08-19 18:22+0000\n" +"POT-Creation-Date: 2013-09-05 06:31-0400\n" +"PO-Revision-Date: 2013-09-05 10:31+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgstr "" msgid "News" msgstr "" -#: businesslayer/feedbusinesslayer.php:95 +#: businesslayer/feedbusinesslayer.php:104 msgid "Can not add feed: Exists already" msgstr "" -#: businesslayer/feedbusinesslayer.php:133 +#: businesslayer/feedbusinesslayer.php:140 msgid "Can not add feed: URL does not exist or has invalid xml" msgstr "" @@ -33,52 +33,52 @@ msgstr "" msgid "Can not add folder: Exists already" msgstr "" -#: templates/main.php:26 +#: templates/main.php:37 #, php-format msgid "Undo deletion of %s" msgstr "" -#: templates/part.addnew.php:11 +#: templates/part.addnew.php:13 msgid "Add Website" msgstr "" -#: templates/part.addnew.php:16 +#: templates/part.addnew.php:21 msgid "Error: address exists already!" msgstr "" -#: templates/part.addnew.php:19 +#: templates/part.addnew.php:24 msgid "Error: folder exists already" msgstr "" -#: templates/part.addnew.php:26 +#: templates/part.addnew.php:31 msgid "Address" msgstr "عنوان" -#: templates/part.addnew.php:30 templates/part.addnew.php:33 +#: templates/part.addnew.php:35 templates/part.addnew.php:38 msgid "Add" msgstr "أدخل" -#: templates/part.addnew.php:37 templates/part.addnew.php:45 +#: templates/part.addnew.php:42 templates/part.addnew.php:50 msgid "New folder" msgstr "" -#: templates/part.addnew.php:38 +#: templates/part.addnew.php:43 msgid "Folder" msgstr "مجلد" -#: templates/part.addnew.php:43 +#: templates/part.addnew.php:48 msgid "Choose folder" msgstr "" -#: templates/part.addnew.php:55 +#: templates/part.addnew.php:60 msgid "Folder name" msgstr "" -#: templates/part.addnew.php:58 +#: templates/part.addnew.php:63 msgid "Back to folder selection" msgstr "" -#: templates/part.addnew.php:63 +#: templates/part.addnew.php:68 msgid "Create folder" msgstr "" @@ -99,6 +99,10 @@ msgstr "" msgid "Mark read" msgstr "" +#: templates/part.firstrun.php:2 +msgid "Welcome to the ownCloud News app!" +msgstr "" + #: templates/part.items.php:32 msgid "from" msgstr "" diff --git a/l10n/be/news.po b/l10n/be/news.po index 63c7f92c3..ccc4ca553 100644 --- a/l10n/be/news.po +++ b/l10n/be/news.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-19 01:17-0400\n" -"PO-Revision-Date: 2013-07-19 05:17+0000\n" +"POT-Creation-Date: 2013-09-05 06:31-0400\n" +"PO-Revision-Date: 2013-09-05 10:31+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgstr "" msgid "News" msgstr "" -#: businesslayer/feedbusinesslayer.php:86 +#: businesslayer/feedbusinesslayer.php:104 msgid "Can not add feed: Exists already" msgstr "" -#: businesslayer/feedbusinesslayer.php:124 +#: businesslayer/feedbusinesslayer.php:140 msgid "Can not add feed: URL does not exist or has invalid xml" msgstr "" @@ -33,52 +33,52 @@ msgstr "" msgid "Can not add folder: Exists already" msgstr "" -#: templates/main.php:26 +#: templates/main.php:37 #, php-format msgid "Undo deletion of %s" msgstr "" -#: templates/part.addnew.php:11 +#: templates/part.addnew.php:13 msgid "Add Website" msgstr "" -#: templates/part.addnew.php:16 +#: templates/part.addnew.php:21 msgid "Error: address exists already!" msgstr "" -#: templates/part.addnew.php:19 |