Skip to content

Commit

Permalink
Merge pull request #100 from nextcloud/bump-version
Browse files Browse the repository at this point in the history
Bump version
  • Loading branch information
nickvergessen authored Apr 11, 2022
2 parents 468a230 + 82705ae commit 195c461
Show file tree
Hide file tree
Showing 7 changed files with 799 additions and 567 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ nbproject

# Tests - auto-generated files
/build
/.php_cs.cache
/.php-cs-fixer.cache
/tests/coverage*
/tests/clover.xml
/tests/.phpunit.result.cache
Expand Down
File renamed without changes.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Changelog
All notable changes to this project will be documented in this file.

## 1.14.0
### Changed
- Nextcloud 24 compatibility

## 1.13.1 – 2022-02-23
### Fixed
- Mark background job as time insensitive
Expand Down
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ appstore: clean
--exclude=/translationfiles \
--exclude=/.tx \
--exclude=/tests \
--exclude=/vendor \
--exclude=/.git \
--exclude=/.github \
--exclude=/l10n/l10n.pl \
Expand All @@ -39,9 +40,12 @@ appstore: clean
--exclude=/README.md \
--exclude=/.gitattributes \
--exclude=/.gitignore \
--exclude=/.scrutinizer.yml \
--exclude=/.travis.yml \
--exclude=/.php-cs-fixer.cache \
--exclude=/.php-cs-fixer.dist.php \
--exclude=/composer.json \
--exclude=/composer.lock \
--exclude=/Makefile \
--exclude=/psalm.xml \
$(project_dir)/ $(sign_dir)/$(app_name)
@if [ -f $(cert_dir)/$(app_name).key ]; then \
echo "Signing app files…"; \
Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<description>This app sends notifications to users when they reached 85, 90 and 95% of their quota (checked once a day).
In addition an email can be sent to the users. The three percentages can be changed in the admin settings.
It is also possible to have a link in the email and the notification for upsell options.</description>
<version>1.13.1</version>
<version>1.14.0</version>
<licence>agpl</licence>
<author>Joas Schilling</author>
<namespace>QuotaWarning</namespace>
Expand All @@ -23,7 +23,7 @@ It is also possible to have a link in the email and the notification for upsell
<screenshot>https://raw.githubusercontent.com/nextcloud/quota_warning/master/docs/email.png</screenshot>
<screenshot>https://raw.githubusercontent.com/nextcloud/quota_warning/master/docs/admin-settings.png</screenshot>
<dependencies>
<nextcloud min-version="22" max-version="23" />
<nextcloud min-version="22" max-version="24" />
</dependencies>
<repair-steps>
<install>
Expand Down
14 changes: 6 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@
"name": "nextcloud/notifications",
"description": "notifications",
"license": "AGPL",
"require": {
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"nextcloud/coding-standard": "^0.5.0",
"christophwurst/nextcloud": "dev-master@dev",
"vimeo/psalm": "^4.3.2"
},
"config": {
"optimize-autoloader": true,
"classmap-authoritative": true,
Expand All @@ -31,5 +23,11 @@
"psalm:update-baseline": "psalm --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml",
"psalm:clear": "psalm --clear-cache && psalm --clear-global-cache",
"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"nextcloud/coding-standard": "^1.0.0",
"christophwurst/nextcloud": "dev-master",
"vimeo/psalm": "^4.22.0"
}
}
Loading

0 comments on commit 195c461

Please sign in to comment.