Skip to content
This repository has been archived by the owner on Jul 6, 2020. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: owncloud-archive/news
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8.5.0
Choose a base ref
...
head repository: owncloud-archive/news
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Apr 14, 2016

  1. update changelog

    Bernhard Posselt committed Apr 14, 2016
    Copy the full SHA
    20ad393 View commit details

Commits on Apr 15, 2016

  1. [tx-robot] updated from transifex

    Jenkins for ownCloud committed Apr 15, 2016
    Copy the full SHA
    5221115 View commit details
  2. Do not build release on travis since it's unreliable

    Bernhard Posselt committed Apr 15, 2016
    Copy the full SHA
    16a5918 View commit details
  3. update composer

    Bernhard Posselt committed Apr 15, 2016
    Copy the full SHA
    3d02e41 View commit details

Commits on Apr 16, 2016

  1. rename dev deps to build deps

    Bernhard Posselt committed Apr 16, 2016
    Copy the full SHA
    ccc65e3 View commit details
  2. Update irc

    Bernhard Posselt committed Apr 16, 2016
    Copy the full SHA
    5933112 View commit details
  3. update picofeed

    Bernhard Posselt committed Apr 16, 2016
    Copy the full SHA
    fc27818 View commit details

Commits on Apr 17, 2016

  1. [tx-robot] updated from transifex

    Jenkins for ownCloud committed Apr 17, 2016
    Copy the full SHA
    d08dd53 View commit details
  2. Fix #977

    Bernhard Posselt committed Apr 17, 2016
    Copy the full SHA
    d74b8cf View commit details
  3. version bump

    Bernhard Posselt committed Apr 17, 2016
    Copy the full SHA
    c982277 View commit details

Commits on Apr 18, 2016

  1. [tx-robot] updated from transifex

    Jenkins for ownCloud committed Apr 18, 2016
    Copy the full SHA
    4450055 View commit details
  2. try container build

    Bernhard Posselt committed Apr 18, 2016
    Copy the full SHA
    7867824 View commit details
  3. Fix #791

    Bernhard Posselt committed Apr 18, 2016
    Copy the full SHA
    d538613 View commit details
  4. fix linting error

    Bernhard Posselt committed Apr 18, 2016
    Copy the full SHA
    1ce933d View commit details
  5. version bump

    Bernhard Posselt committed Apr 18, 2016
    Copy the full SHA
    3ef8d37 View commit details
  6. update composer deps

    Bernhard Posselt committed Apr 18, 2016
    Copy the full SHA
    9c9f8b3 View commit details
  7. lock picofeed version

    Bernhard Posselt committed Apr 18, 2016
    Copy the full SHA
    cd00c46 View commit details
  8. lock down versions in composer.json

    Bernhard Posselt committed Apr 18, 2016
    Copy the full SHA
    f8eb648 View commit details
  9. update lock file

    Bernhard Posselt committed Apr 18, 2016
    Copy the full SHA
    e2637ac View commit details

Commits on Apr 19, 2016

  1. Fix #978

    Bernhard Posselt committed Apr 19, 2016
    Copy the full SHA
    a0b0aee View commit details
  2. version bump

    Bernhard Posselt committed Apr 19, 2016
    Copy the full SHA
    ff86902 View commit details

Commits on Apr 20, 2016

  1. [tx-robot] updated from transifex

    Jenkins for ownCloud committed Apr 20, 2016
    Copy the full SHA
    6f13573 View commit details
  2. copy to build directory before packaging

    Bernhard Posselt committed Apr 20, 2016
    Copy the full SHA
    4cde440 View commit details
  3. add code signing to makefile

    Bernhard Posselt committed Apr 20, 2016
    Copy the full SHA
    f761c36 View commit details
  4. only sign when key, cert and occ is found

    Bernhard Posselt committed Apr 20, 2016
    Copy the full SHA
    060b048 View commit details

Commits on Apr 21, 2016

  1. [tx-robot] updated from transifex

    Jenkins for ownCloud committed Apr 21, 2016
    Copy the full SHA
    6577015 View commit details
  2. fix sign command

    Bernhard Posselt committed Apr 21, 2016
    Copy the full SHA
    272eb91 View commit details
  3. update makefile

    Bernhard Posselt committed Apr 21, 2016
    Copy the full SHA
    264216a View commit details

