diff --git a/.github_changelog_generator b/.github_changelog_generator index bf2e1790..d0f4f851 100644 --- a/.github_changelog_generator +++ b/.github_changelog_generator @@ -1,5 +1,5 @@ unreleased=true -future-release=1.9 +future-release=1.10 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 bbd4f3b8..d42bbd2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [1.10](https://github.com/kevinpapst/kimai2/tree/1.10) +[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.9...1.10) + +Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.10) + ## [1.9](https://github.com/kevinpapst/kimai2/tree/1.9) [Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.8...1.9) diff --git a/README.md b/README.md index 855b7c27..6176028c 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,17 @@ -# Kimai 2 - online time-tracker +

Kimai 2 - online time-tracker

-[![CI Status](https://github.com/kevinpapst/kimai2/workflows/CI/badge.svg)](https://github.com/kevinpapst/kimai2/actions) -[![Code Coverage](https://codecov.io/gh/kevinpapst/kimai2/branch/master/graph/badge.svg)](https://codecov.io/gh/kevinpapst/kimai2) -[![Latest Stable Version](https://poser.pugx.org/kevinpapst/kimai2/v/stable)](https://packagist.org/packages/kevinpapst/kimai2) -[![License](https://poser.pugx.org/kevinpapst/kimai2/license)](https://packagist.org/packages/kevinpapst/kimai2) -[![Gitter](https://badges.gitter.im/kimai2/support.svg)](https://gitter.im/kimai2/support) -[![Bountysource](https://img.shields.io/bountysource/team/kimai2/activity)](https://www.bountysource.com/teams/kimai2) +

+ Kimai logo +

+ +

+ CI Status + Code Coverage + Latest stable version + License + Gitter + Bountysource +

Kimai is a free, open source and online time-tracking software designed for small businesses and freelancers. It is built with modern technologies such as Symfony, Bootstrap, RESTful API, Doctrine, AdminLTE, Webpack, ES6 etc. @@ -59,12 +65,13 @@ You can see a rough development roadmap in the [Milestones](https://github.com/k It is open for changes and input from the community, your [ideas and questions](https://github.com/kevinpapst/kimai2/issues) are welcome. > 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. +> You can upgrade Kimai at any time, you don't need to wait for the next official release. +> The master branch is always deployable, release tags are only snapshots of the current development version. -Release versions will be created on a regular base (approx. one release per month) and you should use these tags if you are not familiar with git. +Release versions will be created on a regular base (approx. one release every 4-8 weeks). Every code change, whether it's a new feature or a bug fix, will be done on the master branch. -I develop Kimai in my free time and want to put my effort into the software instead of backporting changes for old versions. -The only exception is a critical security issue, which I would fix in the last version as well. +Kimai is actively developed in my spare time and I put my effort into the software instead of backporting changes for old versions. +The only exception is a critical security issue, which I would fix in the latest stable version as well. ## Credits diff --git a/SECURITY.md b/SECURITY.md index ed377e6b..fb1244a0 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.9 | :white_check_mark: | -| < 1.9 | :x: | +| 1.10 | :white_check_mark: | +| < 1.10 | :x: | ## Reporting a Vulnerability @@ -19,5 +19,5 @@ Depending on the size of the required fixes, this might take a couple of hours o You can expect that your message will be answered ASAP, but please take into account that I am living in the timezone Europe/Berlin. -If your issue is valid and I verified and fixed it, you will be mentioned in the release notes within the Security section at the top of the release. +If your issue is valid and after I verified and fixed it, you will be mentioned in the release notes. I am grateful for any (discrete) disclosure of vulnerabilities! \ No newline at end of file diff --git a/UPGRADING.md b/UPGRADING.md index e20cf570..134ef429 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -19,7 +19,7 @@ Perform EACH version specific task between your version and the new one, otherwi ### Developer -- **BC break**: interface method signature `HtmlToPdfConverter::convertToPdf` changed +- **BC break**: interface method signature `HtmlToPdfConverter::convertToPdf()` changed - **BC break**: the macros `badge` and `label` do not apply the `|trans` filter any more - **BC Break**: removed `getVisible()` (deprecated since 1.4) method on Customer, Project and Activity (use `isVisible()` instead, templates are still working) - **BC Break**: API changes diff --git a/src/Constants.php b/src/Constants.php index 9f1546eb..c6e82c13 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 */