From 32aa209b7553b8827b8009ba7f389789842458bf Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Fri, 4 Oct 2019 07:36:59 +0200 Subject: [PATCH] prepare release 1.4 (#1154) --- .github_changelog_generator | 2 +- CHANGELOG.md | 3 +++ README.md | 2 +- SECURITY.md | 4 ++-- UPGRADING.md | 2 +- src/Constants.php | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github_changelog_generator b/.github_changelog_generator index b14e5638..b16c051b 100644 --- a/.github_changelog_generator +++ b/.github_changelog_generator @@ -1,5 +1,5 @@ unreleased=true -future-release=1.3 +future-release=1.4 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 7269c8be..0d93ea2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Change Log +## [1.4](https://github.com/kevinpapst/kimai2/tree/1.4) (2019-10-03) +[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.3...1.4) + ## [1.3](https://github.com/kevinpapst/kimai2/tree/1.3) (2019-09-11) [Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.2...1.3) diff --git a/README.md b/README.md index 6245af34..acf7457e 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ It is open for changes and input from the community, your [ideas and questions]( > Kimai 2 uses a rolling release concept for delivering updates. > You can upgrade Kimai at any time, you don't need to wait for the next official release. -Release versions will be created on a regular base (approx. every second month) and you can use these tags if you are familiar with git. +Release versions will be created on a regular base (approx. one release per month) and you can use these tags if you are familiar with git. Every code change, whether it's a new feature or a bug fix, will be done on the master branch. I have to do it this way, as I develop Kimai in my free time and want to put my effort into the software instead of backporting changes for old versions. diff --git a/SECURITY.md b/SECURITY.md index 4c6afc15..47db1f04 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.3 | :white_check_mark: | -| < 1.3 | :x: | +| 1.4 | :white_check_mark: | +| < 1.4 | :x: | ## Reporting a Vulnerability diff --git a/UPGRADING.md b/UPGRADING.md index 6868c46f..4ebf794c 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -13,7 +13,7 @@ Perform EACH version specific task between your version and the new one, otherwi **Attention**: There is a new directory, which needs to be writable by the webserver: `public/avatars/`. New permission (used in new dashboard widget): -- `view_team_member` - view the teamlead and members for the teams of the current user +- `view_team_member` - display team assignments (names, teamleads and members) for the current user ### Possible BC breaks diff --git a/src/Constants.php b/src/Constants.php index 45f17ece..f2022681 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -21,7 +21,7 @@ class Constants /** * The current release status, either "stable" or "dev" */ - public const STATUS = 'dev'; + public const STATUS = 'stable'; /** * The software name */