Commits on Apr 23, 2016

  1. [tx-robot] updated from transifex

    Jenkins for ownCloud committed Apr 23, 2016
    Copy the full SHA
    3193fe0 View commit details

Commits on Apr 24, 2016

  1. [tx-robot] updated from transifex

    Jenkins for ownCloud committed Apr 24, 2016
    Copy the full SHA
    a864b64 View commit details

Commits on Apr 26, 2016

  1. [tx-robot] updated from transifex

    Jenkins for ownCloud committed Apr 26, 2016
    Copy the full SHA
    7c033f2 View commit details
  2. remove checks for always valid targets

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    5245e60 View commit details
  3. First API v2 draft

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    49a17d8 View commit details
  4. typo

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    2f4fed9 View commit details
  5. typo

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    ae88c34 View commit details
  6. typo

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    4f38145 View commit details
  7. typo

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    145d387 View commit details
  8. typo

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    c72e72d View commit details
  9. typo

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    49a5e72 View commit details
  10. typo

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    7dcd5c9 View commit details
  11. typo

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    699bbd7 View commit details
  12. typo

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    b5e65e0 View commit details
  13. typo

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    7a32800 View commit details
  14. typo

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    4b60583 View commit details
  15. typo

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    9434276 View commit details
  16. add type structures

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    bb4f27f View commit details
  17. add type structures

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    c4462f0 View commit details
  18. add type structures

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    c00d0b6 View commit details
  19. add type structures

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    5c452bb View commit details
  20. add type structures

    Bernhard Posselt committed Apr 26, 2016
    Copy the full SHA
    02721cb View commit details
