Compare commits
45 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
634ae1103c | ||
|
|
69b6fc4d0a | ||
|
39a575782b | ||
|
|
ee47a82e62 | ||
|
|
5bd6752bc5 | ||
|
|
37cf13b141 | ||
|
|
1ce0643c6b | ||
|
|
ccc02e23b6 | ||
|
|
d1812b6801 | ||
|
|
6c0da2bea1 | ||
|
|
474dac00ff | ||
|
|
a599ffe992 | ||
|
|
e92f581049 | ||
|
|
07c53f8b4f | ||
|
|
112c809112 | ||
|
|
d8d1df7c74 | ||
|
|
5f75bebe6e | ||
|
|
227833d322 | ||
|
|
cf889e566b | ||
|
|
56a0a605cd | ||
|
|
87e6be6d10 | ||
|
|
3728e4b0d5 | ||
|
|
cfef011f03 | ||
|
|
0a82c0a137 | ||
|
|
b09d3d00b4 | ||
|
|
7c905528e7 | ||
|
|
aeba3787a3 | ||
|
|
033965d1cb | ||
|
|
0b5bc05116 | ||
|
|
2dc8e219f0 | ||
|
|
cd3b201ae8 | ||
|
|
daddeaa109 | ||
|
|
07ad95ee8c | ||
|
|
0882b15825 | ||
|
|
32f2561267 | ||
|
|
d54ee14268 | ||
|
|
013505bd4e | ||
|
|
83631f2888 | ||
|
|
83017ba262 | ||
|
|
0be1f13015 | ||
|
|
764b08e80b | ||
|
|
b8caa922ab | ||
|
|
c4a23ad4ff | ||
|
|
fe538b87a7 | ||
|
|
d178a4501b |
22
.drone.yml
22
.drone.yml
@@ -5,7 +5,7 @@ steps:
|
|||||||
image: nextcloudci/php7.2:php7.2-13
|
image: nextcloudci/php7.2:php7.2-13
|
||||||
environment:
|
environment:
|
||||||
APP_NAME: deck
|
APP_NAME: deck
|
||||||
CORE_BRANCH: master
|
CORE_BRANCH: stable17
|
||||||
DB: sqlite
|
DB: sqlite
|
||||||
commands:
|
commands:
|
||||||
# Pre-setup steps
|
# Pre-setup steps
|
||||||
@@ -20,7 +20,7 @@ steps:
|
|||||||
image: nextcloudci/php7.2:php7.2-13
|
image: nextcloudci/php7.2:php7.2-13
|
||||||
environment:
|
environment:
|
||||||
APP_NAME: deck
|
APP_NAME: deck
|
||||||
CORE_BRANCH: master
|
CORE_BRANCH: stable17
|
||||||
DB: sqlite
|
DB: sqlite
|
||||||
commands:
|
commands:
|
||||||
- composer install
|
- composer install
|
||||||
@@ -29,7 +29,7 @@ steps:
|
|||||||
image: nextcloudci/php7.3:php7.3-2
|
image: nextcloudci/php7.3:php7.3-2
|
||||||
environment:
|
environment:
|
||||||
APP_NAME: deck
|
APP_NAME: deck
|
||||||
CORE_BRANCH: master
|
CORE_BRANCH: stable17
|
||||||
DB: sqlite
|
DB: sqlite
|
||||||
commands:
|
commands:
|
||||||
- composer install
|
- composer install
|
||||||
@@ -38,7 +38,7 @@ steps:
|
|||||||
image: nextcloudci/php7.4:2
|
image: nextcloudci/php7.4:2
|
||||||
environment:
|
environment:
|
||||||
APP_NAME: deck
|
APP_NAME: deck
|
||||||
CORE_BRANCH: master
|
CORE_BRANCH: stable17
|
||||||
DB: sqlite
|
DB: sqlite
|
||||||
commands:
|
commands:
|
||||||
- composer install
|
- composer install
|
||||||
@@ -58,7 +58,7 @@ steps:
|
|||||||
image: nextcloudci/php7.2:php7.2-13
|
image: nextcloudci/php7.2:php7.2-13
|
||||||
environment:
|
environment:
|
||||||
APP_NAME: deck
|
APP_NAME: deck
|
||||||
CORE_BRANCH: master
|
CORE_BRANCH: stable17
|
||||||
DB: sqlite
|
DB: sqlite
|
||||||
commands:
|
commands:
|
||||||
# Pre-setup steps
|
# Pre-setup steps
|
||||||
@@ -68,8 +68,8 @@ steps:
|
|||||||
- php occ app:enable deck
|
- php occ app:enable deck
|
||||||
- cd apps/$APP_NAME
|
- cd apps/$APP_NAME
|
||||||
- composer install
|
- composer install
|
||||||
- phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
|
- ./vendor/bin/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
|
- ./vendor/bin/phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
|
||||||
trigger:
|
trigger:
|
||||||
branch:
|
branch:
|
||||||
- master
|
- master
|
||||||
@@ -85,7 +85,7 @@ steps:
|
|||||||
image: nextcloudci/php7.3:php7.3-5
|
image: nextcloudci/php7.3:php7.3-5
|
||||||
environment:
|
environment:
|
||||||
APP_NAME: deck
|
APP_NAME: deck
|
||||||
CORE_BRANCH: master
|
CORE_BRANCH: stable17
|
||||||
DB: sqlite
|
DB: sqlite
|
||||||
commands:
|
commands:
|
||||||
# Pre-setup steps
|
# Pre-setup steps
|
||||||
@@ -95,8 +95,8 @@ steps:
|
|||||||
- php occ app:enable deck
|
- php occ app:enable deck
|
||||||
- cd apps/$APP_NAME
|
- cd apps/$APP_NAME
|
||||||
- composer install
|
- composer install
|
||||||
- phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
|
- ./vendor/bin/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
|
- ./vendor/bin/phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
|
||||||
trigger:
|
trigger:
|
||||||
branch:
|
branch:
|
||||||
- master
|
- master
|
||||||
@@ -112,7 +112,7 @@ steps:
|
|||||||
image: nextcloudci/php7.2:php7.2-13
|
image: nextcloudci/php7.2:php7.2-13
|
||||||
environment:
|
environment:
|
||||||
APP_NAME: deck
|
APP_NAME: deck
|
||||||
CORE_BRANCH: master
|
CORE_BRANCH: stable17
|
||||||
DB: sqlite
|
DB: sqlite
|
||||||
commands:
|
commands:
|
||||||
# Pre-setup steps
|
# Pre-setup steps
|
||||||
|
|||||||
@@ -1,31 +1,31 @@
|
|||||||
build/
|
/build/
|
||||||
.git
|
/.git
|
||||||
js/node_modules
|
/js/node_modules
|
||||||
js/tests
|
/js/tests
|
||||||
js/legacy
|
/js/legacy
|
||||||
js/controller
|
/js/controller
|
||||||
js/directive
|
/js/directive
|
||||||
js/filters
|
/js/filters
|
||||||
js/service
|
/js/service
|
||||||
js/bower.json
|
/js/bower.json
|
||||||
js/.bowerrc
|
/js/.bowerrc
|
||||||
js/.jshintrc
|
/js/.jshintrc
|
||||||
js/Gruntfile.js
|
/js/Gruntfile.js
|
||||||
js/package.json
|
/js/package.json
|
||||||
js/package-lock.json
|
/js/package-lock.json
|
||||||
docs/
|
/docs/
|
||||||
tests
|
/tests
|
||||||
.codecov.yml
|
/.codecov.yml
|
||||||
composer.json
|
/composer.json
|
||||||
composer.lock
|
/composer.lock
|
||||||
_config.yml
|
/_config.yml
|
||||||
.drone.yml
|
/.drone.yml
|
||||||
.travis.yml
|
/.travis.yml
|
||||||
.eslintignore
|
/.eslintignore
|
||||||
.eslintrc.yml
|
/.eslintrc.yml
|
||||||
.gitignore
|
/.gitignore
|
||||||
issue_template.md
|
/issue_template.md
|
||||||
krankerl.toml
|
/krankerl.toml
|
||||||
Makefile
|
/Makefile
|
||||||
mkdocs.yml
|
/mkdocs.yml
|
||||||
run-eslint.sh
|
/run-eslint.sh
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ php:
|
|||||||
- 7.2
|
- 7.2
|
||||||
- 7.3
|
- 7.3
|
||||||
env:
|
env:
|
||||||
- CORE_BRANCH=master DB=mysql
|
- CORE_BRANCH=stable17 DB=mysql
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- export PATH="$PWD/vendor/bin:$PATH"
|
- export PATH="$PWD/vendor/bin:$PATH"
|
||||||
|
|||||||
11
CHANGELOG.md
11
CHANGELOG.md
@@ -1,6 +1,17 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
|
## 0.8.3 - 2020-06-26
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Bump dependencies
|
||||||
|
|
||||||
|
## 0.8.2 - 2020-04-08
|
||||||
|
|
||||||
|
## Fixed
|
||||||
|
- Fix build with missing javascript bundles
|
||||||
|
|
||||||
## 0.8.1 - 2020-04-08
|
## 0.8.1 - 2020-04-08
|
||||||
|
|
||||||
## Added
|
## Added
|
||||||
|
|||||||
12
Makefile
12
Makefile
@@ -81,16 +81,8 @@ test: test-unit test-integration
|
|||||||
|
|
||||||
test-unit:
|
test-unit:
|
||||||
mkdir -p build/
|
mkdir -p build/
|
||||||
ifeq (, $(shell which phpunit 2> /dev/null))
|
./vendor/bin/phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
|
||||||
@echo "No phpunit command available, downloading a copy from the web"
|
./vendor/bin/phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
|
||||||
mkdir -p $(build_tools_directory)
|
|
||||||
curl -sSL https://phar.phpunit.de/phpunit-8.2.phar -o $(build_tools_directory)/phpunit.phar
|
|
||||||
php $(build_tools_directory)/phpunit.phar -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
|
|
||||||
php $(build_tools_directory)/phpunit.phar -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
|
|
||||||
else
|
|
||||||
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
|
|
||||||
endif
|
|
||||||
|
|
||||||
test-integration:
|
test-integration:
|
||||||
cd tests/integration && ./run.sh
|
cd tests/integration && ./run.sh
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
- 🚀 Get your project organized
|
- 🚀 Get your project organized
|
||||||
|
|
||||||
</description>
|
</description>
|
||||||
<version>0.8.1</version>
|
<version>0.8.3</version>
|
||||||
<licence>agpl</licence>
|
<licence>agpl</licence>
|
||||||
<author>Julius Härtl</author>
|
<author>Julius Härtl</author>
|
||||||
<namespace>Deck</namespace>
|
<namespace>Deck</namespace>
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
<database min-version="9.4">pgsql</database>
|
<database min-version="9.4">pgsql</database>
|
||||||
<database>sqlite</database>
|
<database>sqlite</database>
|
||||||
<database min-version="5.5">mysql</database>
|
<database min-version="5.5">mysql</database>
|
||||||
<nextcloud min-version="17" max-version="19" />
|
<nextcloud min-version="17" max-version="17" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<background-jobs>
|
<background-jobs>
|
||||||
<job>OCA\Deck\Cron\DeleteCron</job>
|
<job>OCA\Deck\Cron\DeleteCron</job>
|
||||||
|
|||||||
@@ -15,6 +15,6 @@
|
|||||||
"roave/security-advisories": "dev-master",
|
"roave/security-advisories": "dev-master",
|
||||||
"christophwurst/nextcloud": "^17",
|
"christophwurst/nextcloud": "^17",
|
||||||
"jakub-onderka/php-parallel-lint": "^1.0.0",
|
"jakub-onderka/php-parallel-lint": "^1.0.0",
|
||||||
"phpunit/phpunit": "^8"
|
"phpunit/phpunit": "6.5.*"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
4295
js/package-lock.json
generated
4295
js/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -7,12 +7,12 @@
|
|||||||
"test": "tests"
|
"test": "tests"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@uirouter/angularjs": "^1.0.25",
|
"@uirouter/angularjs": "^1.0.28",
|
||||||
"angular": "^1.7.9",
|
"angular": "^1.8.0",
|
||||||
"angular-animate": "^1.7.9",
|
"angular-animate": "^1.8.0",
|
||||||
"angular-file-upload": "^2.5.0",
|
"angular-file-upload": "^2.6.1",
|
||||||
"angular-markdown-it": "^0.6.1",
|
"angular-markdown-it": "^0.6.1",
|
||||||
"angular-sanitize": "^1.7.9",
|
"angular-sanitize": "^1.8.0",
|
||||||
"babel-polyfill": "^6.26.0",
|
"babel-polyfill": "^6.26.0",
|
||||||
"markdown-it": "^10.0.0",
|
"markdown-it": "^10.0.0",
|
||||||
"markdown-it-link-target": "^1.0.2",
|
"markdown-it-link-target": "^1.0.2",
|
||||||
@@ -22,25 +22,26 @@
|
|||||||
"ng-infinite-scroll": "^1.3.0",
|
"ng-infinite-scroll": "^1.3.0",
|
||||||
"ng-sortable": "^1.3.8",
|
"ng-sortable": "^1.3.8",
|
||||||
"ui-select": "^0.19.8",
|
"ui-select": "^0.19.8",
|
||||||
"vue": "^2.6.11",
|
"vue": "^2.6.12",
|
||||||
"vuex": "^3.1.3"
|
"vuex": "^3.5.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.9.0",
|
"@babel/core": "^7.11.4",
|
||||||
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
||||||
"@babel/polyfill": "^7.8.7",
|
"@babel/polyfill": "^7.10.4",
|
||||||
"@babel/preset-env": "^7.9.0",
|
"@babel/preset-env": "^7.11.0",
|
||||||
"babel-loader": "^8.1.0",
|
"babel-loader": "^8.1.0",
|
||||||
"css-loader": "^3.4.2",
|
"css-loader": "^3.6.0",
|
||||||
"karma": "^4.4.1",
|
"karma": "^5.1.1",
|
||||||
"mini-css-extract-plugin": "^0.9.0",
|
"mini-css-extract-plugin": "^0.9.0",
|
||||||
"style-loader": "^1.1.3",
|
"minimist": "^1.2.5",
|
||||||
"url-loader": "^4.0.0",
|
"style-loader": "^1.2.1",
|
||||||
"vue-loader": "^15.9.1",
|
"url-loader": "^4.1.0",
|
||||||
|
"vue-loader": "^15.9.3",
|
||||||
"vue-style-loader": "^4.1.2",
|
"vue-style-loader": "^4.1.2",
|
||||||
"vue-template-compiler": "^2.6.11",
|
"vue-template-compiler": "^2.6.12",
|
||||||
"webpack": "^4.42.1",
|
"webpack": "^4.44.1",
|
||||||
"webpack-cli": "^3.3.11",
|
"webpack-cli": "^3.3.12",
|
||||||
"webpack-merge": "^4.2.2"
|
"webpack-merge": "^4.2.2"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ class ActivityManagerTest extends TestCase {
|
|||||||
if (strpos($constant, 'SUBJECT') === 0) {
|
if (strpos($constant, 'SUBJECT') === 0) {
|
||||||
$format = $this->activityManager->getActivityFormat($value, [], false);
|
$format = $this->activityManager->getActivityFormat($value, [], false);
|
||||||
if ($format !== '') {
|
if ($format !== '') {
|
||||||
$this->assertStringContainsString('{user}', $format);
|
$this->assertContains('{user}', $format);
|
||||||
} else {
|
} else {
|
||||||
/** @noinspection ForgottenDebugOutputInspection */
|
/** @noinspection ForgottenDebugOutputInspection */
|
||||||
print_r('No activity string found for '. $constant . PHP_EOL);
|
print_r('No activity string found for '. $constant . PHP_EOL);
|
||||||
|
|||||||
Reference in New Issue
Block a user