Merge branch 'master' into dependabot/npm_and_yarn/js/vue-loader-15.7.1

.drone.yml

@@ -16,20 +16,11 @@ steps:
     - ./occ app:check-code $APP_NAME -c strong-comparison
     - ./occ app:check-code $APP_NAME -c deprecation
     - cd apps/$APP_NAME/
-- name: syntax-php7.0
-  image: nextcloudci/php7.0:php7.0-17
-  environment:
-    APP_NAME: deck
-    CORE_BRANCH: stable15
-    DB: sqlite
-  commands:
-    - composer install
-    - ./vendor/bin/parallel-lint --exclude ./vendor/ --exclude ./lib/Collaboration/ .
 - name: syntax-php7.1
   image: nextcloudci/php7.1:php7.1-15
   environment:
     APP_NAME: deck
-    CORE_BRANCH: stable15
+    CORE_BRANCH: master
     DB: sqlite
   commands:
     - composer install
@@ -38,7 +29,7 @@ steps:
   image: nextcloudci/php7.2:php7.2-9
   environment:
     APP_NAME: deck
-    CORE_BRANCH: stable15
+    CORE_BRANCH: master
     DB: sqlite
   commands:
     - composer install
@@ -47,7 +38,7 @@ steps:
   image: nextcloudci/php7.3:php7.3-2
   environment:
     APP_NAME: deck
-    CORE_BRANCH: stable15
+    CORE_BRANCH: master
     DB: sqlite
   commands:
     - composer install
@@ -61,41 +52,13 @@ trigger:
     - push
 ---
 kind: pipeline
-name: unit-php7.0
-steps:
-  - name: php7.0
-    image: nextcloudci/php7.0:php7.0-17
-    environment:
-      APP_NAME: deck
-      CORE_BRANCH: stable15
-      DB: sqlite
-    commands:
-      # Pre-setup steps
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server/
-      - php occ app:enable deck
-      - cd apps/$APP_NAME
-      # Run phpunit tests
-      - composer install
-      - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
-      - phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
----
-kind: pipeline
 name: unit-php7.1
 steps:
   - name: php7.1
     image: nextcloudci/php7.1:php7.1-15
     environment:
       APP_NAME: deck
-      CORE_BRANCH: stable15
+      CORE_BRANCH: master
       DB: sqlite
     commands:
       # Pre-setup steps
@@ -122,7 +85,7 @@ steps:
     image: nextcloudci/php7.2:php7.2-9
     environment:
       APP_NAME: deck
-      CORE_BRANCH: stable15
+      CORE_BRANCH: master
       DB: sqlite
     commands:
       # Pre-setup steps
@@ -149,7 +112,7 @@ steps:
     image: nextcloudci/php7.3:php7.3-2
     environment:
       APP_NAME: deck
-      CORE_BRANCH: stable15
+      CORE_BRANCH: master
       DB: sqlite
     commands:
       # Pre-setup steps
@@ -170,39 +133,13 @@ trigger:
     - push
 ---
 kind: pipeline
-name: integration-stable16
+name: integration
 steps:
   - name: integration
     image: nextcloudci/php7.1:php7.1-16
     environment:
       APP_NAME: deck
-      CORE_BRANCH: stable16
+      CORE_BRANCH: master
-      DB: sqlite
-    commands:
-      # Pre-setup steps
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server/
-      - php occ app:enable deck
-      - cd apps/$APP_NAME
-      - cd tests/integration
-      - ./run.sh || true
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
----
-kind: pipeline
-name: integration-stable15
-steps:
-  - name: integration
-    image: nextcloudci/php7.1:php7.1-16
-    environment:
-      APP_NAME: deck
-      CORE_BRANCH: stable15
       DB: sqlite
     commands:
       # Pre-setup steps

.travis.yml

@@ -2,12 +2,11 @@ language: php
 services:
     - mysql
 php:
-    - 7.0
     - 7.1
     - 7.2
     - 7.3
 env:
-    - CORE_BRANCH=stable15 DB=mysql
+    - CORE_BRANCH=master DB=mysql
 
 before_install:
     - wget https://phar.phpunit.de/phpunit-5.7.phar

appinfo/info.xml

@@ -17,7 +17,7 @@
 - 🚀 Get your project organized
 
 </description>
-    <version>0.6.4</version>
+    <version>0.7.0</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
     <namespace>Deck</namespace>
@@ -36,7 +36,7 @@
         <database min-version="9.4">pgsql</database>
         <database>sqlite</database>
         <database min-version="5.5">mysql</database>
-        <nextcloud min-version="15" max-version="17" />
+        <nextcloud min-version="17" max-version="17" />
     </dependencies>
     <background-jobs>
         <job>OCA\Deck\Cron\DeleteCron</job>

js/package.json

@@ -17,7 +17,7 @@
     "markdown-it": "^9.0.1",
     "markdown-it-link-target": "^1.0.2",
     "nextcloud-axios": "^0.2.0",
-    "nextcloud-vue": "^0.11.4",
+    "nextcloud-vue": "^0.11.5",
     "nextcloud-vue-collections": "^0.5.4",
     "ng-infinite-scroll": "^1.3.0",
     "ng-sortable": "^1.3.8",