Merge pull request #751 from owncloud/next

Changes for 8.1

94 files changed, 1454 insertions, 734 deletions

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index b6946f8cb..765700a18 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -9,16 +9,18 @@ filter:
         - 'css/*'
         - 'bin/*'
         - 'tmp/*'
+        - 'appinfo/routes.php'
         - 'appinfo/application.php'
+        - 'tests/*'
 
 imports:
     #- javascript  disabled because of es6 producing tons of errors
     - php
     - javascript
 
-tools:
-    external_code_coverage:
-        timeout: 600
+#tools:
+#    external_code_coverage:
+#        timeout: 600
 
 checks:
     php:
diff --git a/.travis.yml b/.travis.yml
index 870f44ffc..db08fb591 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,10 +30,11 @@ install:
     - sudo easy_install3 requests
     - sudo easy_install3 ocdev
     # clone core
-    - ocdev setup core --dir owncloud --branch stable8 --no-history
+    - ocdev setup core --dir owncloud --branch master --no-history
     - mv news owncloud/apps/
 
 before_script:
+    - phpenv config-add owncloud/apps/news/tests/travis/php.ini
     # set up databases and users for postgres and mysql
     - createuser -U travis -s oc_autotest
     - mysql -e 'create database oc_autotest;'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d682b493..5c7c85403 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+owncloud-news (5.3.0)
+* **Enhancement**: Make it possible to search articles in the search field. To migrate older articles to this functionality, check the README section "Updating from versions prior to 5.3.0", #185
+* **Enhancement**: Stop video and audio playba