Showing with 2,520 additions and 1,033 deletions.
  1. +1 −1 .editorconfig
  2. +5 −14 .travis.yml
  3. +30 −1 CHANGELOG.md
  4. +2 −2 CONTRIBUTING.md
  5. +83 −55 Makefile
  6. +6 −33 README.md
  7. +17 −3 appinfo/application.php
  8. +6 −0 appinfo/database.xml
  9. +2 −2 appinfo/info.xml
  10. +3 −0 appinfo/routes.php
  11. +5 −5 composer.json
  12. +8 −10 composer.lock
  13. +7 −7 config/appconfig.php
  14. +37 −0 controller/apicontroller.php
  15. +2 −1 controller/pagecontroller.php
  16. +2 −5 cron/updater.php
  17. +5 −1 css/content.css
  18. +3 −1 db/feed.php
  19. +22 −18 db/item.php
  20. +91 −95 db/itemmapper.php
  21. +27 −0 docs/developer/Article-Enhancers.md
  22. +203 −0 docs/developer/Plugins.md
  23. +6 −0 docs/developer/README.md
  24. +2 −1 js/.jshintrc
  25. +1 −1 js/README.md
  26. +178 −156 js/controller/ContentController.js
  27. +23 −0 js/directive/NewsOnActive.js
  28. +0 −37 js/directive/NewsPullToRefresh.js
  29. +85 −112 js/gui/KeyboardShortcuts.js
  30. +1 −1 js/package.json
  31. +22 −2 js/tests/unit/controller/ContentControllerSpec.js
  32. +77 −8 l10n/ast.js
  33. +77 −8 l10n/ast.json
  34. +77 −8 l10n/ast.php
  35. +30 −2 l10n/bg_BG.js
  36. +30 −2 l10n/bg_BG.json
  37. +30 −2 l10n/bg_BG.php
  38. +24 −16 l10n/cs_CZ.js
  39. +24 −16 l10n/cs_CZ.json
  40. +24 −16 l10n/cs_CZ.php
  41. +23 −2 l10n/da.js
  42. +23 −2 l10n/da.json
  43. +23 −2 l10n/da.php
  44. +3 −1 l10n/de.js
  45. +3 −1 l10n/de.json
  46. +3 −1 l10n/de.php
  47. +3 −1 l10n/de_DE.js
  48. +3 −1 l10n/de_DE.json
  49. +3 −1 l10n/de_DE.php
  50. +24 −2 l10n/el.js
  51. +24 −2 l10n/el.json
  52. +24 −2 l10n/el.php
  53. +0 −5 l10n/en@pirate.php
  54. +20 −2 l10n/en_GB.js
  55. +20 −2 l10n/en_GB.json
  56. +20 −2 l10n/en_GB.php
  57. +14 −1 l10n/es.js
  58. +14 −1 l10n/es.json
  59. +14 −1 l10n/es.php
  60. +2 −21 l10n/et_EE.js
  61. +2 −21 l10n/et_EE.json
  62. +2 −21 l10n/et_EE.php
  63. +1 −6 l10n/fi_FI.js
  64. +1 −6 l10n/fi_FI.json
  65. +1 −6 l10n/fi_FI.php
  66. +19 −3 l10n/fr.js
  67. +19 −3 l10n/fr.json
  68. +19 −3 l10n/fr.php
  69. +1 −1 l10n/gl.js
  70. +1 −1 l10n/gl.json
  71. +1 −1 l10n/gl.php
  72. +19 −2 l10n/he.js
  73. +19 −2 l10n/he.json
  74. +19 −2 l10n/he.php
  75. +1 −1 l10n/id.js
  76. +1 −1 l10n/id.json
  77. +1 −1 l10n/id.php
  78. +27 −2 l10n/is.js
  79. +27 −2 l10n/is.json
  80. +27 −2 l10n/is.php
  81. +3 −1 l10n/it.js
  82. +3 −1 l10n/it.json
  83. +3 −1 l10n/it.php
  84. +21 −3 l10n/ja.js
  85. +21 −3 l10n/ja.json
  86. +21 −3 l10n/ja.php
  87. +27 −5 l10n/ko.js
  88. +27 −5 l10n/ko.json
  89. +27 −5 l10n/ko.php
  90. +20 −2 l10n/nb_NO.js
  91. +20 −2 l10n/nb_NO.json
  92. +20 −2 l10n/nb_NO.php
  93. +19 −5 l10n/nl.js
  94. +19 −5 l10n/nl.json
  95. +19 −5 l10n/nl.php
  96. +4 −2 l10n/oc.js
  97. +4 −2 l10n/oc.json
  98. +4 −2 l10n/oc.php
  99. +3 −1 l10n/pt_BR.js
  100. +3 −1 l10n/pt_BR.json
  101. +3 −1 l10n/pt_BR.php
  102. +23 −8 l10n/pt_PT.js
  103. +23 −8 l10n/pt_PT.json
  104. +23 −8 l10n/pt_PT.php
  105. +52 −34 l10n/ru.js
  106. +52 −34 l10n/ru.json
  107. +52 −34 l10n/ru.php
  108. +1 −1 l10n/sk_SK.js
  109. +1 −1 l10n/sk_SK.json
  110. +1 −1 l10n/sk_SK.php
  111. +24 −1 l10n/sl.js
  112. +24 −1 l10n/sl.json
  113. +24 −1 l10n/sl.php
  114. +3 −1 l10n/sq.js
  115. +3 −1 l10n/sq.json
  116. +3 −1 l10n/sq.php
  117. +1 −1 l10n/sr.js
  118. +1 −1 l10n/sr.json
  119. +1 −1 l10n/sr.php
  120. +27 −7 l10n/th_TH.js
  121. +27 −7 l10n/th_TH.json
  122. +27 −7 l10n/th_TH.php
  123. +17 −2 l10n/tr.js
  124. +17 −2 l10n/tr.json
  125. +17 −2 l10n/tr.php
  126. +3 −2 l10n/uk.js
  127. +3 −2 l10n/uk.json
  128. +3 −2 l10n/uk.php
  129. +2 −1 templates/index.php
  130. +4 −2 templates/part.content.cronwarning.php
  131. +2 −2 templates/part.content.explore.php
  132. +3 −9 templates/part.content.php
  133. +7 −4 templates/part.settings.php
  134. +3 −1 tests/unit/db/FeedTest.php
  135. +3 −1 tests/unit/db/ItemTest.php
  136. +2 −2 tests/unit/upgrade/UpgradeTest.php
  137. +1 −1 upgrade/upgrade.php
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -10,4 +10,4 @@ charset = utf-8

