From 94f8159fdc3c5f6c2153082a2457161790a90ec3 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Tue, 27 Aug 2019 18:37:42 +0200 Subject: [PATCH] prepare release 1.2 (#1059) --- .github_changelog_generator | 2 +- CHANGELOG.md | 5 +++++ SECURITY.md | 4 ++-- UPGRADING.md | 2 +- src/Constants.php | 2 +- src/Migrations/Version20190729162655.php | 15 +++++++++++++++ 6 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.github_changelog_generator b/.github_changelog_generator index 7e4fc10b..bd731fc3 100644 --- a/.github_changelog_generator +++ b/.github_changelog_generator @@ -1,5 +1,5 @@ unreleased=true -future-release=1.1 +future-release=1.2 exclude-labels=duplicate,question,invalid,wontfix,release enhancement_labels=>enhancement,Enhancement,feature request,translation i18n,technical debt issues-wo-labels=false diff --git a/CHANGELOG.md b/CHANGELOG.md index 99714b97..4a1f3ae5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## [1.2](https://github.com/kevinpapst/kimai2/tree/1.2) (2019-08-28) +[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.1...1.2) + +Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.2) + ## [1.1](https://github.com/kevinpapst/kimai2/tree/1.1) (2019-07-24) [Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.0.1...1.1) diff --git a/SECURITY.md b/SECURITY.md index f5e96b92..87174b7a 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -7,8 +7,8 @@ As announced in the [README](README.md) I only support the latest available rele | Version | Supported | | ------- | ------------------ | | master | :white_check_mark: | -| 1.1 | :white_check_mark: | -| < 1.1 | :x: | +| 1.2 | :white_check_mark: | +| < 1.2 | :x: | ## Reporting a Vulnerability diff --git a/UPGRADING.md b/UPGRADING.md index a09006cb..01602e68 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -20,7 +20,7 @@ Perform EACH version specific task between your version and the new one, otherwi - Added new permission: `manage_invoice_template` - Removed permissions: `view_invoice_template`, `create_invoice_template`, `edit_invoice_template`, `delete_invoice_template` - Removed permission: `view_invoice` (using `create_export` only) -- Export renderer need to check usage of `Timesheet::getEnd()` as running entries can now be exported as well +- Custom export renderer need to check for usage of `Timesheet::getEnd()` as running entries can now be exported as well ## [1.1](https://github.com/kevinpapst/kimai2/releases/tag/1.1) diff --git a/src/Constants.php b/src/Constants.php index 6633c1b4..b3393d27 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -21,7 +21,7 @@ class Constants /** * The current release version */ - public const VERSION = '1.1'; + public const VERSION = '1.2'; /** * The release name, will only change for new major version */ diff --git a/src/Migrations/Version20190729162655.php b/src/Migrations/Version20190729162655.php index 45ac2484..a7f8de7b 100644 --- a/src/Migrations/Version20190729162655.php +++ b/src/Migrations/Version20190729162655.php @@ -26,6 +26,21 @@ final class Version20190729162655 extends AbstractMigration return 'Fixes foreign keys on tag table'; } + protected function isSupportingForeignKeys(): bool + { + return false; + } + + public function isTransactional(): bool + { + if ($this->isPlatformSqlite()) { + // does fail if we use transactions, as tables are re-created and foreign keys would fail + return false; + } + + return true; + } + public function up(Schema $schema): void { $timesheetTags = $schema->getTable('kimai2_timesheet_tags');