Compare commits

..

56 Commits

Author SHA1 Message Date
Julius Härtl
48e6bae44a Bump version to 1.1.1
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-13 08:59:48 +02:00
Julius Härtl
c75463429e Merge pull request #2432 from nextcloud/backport/2367/stable1.1
[stable1.1] Properly handle multiple shares in a row and refactor sharee loading
2020-10-13 08:55:07 +02:00
Julius Härtl
3d3f2de781 Properly handle multiple shares in a row and refactor sharee loading
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-13 06:18:49 +00:00
Julius Härtl
2454df9a35 Merge pull request #2407 from nextcloud/dependabot/npm_and_yarn/stable1.1/sass-loader-10.0.3
Bump sass-loader from 10.0.2 to 10.0.3
2020-10-12 09:30:43 +02:00
dependabot[bot]
2a7a0e4c6d Bump sass-loader from 10.0.2 to 10.0.3
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 10.0.2 to 10.0.3.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v10.0.2...v10.0.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-12 07:23:39 +00:00
Julius Härtl
6edf265b78 Merge pull request #2425 from nextcloud/backport/2404/stable1.1
[stable1.1] Update Controls.vue
2020-10-12 08:55:41 +02:00
Flamenco
8e28f8e67c Update Controls.vue
Add padding to filter popup.
2020-10-12 06:50:17 +00:00
Julius Härtl
3b11c5c7ea Merge pull request #2416 from nextcloud/dependabot/npm_and_yarn/stable1.1/vue-router-3.4.6
Bump vue-router from 3.4.5 to 3.4.6
2020-10-12 08:43:45 +02:00
Julius Härtl
be05ec1b45 Merge pull request #2415 from nextcloud/dependabot/npm_and_yarn/stable1.1/url-loader-4.1.1
Bump url-loader from 4.1.0 to 4.1.1
2020-10-12 08:43:39 +02:00
Julius Härtl
b407f102fe Merge pull request #2411 from nextcloud/dependabot/npm_and_yarn/stable1.1/file-loader-6.1.1
Bump file-loader from 6.1.0 to 6.1.1
2020-10-12 08:43:31 +02:00
Julius Härtl
e82a2be836 Merge pull request #2420 from nextcloud/dependabot/npm_and_yarn/stable1.1/nextcloud/dialogs-3.0.0
Bump @nextcloud/dialogs from 2.0.1 to 3.0.0
2020-10-12 08:43:03 +02:00
Julius Härtl
d7f7cf584f Merge pull request #2418 from nextcloud/dependabot/npm_and_yarn/stable1.1/moment-2.29.1
Bump moment from 2.29.0 to 2.29.1
2020-10-12 08:42:27 +02:00
Julius Härtl
3fae174906 Merge pull request #2409 from nextcloud/dependabot/npm_and_yarn/stable1.1/nextcloud/vue-2.7.0
Bump @nextcloud/vue from 2.6.9 to 2.7.0
2020-10-12 08:32:12 +02:00
Julius Härtl
b58bba25bb Merge pull request #2413 from nextcloud/dependabot/npm_and_yarn/stable1.1/raw-loader-4.0.2
Bump raw-loader from 4.0.1 to 4.0.2
2020-10-12 08:31:48 +02:00
Julius Härtl
407acc47a4 Merge pull request #2422 from nextcloud/dependabot/npm_and_yarn/stable1.1/nextcloud/initial-state-1.2.0
Bump @nextcloud/initial-state from 1.1.2 to 1.2.0
2020-10-12 08:29:44 +02:00
dependabot[bot]
2ba19bd6fe Bump @nextcloud/initial-state from 1.1.2 to 1.2.0
Bumps [@nextcloud/initial-state](https://github.com/nextcloud/nextcloud-initial-state) from 1.1.2 to 1.2.0.
- [Release notes](https://github.com/nextcloud/nextcloud-initial-state/releases)
- [Changelog](https://github.com/nextcloud/nextcloud-initial-state/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/nextcloud-initial-state/compare/v1.1.2...v1.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-10 01:09:55 +00:00
dependabot[bot]
16e79dc616 Bump @nextcloud/dialogs from 2.0.1 to 3.0.0
Bumps [@nextcloud/dialogs](https://github.com/nextcloud/nextcloud-dialogs) from 2.0.1 to 3.0.0.
- [Release notes](https://github.com/nextcloud/nextcloud-dialogs/releases)
- [Changelog](https://github.com/nextcloud/nextcloud-dialogs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/nextcloud-dialogs/compare/v2.0.1...v3.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-10 01:08:41 +00:00
dependabot[bot]
f48187f28c Bump moment from 2.29.0 to 2.29.1
Bumps [moment](https://github.com/moment/moment) from 2.29.0 to 2.29.1.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.0...2.29.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-10 01:08:09 +00:00
dependabot[bot]
ea5aac3d27 Bump vue-router from 3.4.5 to 3.4.6
Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.4.5 to 3.4.6.
- [Release notes](https://github.com/vuejs/vue-router/releases)
- [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-router/compare/v3.4.5...v3.4.6)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-10 01:07:12 +00:00
dependabot[bot]
3487e06c8c Bump url-loader from 4.1.0 to 4.1.1
Bumps [url-loader](https://github.com/webpack-contrib/url-loader) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/webpack-contrib/url-loader/releases)
- [Changelog](https://github.com/webpack-contrib/url-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/url-loader/compare/v4.1.0...v4.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-10 01:06:42 +00:00
dependabot[bot]
fd253009f1 Bump raw-loader from 4.0.1 to 4.0.2
Bumps [raw-loader](https://github.com/webpack-contrib/raw-loader) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/webpack-contrib/raw-loader/releases)
- [Changelog](https://github.com/webpack-contrib/raw-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/raw-loader/compare/v4.0.1...v4.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-10 01:06:00 +00:00
dependabot[bot]
039d3e8238 Bump file-loader from 6.1.0 to 6.1.1
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v6.1.0...v6.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-10 01:04:39 +00:00
dependabot[bot]
31d759ee62 Bump @nextcloud/vue from 2.6.9 to 2.7.0
Bumps [@nextcloud/vue](https://github.com/nextcloud/nextcloud-vue) from 2.6.9 to 2.7.0.
- [Release notes](https://github.com/nextcloud/nextcloud-vue/releases)
- [Commits](https://github.com/nextcloud/nextcloud-vue/compare/v2.6.9...v2.7.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-10 01:04:10 +00:00
Julius Härtl
53a30585f3 Merge pull request #2395 from nextcloud/backport/2358/stable1.1
[stable1.1] Properly check if FTSEvent has an argument set
2020-10-07 23:06:19 +02:00
Julius Härtl
a2ebf3d3f0 Merge pull request #2396 from nextcloud/backport/2359/stable1.1
[stable1.1] Also exclude deleted items from calendar boards
2020-10-07 23:05:23 +02:00
Julius Härtl
5b7505c60c Also exclude deleted items from calendar boards
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-07 14:47:19 +00:00
Julius Härtl
516b15d3a1 Properly check if FTSEvent has an argument set
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-07 14:46:53 +00:00
Julius Härtl
6ac8cafd46 Merge pull request #2389 from nextcloud/dependabot/npm_and_yarn/stable1.1/jest-26.5.2
Bump jest from 26.4.2 to 26.5.2
2020-10-07 16:45:59 +02:00
dependabot[bot]
e5c65a67a7 Bump jest from 26.4.2 to 26.5.2
Bumps [jest](https://github.com/facebook/jest) from 26.4.2 to 26.5.2.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v26.4.2...v26.5.2)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-07 14:12:37 +00:00
Julius Härtl
7b72c93076 Merge pull request #2394 from nextcloud/dependabot/npm_and_yarn/stable1.1/babel-jest-26.5.2
Bump babel-jest from 26.3.0 to 26.5.2
2020-10-07 16:10:37 +02:00
Julius Härtl
f5550c456e Merge pull request #2393 from nextcloud/dependabot/npm_and_yarn/stable1.1/acorn-8.0.4
Bump acorn from 8.0.1 to 8.0.4
2020-10-07 16:10:30 +02:00
Julius Härtl
fb8b724e1b Merge pull request #2391 from nextcloud/dependabot/npm_and_yarn/stable1.1/style-loader-1.3.0
Bump style-loader from 1.2.1 to 1.3.0
2020-10-07 16:10:10 +02:00
Julius Härtl
a3da157aa4 Merge pull request #2387 from nextcloud/dependabot/npm_and_yarn/stable1.1/nextcloud/eslint-plugin-1.5.0
Bump @nextcloud/eslint-plugin from 1.4.0 to 1.5.0
2020-10-07 16:10:01 +02:00
Julius Härtl
0118c1e409 Merge pull request #2377 from nextcloud/dependabot/npm_and_yarn/stable1.1/eslint-plugin-import-2.22.1
Bump eslint-plugin-import from 2.22.0 to 2.22.1
2020-10-07 16:09:52 +02:00
Julius Härtl
9dbf45ca25 Merge pull request #2379 from nextcloud/dependabot/npm_and_yarn/stable1.1/vue-easymde-1.3.0
Bump vue-easymde from 1.2.2 to 1.3.0
2020-10-07 16:09:14 +02:00
Julius Härtl
184cb01f5a Merge pull request #2382 from nextcloud/dependabot/npm_and_yarn/stable1.1/vue-router-3.4.5
Bump vue-router from 3.4.4 to 3.4.5
2020-10-07 16:09:02 +02:00
Julius Härtl
b3a4cca482 Merge pull request #2383 from nextcloud/dependabot/npm_and_yarn/stable1.1/webpack-merge-5.2.0
Bump webpack-merge from 5.1.4 to 5.2.0
2020-10-07 16:08:52 +02:00
Julius Härtl
1272c672ae Merge pull request #2386 from nextcloud/dependabot/npm_and_yarn/stable1.1/nextcloud/vue-2.6.9
Bump @nextcloud/vue from 2.6.8 to 2.6.9
2020-10-07 16:07:50 +02:00
dependabot[bot]
214898c3d6 Bump babel-jest from 26.3.0 to 26.5.2
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 26.3.0 to 26.5.2.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v26.5.2/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-07 12:54:48 +00:00
dependabot[bot]
7ba20e71ee Bump acorn from 8.0.1 to 8.0.4
Bumps [acorn](https://github.com/acornjs/acorn) from 8.0.1 to 8.0.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/8.0.1...8.0.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-07 12:54:12 +00:00
dependabot[bot]
49f84c31fb Bump style-loader from 1.2.1 to 1.3.0
Bumps [style-loader](https://github.com/webpack-contrib/style-loader) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/webpack-contrib/style-loader/releases)
- [Changelog](https://github.com/webpack-contrib/style-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/style-loader/compare/v1.2.1...v1.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-07 12:53:48 +00:00
dependabot[bot]
69f56981f4 Bump @nextcloud/eslint-plugin from 1.4.0 to 1.5.0
Bumps [@nextcloud/eslint-plugin](https://github.com/nextcloud/eslint-plugin) from 1.4.0 to 1.5.0.
- [Release notes](https://github.com/nextcloud/eslint-plugin/releases)
- [Changelog](https://github.com/nextcloud/eslint-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/eslint-plugin/compare/v1.4.0...v1.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-07 12:51:54 +00:00
dependabot[bot]
7acd1a054e Bump @nextcloud/vue from 2.6.8 to 2.6.9
Bumps [@nextcloud/vue](https://github.com/nextcloud/nextcloud-vue) from 2.6.8 to 2.6.9.
- [Release notes](https://github.com/nextcloud/nextcloud-vue/releases)
- [Commits](https://github.com/nextcloud/nextcloud-vue/compare/v2.6.8...v2.6.9)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-07 12:51:26 +00:00
dependabot[bot]
ef90ab0b2a Bump webpack-merge from 5.1.4 to 5.2.0
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.1.4 to 5.2.0.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.1.4...v5.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-07 12:50:29 +00:00
dependabot[bot]
1a275b0884 Bump vue-router from 3.4.4 to 3.4.5
Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.4.4 to 3.4.5.
- [Release notes](https://github.com/vuejs/vue-router/releases)
- [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-router/compare/v3.4.4...v3.4.5)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-07 12:49:57 +00:00
dependabot[bot]
ffb25a7553 Bump vue-easymde from 1.2.2 to 1.3.0
Bumps [vue-easymde](https://github.com/NikulinIlya/vue-easymde) from 1.2.2 to 1.3.0.
- [Release notes](https://github.com/NikulinIlya/vue-easymde/releases)
- [Commits](https://github.com/NikulinIlya/vue-easymde/compare/v1.2.2...1.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-07 12:49:24 +00:00
dependabot[bot]
9a0476f538 Bump eslint-plugin-import from 2.22.0 to 2.22.1
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.22.0 to 2.22.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.22.0...v2.22.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-07 12:48:54 +00:00
Julius Härtl
9b9413c5e1 Merge pull request #2365 from nextcloud/backport/2361/stable1.1
[stable1.1] Comments do not depend on the comments app
2020-10-07 11:28:27 +02:00
Julius Härtl
e22c6e675b Merge pull request #2364 from nextcloud/backport/2363/stable1.1
[stable1.1] Use uid instead of displayname for sharee results
2020-10-07 11:28:00 +02:00
Julius Härtl
92a6cbce37 Merge pull request #2366 from nextcloud/bugfix/1.1-ci
Fix stable1.1 ci
2020-10-07 11:27:17 +02:00
Julius Härtl
871edf1a25 Revert "Fix travis setup on 18/19"
This reverts commit 05376a5d3a.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-06 23:59:24 +02:00
Julius Härtl
05376a5d3a Fix travis setup on 18/19
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-06 23:05:19 +02:00
Jakob Röhrl
5cc52526cf removeCommentCheck
Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
2020-10-06 21:02:07 +00:00
Julius Härtl
30bb429a57 Use uid instead of displayname for sharee results
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-06 14:06:07 +00:00
Julius Härtl
52cbd3d6d8 Test against stable releases
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-02 21:20:17 +02:00
Julius Härtl
15ae74249b 1.1.0 is for 18-20
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-02 21:11:16 +02:00
41 changed files with 1135 additions and 1147 deletions

131
.drone.yml Normal file
View File

@@ -0,0 +1,131 @@
kind: pipeline
name: checkers
steps:
- name: compatibility
image: nextcloudci/php7.3:latest
environment:
APP_NAME: deck
CORE_BRANCH: stable20
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
# Code checker
- ./occ app:check-code $APP_NAME -c strong-comparison
- ./occ app:check-code $APP_NAME -c deprecation
- cd apps/$APP_NAME/
- name: syntax-php7.2
image: nextcloudci/php7.2:latest
environment:
APP_NAME: deck
CORE_BRANCH: stable20
DB: sqlite
commands:
- composer install
- ./vendor/bin/parallel-lint --exclude ./vendor/ .
- name: syntax-php7.3
image: nextcloudci/php7.3:php7.3-2
environment:
APP_NAME: deck
CORE_BRANCH: stable20
DB: sqlite
commands:
- composer install
- ./vendor/bin/parallel-lint --exclude ./vendor/ .
- name: syntax-php7.4
image: nextcloudci/php7.4:latest
environment:
APP_NAME: deck
CORE_BRANCH: stable20
DB: sqlite
commands:
- composer install
- ./vendor/bin/parallel-lint --exclude ./vendor/ .
trigger:
branch:
- master
- stable*
event:
- pull_request
- push
---
kind: pipeline
name: unit-php7.3
steps:
- name: php7.3
image: nextcloudci/php7.3:latest
environment:
APP_NAME: deck
CORE_BRANCH: stable20
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
- 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.4
steps:
- name: php7.4
image: nextcloudci/php7.4:latest
environment:
APP_NAME: deck
CORE_BRANCH: stable20
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
- 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: integration
steps:
- name: integration
image: nextcloudci/php7.3:latest
environment:
APP_NAME: deck
CORE_BRANCH: stable20
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

View File

@@ -1,55 +0,0 @@
name: PHP AppCode Check
on:
pull_request:
push:
branches:
- master
- stable*
env:
APP_NAME: deck
jobs:
unit-tests:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['7.4']
server-versions: ['master', 'stable18', 'stable19', 'stable20']
name: AppCode check php${{ matrix.php-versions }}-${{ matrix.server-versions }}
steps:
- name: Checkout server
uses: actions/checkout@v2
with:
repository: nextcloud/server
ref: ${{ matrix.server-versions }}
- name: Checkout submodules
shell: bash
run: |
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
git submodule sync --recursive
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
- name: Checkout app
uses: actions/checkout@v2
with:
path: apps/${{ env.APP_NAME }}
- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v1
with:
php-version: ${{ matrix.php-versions }}
tools: phpunit
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite
- name: Checkout app
uses: actions/checkout@v2
with:
path: apps/${{ env.APP_NAME }}
- name: App code check
run: php occ app:check-code ${{ env.APP_NAME }}

View File

@@ -1,215 +0,0 @@
name: PHPUnit
on:
pull_request:
push:
branches:
- master
- stable*
env:
APP_NAME: deck
jobs:
php:
runs-on: ubuntu-latest
strategy:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['7.4']
databases: ['sqlite']
server-versions: ['master']
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
steps:
- name: Checkout server
uses: actions/checkout@v2
with:
repository: nextcloud/server
ref: ${{ matrix.server-versions }}
- name: Checkout submodules
shell: bash
run: |
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
git submodule sync --recursive
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
- name: Checkout app
uses: actions/checkout@v2
with:
path: apps/${{ env.APP_NAME }}
- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v1
with:
php-version: ${{ matrix.php-versions }}
tools: phpunit
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite
coverage: none
- name: Set up PHPUnit
working-directory: apps/${{ env.APP_NAME }}
run: composer i
- name: Set up Nextcloud
env:
DB_PORT: 4444
run: |
mkdir data
./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
./occ app:enable --force ${{ env.APP_NAME }}
php -S localhost:8080 &
- name: PHPUnit
working-directory: apps/${{ env.APP_NAME }}
run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml
- name: PHPUnit integration
working-directory: apps/${{ env.APP_NAME }}
run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.integration.xml
mysql:
runs-on: ubuntu-latest
strategy:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['7.3', '7.4']
databases: ['mysql']
server-versions: ['master']
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
services:
mysql:
image: mariadb
ports:
- 4444:3306/tcp
env:
MYSQL_ROOT_PASSWORD: rootpassword
options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5
steps:
- name: Checkout server
uses: actions/checkout@v2
with:
repository: nextcloud/server
ref: ${{ matrix.server-versions }}
- name: Checkout submodules
shell: bash
run: |
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
git submodule sync --recursive
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
- name: Checkout app
uses: actions/checkout@v2
with:
path: apps/${{ env.APP_NAME }}
- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v1
with:
php-version: ${{ matrix.php-versions }}
tools: phpunit
extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql
coverage: none
- name: Set up PHPUnit
working-directory: apps/${{ env.APP_NAME }}
run: composer i
- name: Set up Nextcloud
env:
DB_PORT: 4444
run: |
mkdir data
./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
./occ app:enable --force ${{ env.APP_NAME }}
php -S localhost:8080 &
- name: PHPUnit
working-directory: apps/${{ env.APP_NAME }}
run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml
- name: PHPUnit integration
working-directory: apps/${{ env.APP_NAME }}
run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.integration.xml
pgsql:
runs-on: ubuntu-latest
strategy:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['7.4']
databases: ['pgsql']
server-versions: ['master']
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
services:
postgres:
image: postgres
ports:
- 4444:5432/tcp
env:
POSTGRES_USER: root
POSTGRES_PASSWORD: rootpassword
POSTGRES_DB: nextcloud
options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
steps:
- name: Checkout server
uses: actions/checkout@v2
with:
repository: nextcloud/server
ref: ${{ matrix.server-versions }}
- name: Checkout submodules
shell: bash
run: |
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
git submodule sync --recursive
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
- name: Checkout app
uses: actions/checkout@v2
with:
path: apps/${{ env.APP_NAME }}
- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v1
with:
php-version: ${{ matrix.php-versions }}
tools: phpunit
extensions: mbstring, iconv, fileinfo, intl, pgsql, pdo_pgsql
coverage: none
- name: Set up PHPUnit
working-directory: apps/${{ env.APP_NAME }}
run: composer i
- name: Set up Nextcloud
env:
DB_PORT: 4444
run: |
mkdir data
./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
./occ app:enable --force ${{ env.APP_NAME }}
php -S localhost:8080 &
- name: PHPUnit
working-directory: apps/${{ env.APP_NAME }}
run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml
- name: PHPUnit integration
working-directory: apps/${{ env.APP_NAME }}
run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.integration.xml

43
.travis.yml Normal file
View File

@@ -0,0 +1,43 @@
language: php
services:
- mysql
php:
- 7.2
- 7.3
- 7.4
env:
- CORE_BRANCH=stable20 DB=mysql
- CORE_BRANCH=stable19 DB=mysql
- CORE_BRANCH=stable18 DB=mysql
matrix:
include:
- php: 7.2
env: "DB=sqlite CORE_BRANCH=stable20"
before_install:
- export PATH="$PWD/vendor/bin:$PATH"
- phpunit --version
- wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
- bash ./before_install.sh deck $CORE_BRANCH $DB
- cd ../server
before_script:
- cd apps/deck
- composer install --no-dev
- cd ../../
- ./occ app:enable deck
- cd apps/deck
script:
- composer install
- make test-unit
after_success:
- bash <(curl -s https://codecov.io/bash)
after_failure:
- cat ../../data/nextcloud.log
notifications:
email: false

View File

@@ -1,6 +1,17 @@
# Changelog
All notable changes to this project will be documented in this file.
## 1.1.1 - 2020-10-13
## Bugfixes
* [#2364](https://github.com/nextcloud/deck/pull/2364) Use uid instead of displayname for sharee results
* [#2365](https://github.com/nextcloud/deck/pull/2365) Comments do not depend on the comments app (@jakobroehrl)
* [#2395](https://github.com/nextcloud/deck/pull/2395) Fix failure if full text search app was enabled
* [#2396](https://github.com/nextcloud/deck/pull/2396) Also exclude deleted items from calendar boards
* [#2425](https://github.com/nextcloud/deck/pull/2425) Fix filter popover styling (@Flamenco)
* [#2432](https://github.com/nextcloud/deck/pull/2432) Properly handle multiple shares in a row and refactor sharee loading
## 1.1.0 - 2020-10-03
### Features

View File

@@ -23,15 +23,12 @@ install-deps: install-deps-js
install-deps-nodev: install-deps-js
composer install --no-dev
autoloader:
composer dump-autoload
install-deps-js:
npm ci
build: clean-dist install-deps build-js
release: clean-dist install-deps-nodev autoloader build-js
release: clean-dist install-deps-nodev build-js
build-js: install-deps-js
npm run build

29
appinfo/autoload.php Normal file
View File

@@ -0,0 +1,29 @@
<?php
/**
* @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net>
*
* @author Julius Härtl <jus@bitgrid.net>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Deck\AppInfo;
/**
* Additional autoloader registration, e.g. registering composer autoloaders
*/
require_once __DIR__ . '/../vendor/autoload.php';

View File

@@ -17,7 +17,7 @@
- 🚀 Get your project organized
</description>
<version>1.2.0-dev1</version>
<version>1.1.1</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="18" max-version="21" />
<nextcloud min-version="18" max-version="20" />
</dependencies>
<background-jobs>
<job>OCA\Deck\Cron\DeleteCron</job>

View File

@@ -1,38 +1,31 @@
{
"name": "nextcloud/deck",
"type": "project",
"license": "AGPLv3",
"authors": [
{
"name": "Julius Härtl",
"email": "jus@bitgrid.net"
}
],
"require": {
"cogpowered/finediff": "0.3.*"
},
"require-dev": {
"roave/security-advisories": "dev-master",
"christophwurst/nextcloud": "^17",
"jakub-onderka/php-parallel-lint": "^1.0.0",
"phpunit/phpunit": "^8",
"nextcloud/coding-standard": "^0.3.0",
"symfony/event-dispatcher": "^4.0"
},
"config": {
"optimize-autoloader": true,
"classmap-authoritative": true,
"vendor-dir": "composer",
"autoloader-suffix": "Deck"
},
"autoload" : {
"psr-4": {
"OCA\\Deck\\": "lib/"
}
},
"scripts": {
"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
"cs:check": "php-cs-fixer fix --dry-run --diff",
"cs:fix": "php-cs-fixer fix"
}
"name": "nextcloud/deck",
"type": "project",
"license": "AGPLv3",
"authors": [
{
"name": "Julius Härtl",
"email": "jus@bitgrid.net"
}
],
"require": {
"cogpowered/finediff": "0.3.*"
},
"require-dev": {
"roave/security-advisories": "dev-master",
"christophwurst/nextcloud": "^17",
"jakub-onderka/php-parallel-lint": "^1.0.0",
"phpunit/phpunit": "^8",
"nextcloud/coding-standard": "^0.3.0",
"symfony/event-dispatcher": "^4.0"
},
"config": {
"optimize-autoloader": true,
"classmap-authoritative": true
},
"scripts": {
"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
"cs:check": "php-cs-fixer fix --dry-run --diff",
"cs:fix": "php-cs-fixer fix"
}
}

View File

@@ -160,7 +160,6 @@ OC.L10N.register(
"Archive all cards in this list" : "Archivovat všechny karty v tomto seznamu",
"Add a new card" : "Přidat novou kartu",
"Card name" : "Název karty",
"List deleted" : "Seznam smazán",
"Edit" : "Upravit",
"Add a new tag" : "Přidat nový štítek",
"title and color value must be provided" : "je třeba zadat nadpis a zvolit barvu",
@@ -210,7 +209,6 @@ OC.L10N.register(
"Move card" : "Přesunout kartu",
"Move card to another board" : "Přesunout kartu na jinou tabuli",
"Select a list" : "Vyberte sloupec",
"Card deleted" : "Karta smazána",
"seconds ago" : "před několika sekundami",
"All boards" : "Všechny tabule",
"Archived boards" : "Archivované tabule",

View File

@@ -158,7 +158,6 @@
"Archive all cards in this list" : "Archivovat všechny karty v tomto seznamu",
"Add a new card" : "Přidat novou kartu",
"Card name" : "Název karty",
"List deleted" : "Seznam smazán",
"Edit" : "Upravit",
"Add a new tag" : "Přidat nový štítek",
"title and color value must be provided" : "je třeba zadat nadpis a zvolit barvu",
@@ -208,7 +207,6 @@
"Move card" : "Přesunout kartu",
"Move card to another board" : "Přesunout kartu na jinou tabuli",
"Select a list" : "Vyberte sloupec",
"Card deleted" : "Karta smazána",
"seconds ago" : "před několika sekundami",
"All boards" : "Všechny tabule",
"Archived boards" : "Archivované tabule",

View File

@@ -160,7 +160,6 @@ OC.L10N.register(
"Archive all cards in this list" : "Alle Karten in dieser Liste archivieren",
"Add a new card" : "Neue Karte hinzufügen",
"Card name" : "Kartenname",
"List deleted" : "Liste gelöscht",
"Edit" : "Bearbeiten",
"Add a new tag" : "Neues Schlagwort hinzufügen",
"title and color value must be provided" : "Titel und Farbwert müssen angegeben werden",
@@ -210,7 +209,6 @@ OC.L10N.register(
"Move card" : "Karte verschieben",
"Move card to another board" : "Karte auf ein anderes Board verschieben",
"Select a list" : "Eine Liste auswählen",
"Card deleted" : "Karte gelöscht",
"seconds ago" : "Gerade eben",
"All boards" : "Alle Boards",
"Archived boards" : "Archivierte Boards",

View File

@@ -158,7 +158,6 @@
"Archive all cards in this list" : "Alle Karten in dieser Liste archivieren",
"Add a new card" : "Neue Karte hinzufügen",
"Card name" : "Kartenname",
"List deleted" : "Liste gelöscht",
"Edit" : "Bearbeiten",
"Add a new tag" : "Neues Schlagwort hinzufügen",
"title and color value must be provided" : "Titel und Farbwert müssen angegeben werden",
@@ -208,7 +207,6 @@
"Move card" : "Karte verschieben",
"Move card to another board" : "Karte auf ein anderes Board verschieben",
"Select a list" : "Eine Liste auswählen",
"Card deleted" : "Karte gelöscht",
"seconds ago" : "Gerade eben",
"All boards" : "Alle Boards",
"Archived boards" : "Archivierte Boards",

View File

@@ -160,7 +160,6 @@ OC.L10N.register(
"Archive all cards in this list" : "Alle Karten in dieser Liste archivieren",
"Add a new card" : "Neue Karte hinzufügen",
"Card name" : "Kartenname",
"List deleted" : "Liste gelöscht",
"Edit" : "Bearbeiten",
"Add a new tag" : "Neues Schlagwort hinzufügen",
"title and color value must be provided" : "Titel und Farbwert müssen angegeben werden",
@@ -210,7 +209,6 @@ OC.L10N.register(
"Move card" : "Karte verschieben",
"Move card to another board" : "Karte auf ein anderes Board verschieben",
"Select a list" : "Eine Liste auswählen",
"Card deleted" : "Karte gelöscht",
"seconds ago" : "Gerade eben",
"All boards" : "Alle Boards",
"Archived boards" : "Archivierte Boards",

View File

@@ -158,7 +158,6 @@
"Archive all cards in this list" : "Alle Karten in dieser Liste archivieren",
"Add a new card" : "Neue Karte hinzufügen",
"Card name" : "Kartenname",
"List deleted" : "Liste gelöscht",
"Edit" : "Bearbeiten",
"Add a new tag" : "Neues Schlagwort hinzufügen",
"title and color value must be provided" : "Titel und Farbwert müssen angegeben werden",
@@ -208,7 +207,6 @@
"Move card" : "Karte verschieben",
"Move card to another board" : "Karte auf ein anderes Board verschieben",
"Select a list" : "Eine Liste auswählen",
"Card deleted" : "Karte gelöscht",
"seconds ago" : "Gerade eben",
"All boards" : "Alle Boards",
"Archived boards" : "Archivierte Boards",

View File

@@ -160,7 +160,6 @@ OC.L10N.register(
"Archive all cards in this list" : "Archivar todas las tarjetas en esta lista",
"Add a new card" : "Añadir una nueva tarjeta",
"Card name" : "Nombre de la tarjeta",
"List deleted" : "Lista borrada",
"Edit" : "Editar",
"Add a new tag" : "Añade una nueva etiqueta",
"title and color value must be provided" : "Se debe indicar un valor para título y color ",
@@ -210,7 +209,6 @@ OC.L10N.register(
"Move card" : "Mover tarjeta",
"Move card to another board" : "Mover la tarjeta a otro tablero",
"Select a list" : "Seleccionar una lista",
"Card deleted" : "Tarjeta borrada",
"seconds ago" : "hace unos segundos",
"All boards" : "Todos los tableros",
"Archived boards" : "Tableros archivados",

View File

@@ -158,7 +158,6 @@
"Archive all cards in this list" : "Archivar todas las tarjetas en esta lista",
"Add a new card" : "Añadir una nueva tarjeta",
"Card name" : "Nombre de la tarjeta",
"List deleted" : "Lista borrada",
"Edit" : "Editar",
"Add a new tag" : "Añade una nueva etiqueta",
"title and color value must be provided" : "Se debe indicar un valor para título y color ",
@@ -208,7 +207,6 @@
"Move card" : "Mover tarjeta",
"Move card to another board" : "Mover la tarjeta a otro tablero",
"Select a list" : "Seleccionar una lista",
"Card deleted" : "Tarjeta borrada",
"seconds ago" : "hace unos segundos",
"All boards" : "Todos los tableros",
"Archived boards" : "Tableros archivados",

View File

@@ -92,9 +92,6 @@ OC.L10N.register(
"List name" : "Listan nimi",
"Apply filter" : "Toteuta suodatus",
"Filter by tag" : "Suodata tunnisteen perusteella",
"Filter by assigned user" : "Suodata määritetyn käyttäjän mukaan",
"Unassigned" : "Määrittämätön",
"Filter by due date" : "Suodata määräpäivän mukaan",
"Overdue" : "Myöhässä",
"Next 24 hours" : "Seuraavat 24 tuntia",
"Next 7 days" : "Seuraavat 7 päivää",

View File

@@ -90,9 +90,6 @@
"List name" : "Listan nimi",
"Apply filter" : "Toteuta suodatus",
"Filter by tag" : "Suodata tunnisteen perusteella",
"Filter by assigned user" : "Suodata määritetyn käyttäjän mukaan",
"Unassigned" : "Määrittämätön",
"Filter by due date" : "Suodata määräpäivän mukaan",
"Overdue" : "Myöhässä",
"Next 24 hours" : "Seuraavat 24 tuntia",
"Next 7 days" : "Seuraavat 7 päivää",

View File

@@ -160,7 +160,6 @@ OC.L10N.register(
"Archive all cards in this list" : "Arquivar todas as tarxetas desta lista",
"Add a new card" : "Engadir unha nova tarxeta",
"Card name" : "Nome da tarxeta",
"List deleted" : "Lista eliminada",
"Edit" : "Editar",
"Add a new tag" : "Engadir unha nova etiqueta",
"title and color value must be provided" : "debe indicar o título e o valor da cor",
@@ -210,7 +209,6 @@ OC.L10N.register(
"Move card" : "Mover a tarxeta",
"Move card to another board" : "Mover a tarxeta a outro taboleiro",
"Select a list" : "Seleccionar unha lista",
"Card deleted" : "Tarxeta eliminada",
"seconds ago" : "hai uns segundos",
"All boards" : "Todos os taboleiros",
"Archived boards" : "Taboleiros arquivados",

View File

@@ -158,7 +158,6 @@
"Archive all cards in this list" : "Arquivar todas as tarxetas desta lista",
"Add a new card" : "Engadir unha nova tarxeta",
"Card name" : "Nome da tarxeta",
"List deleted" : "Lista eliminada",
"Edit" : "Editar",
"Add a new tag" : "Engadir unha nova etiqueta",
"title and color value must be provided" : "debe indicar o título e o valor da cor",
@@ -208,7 +207,6 @@
"Move card" : "Mover a tarxeta",
"Move card to another board" : "Mover a tarxeta a outro taboleiro",
"Select a list" : "Seleccionar unha lista",
"Card deleted" : "Tarxeta eliminada",
"seconds ago" : "hai uns segundos",
"All boards" : "Todos os taboleiros",
"Archived boards" : "Taboleiros arquivados",

View File

@@ -160,7 +160,6 @@ OC.L10N.register(
"Archive all cards in this list" : "Archivia tutte le schede in questo elenco",
"Add a new card" : "Aggiungi una nuova scheda",
"Card name" : "Nome scheda",
"List deleted" : "Elenco eliminato",
"Edit" : "Modifica",
"Add a new tag" : "Aggiungi una nuova etichetta",
"title and color value must be provided" : "devono essere forniti il titolo e il valore del colore",
@@ -210,7 +209,6 @@ OC.L10N.register(
"Move card" : "Sposta scheda",
"Move card to another board" : "Sposta scheda in un'altra lavagna",
"Select a list" : "Seleziona un elenco",
"Card deleted" : "Scheda eliminata",
"seconds ago" : "secondi fa",
"All boards" : "Tutte le lavagne",
"Archived boards" : "Lavagne archiviate",

View File

@@ -158,7 +158,6 @@
"Archive all cards in this list" : "Archivia tutte le schede in questo elenco",
"Add a new card" : "Aggiungi una nuova scheda",
"Card name" : "Nome scheda",
"List deleted" : "Elenco eliminato",
"Edit" : "Modifica",
"Add a new tag" : "Aggiungi una nuova etichetta",
"title and color value must be provided" : "devono essere forniti il titolo e il valore del colore",
@@ -208,7 +207,6 @@
"Move card" : "Sposta scheda",
"Move card to another board" : "Sposta scheda in un'altra lavagna",
"Select a list" : "Seleziona un elenco",
"Card deleted" : "Scheda eliminata",
"seconds ago" : "secondi fa",
"All boards" : "Tutte le lavagne",
"Archived boards" : "Lavagne archiviate",

View File

@@ -160,7 +160,6 @@ OC.L10N.register(
"Archive all cards in this list" : "Zarchiwizuj wszystkie karty na tej liście",
"Add a new card" : "Dodaj nową kartę",
"Card name" : "Nazwa karty",
"List deleted" : "Lista usunięta",
"Edit" : "Edycja",
"Add a new tag" : "Dodaj nową etykietę",
"title and color value must be provided" : "należy podać tytuł i kolor",
@@ -210,7 +209,6 @@ OC.L10N.register(
"Move card" : "Przenieś kartę",
"Move card to another board" : "Przenieś kartę na inną tablicę",
"Select a list" : "Wybierz listę",
"Card deleted" : "Karta usunięta",
"seconds ago" : "przed chwilą",
"All boards" : "Wszystkie tablice",
"Archived boards" : "Zarchiwizowane tablice",

View File

@@ -158,7 +158,6 @@
"Archive all cards in this list" : "Zarchiwizuj wszystkie karty na tej liście",
"Add a new card" : "Dodaj nową kartę",
"Card name" : "Nazwa karty",
"List deleted" : "Lista usunięta",
"Edit" : "Edycja",
"Add a new tag" : "Dodaj nową etykietę",
"title and color value must be provided" : "należy podać tytuł i kolor",
@@ -208,7 +207,6 @@
"Move card" : "Przenieś kartę",
"Move card to another board" : "Przenieś kartę na inną tablicę",
"Select a list" : "Wybierz listę",
"Card deleted" : "Karta usunięta",
"seconds ago" : "przed chwilą",
"All boards" : "Wszystkie tablice",
"Archived boards" : "Zarchiwizowane tablice",

View File

@@ -160,7 +160,6 @@ OC.L10N.register(
"Archive all cards in this list" : "Arquivar todos os cartões desta lista",
"Add a new card" : "Adicionar um novo cartão",
"Card name" : "Nome do cartão",
"List deleted" : "Lista excluída",
"Edit" : "Editar",
"Add a new tag" : "Adicionar uma nova etiqueta",
"title and color value must be provided" : "o título e o valor da cor devem ser fornecidos",
@@ -192,7 +191,6 @@ OC.L10N.register(
"Select Date" : "Selecionar Data",
"Modified" : "Modificado",
"Created" : "Criado",
"The title cannot be empty." : "O título não pode ficar em branco.",
"No comments yet. Begin the discussion!" : "Nenhum comentário ainda. Inicie a conversa!",
"Save" : "Salvar",
"The comment cannot be empty." : "O comentário não pode zer vazio.",
@@ -210,7 +208,6 @@ OC.L10N.register(
"Move card" : "Mover cartão",
"Move card to another board" : "Mover o cartão para outro painel",
"Select a list" : "Selecione uma lista",
"Card deleted" : "Cartão excluído",
"seconds ago" : "segundos atrás",
"All boards" : "Todos os painéis",
"Archived boards" : "Painéis arquivados",
@@ -219,7 +216,6 @@ OC.L10N.register(
"Show boards in calendar/tasks" : "Mostrar painéis em calendários/tarefas",
"Limit deck usage of groups" : "Limitar o uso de grupos no deck",
"Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Limitar o Deck impedirá que usuários que não fazem parte desses grupos criem seus próprios painéis. Os usuários ainda poderão trabalhar em pastas que foram compartilhadas com eles.",
"Board name" : "Nome do painel",
"Edit board" : "Editar painel",
"Clone board " : "Clonar painel",
"Unarchive board " : "Desarquivar painel",

View File

@@ -158,7 +158,6 @@
"Archive all cards in this list" : "Arquivar todos os cartões desta lista",
"Add a new card" : "Adicionar um novo cartão",
"Card name" : "Nome do cartão",
"List deleted" : "Lista excluída",
"Edit" : "Editar",
"Add a new tag" : "Adicionar uma nova etiqueta",
"title and color value must be provided" : "o título e o valor da cor devem ser fornecidos",
@@ -190,7 +189,6 @@
"Select Date" : "Selecionar Data",
"Modified" : "Modificado",
"Created" : "Criado",
"The title cannot be empty." : "O título não pode ficar em branco.",
"No comments yet. Begin the discussion!" : "Nenhum comentário ainda. Inicie a conversa!",
"Save" : "Salvar",
"The comment cannot be empty." : "O comentário não pode zer vazio.",
@@ -208,7 +206,6 @@
"Move card" : "Mover cartão",
"Move card to another board" : "Mover o cartão para outro painel",
"Select a list" : "Selecione uma lista",
"Card deleted" : "Cartão excluído",
"seconds ago" : "segundos atrás",
"All boards" : "Todos os painéis",
"Archived boards" : "Painéis arquivados",
@@ -217,7 +214,6 @@
"Show boards in calendar/tasks" : "Mostrar painéis em calendários/tarefas",
"Limit deck usage of groups" : "Limitar o uso de grupos no deck",
"Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Limitar o Deck impedirá que usuários que não fazem parte desses grupos criem seus próprios painéis. Os usuários ainda poderão trabalhar em pastas que foram compartilhadas com eles.",
"Board name" : "Nome do painel",
"Edit board" : "Editar painel",
"Clone board " : "Clonar painel",
"Unarchive board " : "Desarquivar painel",

View File

@@ -67,14 +67,13 @@ OC.L10N.register(
"Deck" : "Deck",
"Changes in the <strong>Deck app</strong>" : "Spremembe v programu <strong>Deck</strong>",
"A <strong>comment</strong> was created on a card" : "Nalogi je dodana nova <strong>opomba</strong>",
"Upcoming cards" : "Prihajajoče naloge",
"Personal" : "Osebno",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "Nalogo »%s« na »%s« vam dodeli %s.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} vam dodeli nalogo »%s« na »%s«.",
"The card \"%s\" on \"%s\" has reached its due date." : "Naloga »%s« na »%s« je dosegla datum preteka.",
"%s has mentioned you in a comment on \"%s\"." : "%s vas omeni v opombi na »%s«.",
"{user} has mentioned you in a comment on \"%s\"." : "{user} vas omeni v opombi na »%s«.",
"The board \"%s\" has been shared with you by %s." : "Zbirko »%s« vam dodeli %s.",
"The board \"%s\" has been shared with you by %s." : "Zborko »%s« vam dodeli %s.",
"{user} has shared the board %s with you." : "{user} vam omogoča souporabo zbirke %s.",
"No data was provided to create an attachment." : "Ni podanih podatkov za ustvarjanje priloge.",
"Finished" : "Končano",
@@ -135,8 +134,6 @@ OC.L10N.register(
"Toggle compact mode" : "Preklopi način prikaza",
"Details" : "Podrobnosti",
"Loading board" : "Poteka nalaganje zbirke",
"No lists available" : "Ni razpoložljivih seznamov",
"Create a new list to add cards to this board" : "Ustvari nov seznam in doda kartice v zbirko",
"Board not found" : "Zbirke ni mogoče najti",
"Sharing" : "Souporaba",
"Tags" : "Oznake",
@@ -154,13 +151,9 @@ OC.L10N.register(
"Can manage" : "Lahko upravlja",
"Delete" : "Izbriši",
"Add a new list" : "Dodaj nov seznam",
"Archive all cards" : "Arhiviraj vse kartice",
"Delete list" : "Izbriši seznam",
"Add card" : "Dodaj nalogo",
"Archive all cards in this list" : "Arhiviraj vse kartice tega seznama",
"Add a new card" : "Dodaj novo nalogo",
"Card name" : "Ime kartice",
"List deleted" : "Seznam je izbrisan",
"Edit" : "Uredi",
"Add a new tag" : "Dodaj novo oznako",
"title and color value must be provided" : "navedena morata biti podatka naslova in barve",
@@ -170,8 +163,6 @@ OC.L10N.register(
"Add this attachment" : "Dodaj prilogo",
"Delete Attachment" : "Izbriši prilogo",
"Restore Attachment" : "Obnovi prilogo",
"Open in sidebar view" : "Odpri v bočnem pogledu",
"Open in bigger view" : "Odpri v povečanem pogledu",
"Assign a tag to this card…" : "Dodeli oznako nalogi ...",
"Assign to users" : "Dodeli uporabnikom",
"Assign to users/groups/circles" : "Dodeli uporabnikom/skupinam/krogom",
@@ -192,7 +183,6 @@ OC.L10N.register(
"Select Date" : "Izbor datuma",
"Modified" : "Spremenjeno",
"Created" : "Ustvarjeno",
"The title cannot be empty." : "Polje naslova ne sme biti prazno.",
"No comments yet. Begin the discussion!" : "Ni še odzivov, bodite prvi!",
"Save" : "Shrani",
"The comment cannot be empty." : "Polje opombe ne sme biti prazno.",
@@ -210,16 +200,12 @@ OC.L10N.register(
"Move card" : "Premakni nalogo",
"Move card to another board" : "Premakni nalogo v drugo zbirko",
"Select a list" : "Izbor seznama",
"Card deleted" : "Naloga je izbrisana",
"seconds ago" : "pred nekaj sekundami",
"All boards" : "Vse zbirke",
"Archived boards" : "Arhivirane zbirke",
"Shared with you" : "V souporabi z vami",
"Use modal card view" : "Uporabi modalni pogled nalog",
"Show boards in calendar/tasks" : "Pokaži zbirke v koledarjem in med opravili",
"Limit deck usage of groups" : "Omeji uporabo zbirk na skupine",
"Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Omejevanje programa prepreči uporabnikom, ki niso del teh skupin, ustvarjanje novih zbirk. Uporabniki bodo še vedno lahko spreminjali zbirke, ki so jih dobili v souporabo.",
"Board name" : "Ime zbirke",
"Edit board" : "Uredi zbirko",
"Clone board " : "Kloniraj zbirko",
"Unarchive board " : "Povrni zbirko iz arhiva",
@@ -230,13 +216,9 @@ OC.L10N.register(
"An error occurred" : "Prišlo je do napake.",
"Are you sure you want to delete the board {title}? This will delete all the data of this board." : "Ali ste prepričani, da želite izbrisati zbirko »{title}«? S tem boste izbrisali tudi vse podatke zbirke.",
"Delete the board?" : "Ali želite izbrisati zbirko?",
"Loading filtered view" : "Poteka nalaganje filtriranega pogleda",
"Today" : "Danes",
"Tomorrow" : "Jutri",
"This week" : "Ta teden",
"No due" : "Ni datuma preteka",
"No upcoming cards" : "Ni prihajajočih nalog",
"upcoming cards" : "prihajajoče naloge",
"Link to a board" : "Povezava do zbirke",
"Link to a card" : "Povezava do naloge",
"Something went wrong" : "Prišlo je do napake ...",

View File

@@ -65,14 +65,13 @@
"Deck" : "Deck",
"Changes in the <strong>Deck app</strong>" : "Spremembe v programu <strong>Deck</strong>",
"A <strong>comment</strong> was created on a card" : "Nalogi je dodana nova <strong>opomba</strong>",
"Upcoming cards" : "Prihajajoče naloge",
"Personal" : "Osebno",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "Nalogo »%s« na »%s« vam dodeli %s.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} vam dodeli nalogo »%s« na »%s«.",
"The card \"%s\" on \"%s\" has reached its due date." : "Naloga »%s« na »%s« je dosegla datum preteka.",
"%s has mentioned you in a comment on \"%s\"." : "%s vas omeni v opombi na »%s«.",
"{user} has mentioned you in a comment on \"%s\"." : "{user} vas omeni v opombi na »%s«.",
"The board \"%s\" has been shared with you by %s." : "Zbirko »%s« vam dodeli %s.",
"The board \"%s\" has been shared with you by %s." : "Zborko »%s« vam dodeli %s.",
"{user} has shared the board %s with you." : "{user} vam omogoča souporabo zbirke %s.",
"No data was provided to create an attachment." : "Ni podanih podatkov za ustvarjanje priloge.",
"Finished" : "Končano",
@@ -133,8 +132,6 @@
"Toggle compact mode" : "Preklopi način prikaza",
"Details" : "Podrobnosti",
"Loading board" : "Poteka nalaganje zbirke",
"No lists available" : "Ni razpoložljivih seznamov",
"Create a new list to add cards to this board" : "Ustvari nov seznam in doda kartice v zbirko",
"Board not found" : "Zbirke ni mogoče najti",
"Sharing" : "Souporaba",
"Tags" : "Oznake",
@@ -152,13 +149,9 @@
"Can manage" : "Lahko upravlja",
"Delete" : "Izbriši",
"Add a new list" : "Dodaj nov seznam",
"Archive all cards" : "Arhiviraj vse kartice",
"Delete list" : "Izbriši seznam",
"Add card" : "Dodaj nalogo",
"Archive all cards in this list" : "Arhiviraj vse kartice tega seznama",
"Add a new card" : "Dodaj novo nalogo",
"Card name" : "Ime kartice",
"List deleted" : "Seznam je izbrisan",
"Edit" : "Uredi",
"Add a new tag" : "Dodaj novo oznako",
"title and color value must be provided" : "navedena morata biti podatka naslova in barve",
@@ -168,8 +161,6 @@
"Add this attachment" : "Dodaj prilogo",
"Delete Attachment" : "Izbriši prilogo",
"Restore Attachment" : "Obnovi prilogo",
"Open in sidebar view" : "Odpri v bočnem pogledu",
"Open in bigger view" : "Odpri v povečanem pogledu",
"Assign a tag to this card…" : "Dodeli oznako nalogi ...",
"Assign to users" : "Dodeli uporabnikom",
"Assign to users/groups/circles" : "Dodeli uporabnikom/skupinam/krogom",
@@ -190,7 +181,6 @@
"Select Date" : "Izbor datuma",
"Modified" : "Spremenjeno",
"Created" : "Ustvarjeno",
"The title cannot be empty." : "Polje naslova ne sme biti prazno.",
"No comments yet. Begin the discussion!" : "Ni še odzivov, bodite prvi!",
"Save" : "Shrani",
"The comment cannot be empty." : "Polje opombe ne sme biti prazno.",
@@ -208,16 +198,12 @@
"Move card" : "Premakni nalogo",
"Move card to another board" : "Premakni nalogo v drugo zbirko",
"Select a list" : "Izbor seznama",
"Card deleted" : "Naloga je izbrisana",
"seconds ago" : "pred nekaj sekundami",
"All boards" : "Vse zbirke",
"Archived boards" : "Arhivirane zbirke",
"Shared with you" : "V souporabi z vami",
"Use modal card view" : "Uporabi modalni pogled nalog",
"Show boards in calendar/tasks" : "Pokaži zbirke v koledarjem in med opravili",
"Limit deck usage of groups" : "Omeji uporabo zbirk na skupine",
"Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them." : "Omejevanje programa prepreči uporabnikom, ki niso del teh skupin, ustvarjanje novih zbirk. Uporabniki bodo še vedno lahko spreminjali zbirke, ki so jih dobili v souporabo.",
"Board name" : "Ime zbirke",
"Edit board" : "Uredi zbirko",
"Clone board " : "Kloniraj zbirko",
"Unarchive board " : "Povrni zbirko iz arhiva",
@@ -228,13 +214,9 @@
"An error occurred" : "Prišlo je do napake.",
"Are you sure you want to delete the board {title}? This will delete all the data of this board." : "Ali ste prepričani, da želite izbrisati zbirko »{title}«? S tem boste izbrisali tudi vse podatke zbirke.",
"Delete the board?" : "Ali želite izbrisati zbirko?",
"Loading filtered view" : "Poteka nalaganje filtriranega pogleda",
"Today" : "Danes",
"Tomorrow" : "Jutri",
"This week" : "Ta teden",
"No due" : "Ni datuma preteka",
"No upcoming cards" : "Ni prihajajočih nalog",
"upcoming cards" : "prihajajoče naloge",
"Link to a board" : "Povezava do zbirke",
"Link to a card" : "Povezava do naloge",
"Something went wrong" : "Prišlo je do napake ...",

View File

@@ -23,7 +23,7 @@
namespace OCA\Deck\AppInfo;
$version = \OCP\Util::getVersion()[0];
$version = \OC_Util::getVersion()[0];
if ($version >= 20) {
class Application extends Application20 {
}

View File

@@ -24,6 +24,7 @@
namespace OCA\Deck\AppInfo;
use Exception;
use OC_Util;
use OCA\Deck\Activity\CommentEventHandler;
use OCA\Deck\Capabilities;
use OCA\Deck\Collaboration\Resources\ResourceProvider;
@@ -171,7 +172,7 @@ class ApplicationLegacy extends App {
}
protected function registerCollaborationResources(): void {
$version = \OCP\Util::getVersion()[0];
$version = OC_Util::getVersion()[0];
if ($version < 16) {
return;
}

View File

@@ -97,13 +97,13 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
// FIXME: One moving to QBMapper we should allow filtering the boards probably by method chaining for additional where clauses
$sql = 'SELECT id, title, owner, color, archived, deleted_at, 0 as shared, last_modified FROM `*PREFIX*deck_boards` WHERE owner = ? AND last_modified > ?';
if (!$includeArchived) {
$sql .= ' AND NOT archived';
$sql .= ' AND NOT archived AND deleted_at = 0';
}
$sql .= ' UNION ' .
'SELECT boards.id, title, owner, color, archived, deleted_at, 1 as shared, last_modified FROM `*PREFIX*deck_boards` as boards ' .
'JOIN `*PREFIX*deck_board_acl` as acl ON boards.id=acl.board_id WHERE acl.participant=? AND acl.type=? AND boards.owner != ? AND last_modified > ?';
if (!$includeArchived) {
$sql .= ' AND NOT archived';
$sql .= ' AND NOT archived AND deleted_at = 0';
}
$entries = $this->findEntities($sql, [$userId, $since, $userId, Acl::PERMISSION_TYPE_USER, $userId, $since], $limit, $offset);
/* @var Board $entry */
@@ -142,7 +142,7 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
}
$sql .= ')';
if (!$includeArchived) {
$sql .= ' AND NOT archived';
$sql .= ' AND NOT archived AND deleted_at = 0';
}
$entries = $this->findEntities($sql, array_merge([$userId, Acl::PERMISSION_TYPE_GROUP], $groups), $limit, $offset);
/* @var Board $entry */
@@ -174,7 +174,7 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
}
$sql .= ')';
if (!$includeArchived) {
$sql .= ' AND NOT archived';
$sql .= ' AND NOT archived AND deleted_at = 0';
}
$entries = $this->findEntities($sql, array_merge([$userId, Acl::PERMISSION_TYPE_CIRCLE], $circles), $limit, $offset);
/* @var Board $entry */

View File

@@ -42,7 +42,7 @@ class FTSEvent extends Event {
}
public function getArgument($key) {
if ($this->hasArgument($key)) {
if (isset($this->arguments[$key])) {
return $this->arguments[$key];
}

View File

@@ -532,7 +532,7 @@ class BoardService {
$this->changeHelper->boardChanged($boardId);
// TODO: use the dispatched event for this
$version = \OCP\Util::getVersion()[0];
$version = \OC_Util::getVersion()[0];
if ($version >= 16) {
try {
$resourceProvider = \OC::$server->query(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
@@ -621,7 +621,7 @@ class BoardService {
$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $acl, ActivityManager::SUBJECT_BOARD_UNSHARE);
$this->changeHelper->boardChanged($acl->getBoardId());
$version = \OCP\Util::getVersion()[0];
$version = \OC_Util::getVersion()[0];
if ($version >= 16) {
try {
$resourceProvider = \OC::$server->query(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);

1521
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -33,21 +33,21 @@
"@juliushaertl/vue-richtext": "^0.3.3",
"@nextcloud/auth": "^1.3.0",
"@nextcloud/axios": "^1.4.0",
"@nextcloud/dialogs": "^2.0.1",
"@nextcloud/dialogs": "^3.0.0",
"@nextcloud/event-bus": "^1.2.0",
"@nextcloud/files": "^1.1.0",
"@nextcloud/initial-state": "^1.1.2",
"@nextcloud/initial-state": "^1.2.0",
"@nextcloud/l10n": "^1.4.1",
"@nextcloud/moment": "^1.1.1",
"@nextcloud/router": "^1.2.0",
"@nextcloud/vue": "^2.6.8",
"@nextcloud/vue": "^2.7.0",
"@nextcloud/vue-dashboard": "^1.0.1",
"blueimp-md5": "^2.18.0",
"dompurify": "^2.1.1",
"lodash": "^4.17.20",
"markdown-it": "^11.0.1",
"markdown-it-task-lists": "^2.1.1",
"moment": "^2.29.0",
"moment": "^2.29.1",
"nextcloud-vue-collections": "^0.8.1",
"p-queue": "^6.6.1",
"url-search-params-polyfill": "^8.1.0",
@@ -56,7 +56,7 @@
"vue-click-outside": "^1.1.0",
"vue-easymde": "^1.3.0",
"vue-infinite-loading": "^2.4.5",
"vue-router": "^3.4.5",
"vue-router": "^3.4.6",
"vue-smooth-dnd": "^0.8.1",
"vuex": "^3.5.1",
"vuex-router-sync": "^5.0.0"
@@ -73,12 +73,12 @@
"@babel/preset-env": "^7.11.5",
"@nextcloud/browserslist-config": "^1.0.0",
"@nextcloud/eslint-config": "^2.1.0",
"@nextcloud/eslint-plugin": "^1.4.0",
"@nextcloud/eslint-plugin": "^1.5.0",
"@nextcloud/webpack-vue-config": "^1.4.1",
"@vue/test-utils": "^1.1.0",
"acorn": "^8.0.3",
"acorn": "^8.0.4",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.3.0",
"babel-jest": "^26.5.2",
"babel-loader": "^8.1.0",
"css-loader": "^4.3.0",
"eslint": "^6.8.0",
@@ -90,27 +90,27 @@
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-vue": "^6.2.2",
"file-loader": "^6.1.0",
"jest": "^26.4.2",
"file-loader": "^6.1.1",
"jest": "^26.5.2",
"jest-serializer-vue": "^2.0.2",
"minimist": "^1.2.5",
"node-sass": "^4.14.1",
"raw-loader": "^4.0.1",
"sass-loader": "^10.0.2",
"style-loader": "^1.2.1",
"raw-loader": "^4.0.2",
"sass-loader": "^10.0.3",
"style-loader": "^1.3.0",
"stylelint": "^13.7.2",
"stylelint-config-recommended": "^3.0.0",
"stylelint-config-recommended-scss": "^4.2.0",
"stylelint-scss": "^3.18.0",
"stylelint-webpack-plugin": "^2.1.0",
"url-loader": "^4.1.0",
"url-loader": "^4.1.1",
"vue-jest": "^3.0.7",
"vue-loader": "^15.9.3",
"vue-template-compiler": "^2.6.12",
"webpack": "^4.44.2",
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0",
"webpack-merge": "^5.1.4"
"webpack-merge": "^5.2.0"
},
"jest": {
"moduleFileExtensions": [

View File

@@ -395,6 +395,7 @@ export default {
width: 250px;
max-height: 80vh;
overflow: auto;
padding: 8px;
}
.filter h3 {

View File

@@ -7,10 +7,19 @@
:options="formatedSharees"
:user-select="true"
label="displayName"
:loading="isLoading || !!isSearching"
:disabled="isLoading"
track-by="multiselectKey"
:internal-search="true"
@input="clickAddAcl"
@search-change="asyncFind" />
@search-change="asyncFind">
<template #noOptions>
{{ isSearching ? t('deck', 'Searching for users, groups and circles ...') : t('deck', 'No participants found') }}
</template>
<template #noResult>
{{ isSearching ? t('deck', 'Searching for users, groups and circles ...') : t('deck', 'No participants found') }}
</template>
</Multiselect>
<ul
id="shareWithList"
@@ -63,6 +72,7 @@ import { Avatar, Multiselect, Actions, ActionButton, ActionCheckbox } from '@nex
import { CollectionList } from 'nextcloud-vue-collections'
import { mapGetters, mapState } from 'vuex'
import { getCurrentUser } from '@nextcloud/auth'
import { showError } from '@nextcloud/dialogs'
export default {
name: 'SharingTabSidebar',
@@ -83,6 +93,7 @@ export default {
data() {
return {
isLoading: false,
isSearching: false,
addAcl: null,
addAclForAPI: null,
}
@@ -137,13 +148,20 @@ export default {
this.asyncFind('')
},
methods: {
asyncFind(query) {
this.isLoading = true
this.$store.dispatch('loadSharees', query).then(response => {
this.isLoading = false
})
async asyncFind(query) {
// manual debounce to handle async searching more easily and have more control over the loading state
const timestamp = (new Date()).getTime()
if (!this.isSearching || timestamp > this.isSearching + 300) {
this.isSearching = timestamp
await this.$store.dispatch('loadSharees', query)
// only reset searching flag if the most recent search finished
if (this.isSearching === timestamp) {
this.isSearching = false
}
}
},
clickAddAcl() {
async clickAddAcl() {
this.addAclForAPI = {
type: this.addAcl.value.shareType,
participant: this.addAcl.value.shareWith,
@@ -151,7 +169,16 @@ export default {
permissionShare: false,
permissionManage: false,
}
this.$store.dispatch('addAclToCurrentBoard', this.addAclForAPI)
this.isLoading = true
try {
await this.$store.dispatch('addAclToCurrentBoard', this.addAclForAPI)
} catch (e) {
const errorMessage = t('deck', 'Failed to create share with {displayName}', { displayName: this.addAcl.displayName })
console.error(errorMessage, e)
showError(errorMessage)
}
this.addAcl = null
this.isLoading = false
},
clickEditAcl(acl) {
this.addAclForAPI = Object.assign({}, acl)

View File

@@ -117,11 +117,9 @@ import { mapGetters, mapState } from 'vuex'
import { Container, Draggable } from 'vue-smooth-dnd'
import { Actions, ActionButton, Modal } from '@nextcloud/vue'
import { showError, showUndo } from '@nextcloud/dialogs'
import { showError } from '@nextcloud/dialogs'
import CardItem from '../cards/CardItem'
import '@nextcloud/dialogs/styles/toast.scss'
export default {
name: 'Stack',
components: {
@@ -212,7 +210,6 @@ export default {
},
deleteStack(stack) {
this.$store.dispatch('deleteStack', stack)
showUndo(t('deck', 'List deleted'), () => this.$store.dispatch('stackUndoDelete', stack))
},
archiveAllCardsFromStack(stack) {

View File

@@ -75,8 +75,6 @@ import { mapGetters, mapState } from 'vuex'
import axios from '@nextcloud/axios'
import { generateUrl } from '@nextcloud/router'
import { getCurrentUser } from '@nextcloud/auth'
import { showUndo } from '@nextcloud/dialogs'
import '@nextcloud/dialogs/styles/toast.scss'
export default {
name: 'CardMenu',
@@ -131,7 +129,6 @@ export default {
},
deleteCard() {
this.$store.dispatch('deleteCard', this.card)
showUndo(t('deck', 'Card deleted'), () => this.$store.dispatch('cardUndoDelete', this.card))
},
archiveUnarchiveCard() {
this.$store.dispatch('archiveUnarchiveCard', { ...this.card, archived: !this.card.archived })

View File

@@ -34,7 +34,6 @@ import comment from './comment'
import trashbin from './trashbin'
import attachment from './attachment'
import overview from './overview'
import debounce from 'lodash/debounce'
Vue.use(Vuex)
const apiClient = new BoardApi()
@@ -392,7 +391,7 @@ export default new Vuex.Store({
const boards = await apiClient.loadBoards()
commit('setBoards', boards)
},
loadSharees: debounce(function({ commit }, query) {
async loadSharees({ commit }, query) {
const params = new URLSearchParams()
if (typeof query === 'undefined') {
return
@@ -402,10 +401,9 @@ export default new Vuex.Store({
params.append('perPage', 20)
params.append('itemType', [0, 1, 7])
axios.get(generateOcsUrl('apps/files_sharing/api/v1') + 'sharees', { params }).then((response) => {
commit('setSharees', response.data.ocs.data)
})
}, 250),
const response = await axios.get(generateOcsUrl('apps/files_sharing/api/v1') + 'sharees', { params })
commit('setSharees', response.data.ocs.data)
},
setBoardFilter({ commmit }, filter) {
commmit('setBoardFilter', filter)
@@ -454,13 +452,11 @@ export default new Vuex.Store({
},
// acl actions
addAclToCurrentBoard({ dispatch, commit }, newAcl) {
async addAclToCurrentBoard({ dispatch, commit }, newAcl) {
newAcl.boardId = this.state.currentBoard.id
apiClient.addAcl(newAcl)
.then((returnAcl) => {
commit('addAclToCurrentBoard', returnAcl)
dispatch('refreshBoard', newAcl.boardId)
})
const result = await apiClient.addAcl(newAcl)
commit('addAclToCurrentBoard', result)
dispatch('refreshBoard', newAcl.boardId)
},
updateAclFromCurrentBoard({ commit }, acl) {
acl.boardId = this.state.currentBoard.id