[Makefile]
indent_style = tab

indent_size = 4
19 changes: 5 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sudo: required
sudo: false
dist: trusty
language: php
php:
@@ -25,11 +25,11 @@ matrix:
before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- if [[ "$DB" == 'mysql' ]]; then sudo apt-get -y install mariadb-server; fi
- nvm install 5.6
# re-enable once mariadb is added as an option
# - if [[ "$DB" == 'mysql' ]]; then sudo apt-get -y install mariadb-server; fi
- nvm install 6
- npm install -g npm@latest
- make
- make appstore
# install core
- cd ../
- git clone https://github.com/owncloud/core.git --recursive --depth 1 -b $CORE_BRANCH owncloud
@@ -45,6 +45,7 @@ before_script:
- mkdir data
- ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database $DB --database-pass=''
- ./occ app:enable news
- ./occ app:check-code news
- ./occ background:cron # enable default cron
- php -S localhost:8080 &
- cd apps/news
@@ -59,15 +60,5 @@ after_success:
after_failure:
- cat ../../data/owncloud.log

deploy:
provider: releases
skip_cleanup: true
api_key:
secure: ds45weacZfcM1kPEFMSBogc3KRxdb77O4V6OfDCWEZTvdCgq5AWY21Rc4fCRL+UYPGtHAWykL96xgoii81uuKEK+eqyJtOlrp53EGHsyYJLkSPg8Yjccj9W5WuAUymiuP/vilB8+L1HqpUQW9bXzlYbI/AICYAIQzv5UN4+sXKA=
file: 'build/artifacts/appstore/news.tar.gz'
on:
repo: owncloud/news
tags: true

addons:
firefox: "latest"
31 changes: 30 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,34 @@
owncloud-news (8.8.0)
* **Enhancement**: Remove current pull to refresh implementation since it is more annoying than helpful.
* **Enhancement**: Add API route for supported API levels

owncloud-news (8.7.5)
* **Security (High)**: Fix security bug that would allow websites to access your DOM document when using keyboard shortcuts to open an article in a new tab, downloading audio files, opening links on the explore page or opening links to the ownCloud documentation or issue tracker (News app versions prior to 5.0.0 are also vulnerable when clicking on any link in the title or article body). This gives any attacker access to all data on the DOM and allows them to make arbitrary requests to the ownCloud server on the user's behalf, bypassing CSRF protection and gaining full access to their account by stealing their login cookies. For a more detailed explanation [visit this website](https://medium.com/@jitbit/target-blank-the-most-underestimated-vulnerability-ever-96e328301f4c#.h55ny7ef0)

owncloud-news (8.7.4)
* **Bugfix**: Fix expand in compact view mode, #988

owncloud-news (8.7.3)
* **Bugfix**: Rerun fingerprint and search index generation in case it was not run properly before
* **Bugfix**: Do not swallow errors when generating search indices and fingerprints

owncloud-news (8.7.2)
* **Security**: Sign application to make missing/outdated files more easily detectable and prevent attackers from potentially serving a malicious News app from the app store

owncloud-news (8.7.1)
* **Bugfix**: Send Chrome's user agent string instead of our own since mod_security, which is used on some servers, thinks that only browsers are allowed to send user agents. This will fix feed updates for some websites, e.g. joomla.org, (because we all know that Joomla is big on security ;) ), #978

owncloud-news (8.7.0)
* **Enhancement**: Better lock down Composer versions to prevent shipping newer PHP libraries then intended when compiling the project
* **Enhancement**: Mark current article as active while scrolling
* **Enhancement**: Clicking on an article sets it as active, #791
* **Enhancement**: Keyboard shortcuts will target the currently active element, #791

owncloud-news (8.6.0)
* **Enhancement**: Also publish error count and last error message through API, #977

owncloud-news (8.5.0)
* **Bugfix**: Do not run feed updates when ajax or web cron mode was detected because it can lead to very long load times, timeouts, data corruption and database inconsistencies. If someone is interested in re-enabling webcron based feed updates, please create a PHP script which uses the [updater API](https://github.com/owncloud/news/wiki/Updater-1.2)
* **Bugfix**: Do not run feed updates when ajax or web cron mode was detected because it can lead to very long load times, timeouts, data corruption, update bugs where feeds are not updated anymore and database inconsistencies. If someone is interested in re-enabling webcron based feed updates, please create a PHP script which uses the [updater API](https://github.com/owncloud/news/wiki/Updater-1.2). Don't hesitate to ask for help on the issue tracker!
* **Bugfix**: Fix multiple error messages and outdated links for cron error messages

owncloud-news (8.4.1)
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -99,7 +99,7 @@ That way we can talk about the problem first and discuss the implementation (and

### How to set up a development environment

To get started after [cloning the repository](https://github.com/owncloud/news#installing-from-git-development-version), install the [development dependencies](https://github.com/owncloud/news#development-dependencies) and run:
To get started after [cloning the repository](https://github.com/owncloud/news#installing-from-git-development-version), install the [build dependencies](https://github.com/owncloud/news#development-dependencies) and run:

make

@@ -121,7 +121,7 @@ Check [the plugin section on the wiki](https://github.com/owncloud/news/wiki#req

### Contact Us!

We usually hang out on **irc.freenode.net** in the **#owncloud-news** and **#owncloud-dev** chat room. Just ping [BernhardPosselt](https://github.com/BernhardPosselt/) or [cosenal](https://github.com/cosenal) or write us a mail directly. Mail addresses are listed on our GitHub profiles.
We usually hang out on **irc.freenode.net** in the **#owncloud-news** and **#owncloud-dev** chat room.

You can also send a mail to the [owncloud-devel mailing list](https://mailman.owncloud.org/mailman/listinfo/devel).

138 changes: 83 additions & 55 deletions Makefile
Original file line number Diff line number Diff line change
@@ -40,29 +40,43 @@
# },

app_name=$(notdir $(CURDIR))
project_directory=../$(app_name)
build_tools_directory=$(CURDIR)/build/tools
source_build_directory=$(CURDIR)/build/artifacts/source
updater_build_directory=$(CURDIR)/build/artifacts/updater
source_package_name=$(source_build_directory)/$(app_name)
appstore_build_directory=$(CURDIR)/build/artifacts/appstore
appstore_package_name=$(appstore_build_directory)/$(app_name)
source_build_directory=$(CURDIR)/build/source/news
source_artifact_directory=$(CURDIR)/build/artifacts/source
source_package_name=$(source_artifact_directory)/$(app_name)
appstore_build_directory=$(CURDIR)/build/appstore/news
appstore_artifact_directory=$(CURDIR)/build/artifacts/appstore
appstore_package_name=$(appstore_artifact_directory)/$(app_name)
npm=$(shell which npm 2> /dev/null)
composer=$(shell which composer 2> /dev/null)

# code signing
# assumes the following:
# * the app is inside the owncloud/apps folder
# * the private key is located in ~/.owncloud/news.key
# * the certificate is located in ~/.owncloud/news.crt
occ=$(CURDIR)/../../occ
private_key=$(HOME)/.owncloud/$(app_name).key
certificate=$(HOME)/.owncloud/$(app_name).crt
sign=php -f $(occ) integrity:sign-app --privateKey="$(private_key)" --certificate="$(certificate)"
sign_skip_msg="Skipping signing, either no key and certificate found in $(private_key) and $(certificate) or occ can not be found at $(occ)"
ifneq (,$(wildcard $(private_key)))
ifneq (,$(wildcard $(certificate)))
ifneq (,$(wildcard $(occ)))
CAN_SIGN=true
endif
endif
endif

all: build

# Fetches the PHP and JS dependencies and compiles the JS. If no composer.json
# is present, the composer step is skipped, if no package.json or js/package.json
# is present, the npm step is skipped
.PHONY: build
build:
ifneq (,$(wildcard $(CURDIR)/composer.json))
make composer
endif
ifneq (,$(wildcard $(CURDIR)/js/package.json))
make npm
endif

# Installs and updates the composer dependencies. If composer is not installed
# a copy is fetched from the web
@@ -108,55 +122,69 @@ dist:
# Builds the source package
.PHONY: source
source:
rm -rf $(source_build_directory)
mkdir -p $(source_build_directory)
tar cvzf $(source_package_name).tar.gz ../$(app_name) \
--exclude-vcs \
--exclude="../$(app_name)/build" \
--exclude="../$(app_name)/js/node_modules" \
--exclude="../$(app_name)/*.log" \
--exclude="../$(app_name)/js/*.log" \
rm -rf $(source_build_directory) $(source_artifact_directory)
mkdir -p $(source_build_directory) $(source_artifact_directory)
rsync -rv . $(source_build_directory) \
--exclude=/.git/ \
--exclude=/.idea/ \
--exclude=/build/ \
--exclude=/js/node_modules/ \
--exclude=*.log
ifdef CAN_SIGN
$(sign) --path "$(source_build_directory)"
else
@echo $(sign_skip_msg)
endif
tar -cvzf $(source_package_name).tar.gz -C $(source_build_directory)/../ $(app_name)

# Builds the source package for the app store, ignores php and js tests
.PHONY: appstore
appstore:
rm -rf $(appstore_build_directory)
mkdir -p $(appstore_build_directory)
tar cvzf $(appstore_package_name).tar.gz \
$(project_directory)"/admin" \
$(project_directory)"/appinfo" \
$(project_directory)"/config" \
$(project_directory)"/command" \
$(project_directory)"/controller" \
$(project_directory)"/cron" \
$(project_directory)"/css" \
$(project_directory)"/db" \
$(project_directory)"/dependencyinjection" \
$(project_directory)"/explore" \
$(project_directory)"/fetcher" \
$(project_directory)"/hooks" \
$(project_directory)"/http" \
$(project_directory)"/img" \
$(project_directory)"/l10n" \
$(project_directory)"/plugin" \
$(project_directory)"/service" \
$(project_directory)"/templates" \
$(project_directory)"/upgrade" \
$(project_directory)"/utility" \
$(project_directory)"/vendor" \
$(project_directory)"/COPYING" \
$(project_directory)"/README.md" \
$(project_directory)"/AUTHORS.md" \
$(project_directory)"/js/vendor/js-url/url.min.js" \
$(project_directory)"/js/vendor/es6-shim/es6-shim.min.js" \
$(project_directory)"/js/vendor/angular/angular.min.js" \
$(project_directory)"/js/vendor/angular-animate/angular-animate.min.js" \
$(project_directory)"/js/vendor/angular-route/angular-route.min.js" \
$(project_directory)"/js/vendor/angular-sanitize/angular-sanitize.min.js" \
$(project_directory)"/js/vendor/momentjs/min/moment-with-locales.min.js" \
$(project_directory)"/js/vendor/masonry/dist/masonry.pkgd.min.js" \
$(project_directory)"/js/build/app.min.js" \
$(project_directory)"/js/admin/Admin.js" \
rm -rf $(appstore_build_directory) $(appstore_artifact_directory)
mkdir -p $(appstore_build_directory) $(appstore_artifact_directory)
cp --parents -r \
"admin" \
"appinfo" \
"config" \
"command" \
"controller" \
"cron" \
"css" \
"db" \
"dependencyinjection" \
"explore" \
"fetcher" \
"hooks" \
"http" \
"img" \
"l10n" \
"plugin" \
"service" \
"templates" \
"upgrade" \
"utility" \
"vendor" \
"COPYING" \
"README.md" \
"AUTHORS.md" \
"js/vendor/js-url/url.min.js" \
"js/vendor/es6-shim/es6-shim.min.js" \
"js/vendor/angular/angular.min.js" \
"js/vendor/angular-animate/angular-animate.min.js" \
"js/vendor/angular-route/angular-route.min.js" \
"js/vendor/angular-sanitize/angular-sanitize.min.js" \
"js/vendor/momentjs/min/moment-with-locales.min.js" \
"js/vendor/masonry/dist/masonry.pkgd.min.js" \
"js/build/app.min.js" \
"js/admin/Admin.js" \
$(appstore_build_directory)
ifdef CAN_SIGN
$(sign) --path="$(appstore_build_directory)"
else
@echo $(sign_skip_msg)
endif
tar -czf $(appstore_package_name).tar.gz -C $(appstore_build_directory)/../ $(app_name)


# Command for running JS and PHP tests. Works for package.json files in the js/
# and root directory. If phpunit is not installed systemwide, a copy is fetched
39 changes: 6 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
@@ -12,27 +12,23 @@ The News app is an RSS/Atom feed aggregator. It offers a [RESTful API](https://g

For further developer and user documentation please visit [the wiki](https://github.com/owncloud/news/wiki)

## Maintainers
* [Bernhard Posselt](https://github.com/BernhardPosselt)
* [Alessandro Cosentino](https://github.com/cosenal)
* [Jan-Christoph Borchardt](https://github.com/jancborchardt) (Design)

## Sync Clients
are listed on the [ownCloud apps overview](https://github.com/owncloud/core/wiki/Apps)

## Dependencies
* 64bit operating system and PHP
* PHP >= 5.6
* ownCloud >= 9.0
* libxml >= 2.7.8 (2.9 recommended)
* php-curl
* iconv
* SimpleXML
* PHP >= 5.6

## Development Dependencies
## Build Dependencies
These Dependencies are only relevant if you want to build the source code:
* make
* which
* Node.js >= 5.6
* Node.js >= 6
* npm
* composer

@@ -215,29 +211,6 @@ Some hints:
* type clob is usually an Sql TEXT
* length for integer fields means bytes, so an integer with length 8 means its 64bit


### I'm getting a feed not found error when adding a feed, but it works in picoFeed/Miniflux
Some websites block the News app because the mistake its user agent string for an attack (most notably https://www.joomla.org/announcements.feed\?type\=rss). You can test for this issue by changing the default user agent string in **appinfo/application.php**.

Search the section that defines the user agent:

```php
$userAgent = 'ownCloud News/' . $appConfig->getConfig('version') .
' (+https://owncloud.org/; 1 subscriber;)';
```

and replace it with the following line:

```php
$userAgent = 'test';
```

If this fixes the issue, contact the feed's administrators and ask them to fix their server setup.

**Hint**: Should you not be able to set up picoFeed or Miniflux, you can simply use the bundled picoFeed version to test the website, e.g.:

php -f vendor/fguillot/picofeed/picofeed feed https://www.joomla.org/announcements.feed\?type\=rss

### I am getting: Exception: Some\\Class does not exist erros in my owncloud.log
This is very often caused by missing or old files, e.g. by failing to upload all of the News app' files or errors during installation. Before you report a bug, please recheck if all files from the archive are in place and accessible.

@@ -287,7 +260,7 @@ If you have control over the feed in question, consider signing your certificate
* [StartSSL](https://www.startssl.com/)
* [WoSign](https://www.wosign.com/)

If you do not have control over the chosen feed, you should [download the certificate from the feed's website](http://superuser.com/questions/97201/how-to-save-a-remote-server-ssl-certificate-locally-as-a-file) and [add it to your server's trusted certificates](https://turboflash.wordpress.com/2009/06/23/curl-adding-installing-trusting-new-self-signed-certificate/). The exact procedure however may vary depending on your distribution.
If you do not have control over the chosen feed, you should [download the certificate from the feed's website](http://superuser.com/questions/97201/how-to-save-a-remote-server-ssl-certificate-locally-as-a-file) and [add it to your server's trusted certificates](http://www.onlinesmartketer.com/2009/06/23/curl-adding-installing-trusting-new-self-signed-certificate/). The exact procedure however may vary depending on your distribution.


Configuration
@@ -308,7 +281,7 @@ exploreUrl =


* **autoPurgeMinimumInterval**: Minimum amount of seconds after deleted feeds and folders are removed from the database. Values below 60 seconds are ignored
* **autoPurgeCount**: Defines the minimum amount of articles that can be unread per feed before they get deleted, a negative value will turn off deleting articles completely
* **autoPurgeCount**: Defines the maximum amount of articles that can be read per feed which won't be deleted by the cleanup job; if old articles reappear after being read, increase this value; negative values such as -1 will turn this feature off completely
* **maxRedirects**: How many redirects the updater should follow
* **maxSize**: Maximum feed size in bytes. If the RSS/Atom page is bigger than this value, the update will be aborted
* **feedFetcherTimeout**: Maximum number of seconds to wait for an RSS or Atom feed to load. If a feed takes longer than that number of seconds to update, the update will be aborted
Loading