From 6fb6a16246c74409fcb043be88b1efad6ca2667d Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Sat, 1 Sep 2018 21:05:29 +0200 Subject: [PATCH] prepare release 0.4 (#292) --- .github_changelog_generator | 2 +- CHANGELOG.md | 64 ++++++++++++++++++++++++++++--------- UPGRADING.md | 18 +++++++++-- composer.json | 8 +---- composer.lock | 12 +++---- var/docs/internal.md | 2 +- 6 files changed, 74 insertions(+), 32 deletions(-) diff --git a/.github_changelog_generator b/.github_changelog_generator index 791d9c18..83cde04d 100644 --- a/.github_changelog_generator +++ b/.github_changelog_generator @@ -1,2 +1,2 @@ unreleased=true -future-release=0.3 +future-release=0.4 diff --git a/CHANGELOG.md b/CHANGELOG.md index dad61330..4c6daa96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,21 +1,53 @@ # Change Log +## [0.4](https://github.com/kevinpapst/kimai2/tree/0.4) (2018-09-01) +[Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.3...0.4) + +**Fixed bugs:** + +- Don't allow to stop an already stopped entry [\#282](https://github.com/kevinpapst/kimai2/issues/282) +- installed it, and then what??? [\#255](https://github.com/kevinpapst/kimai2/issues/255) +- fixed calendar for empty timesheet descriptions [\#265](https://github.com/kevinpapst/kimai2/pull/265) ([kevinpapst](https://github.com/kevinpapst)) +- fixed .htaccess for apache users [\#260](https://github.com/kevinpapst/kimai2/pull/260) ([kevinpapst](https://github.com/kevinpapst)) + +**Closed issues:** + +- Improve dashboard display [\#280](https://github.com/kevinpapst/kimai2/issues/280) +- CSV export [\#263](https://github.com/kevinpapst/kimai2/issues/263) +- Spanish Translation Contrib [\#248](https://github.com/kevinpapst/kimai2/issues/248) +- Administration of projects throws error if locale is "de" [\#247](https://github.com/kevinpapst/kimai2/issues/247) +- Web Installer Package for near-automated installs from browser [\#235](https://github.com/kevinpapst/kimai2/issues/235) +- Delete user [\#225](https://github.com/kevinpapst/kimai2/issues/225) +- Feature request - Monthly overview / report [\#207](https://github.com/kevinpapst/kimai2/issues/207) + +**Merged pull requests:** + +- fixed money display in dashboard widgets [\#291](https://github.com/kevinpapst/kimai2/pull/291) ([kevinpapst](https://github.com/kevinpapst)) +- Symfony update 4.1.4 [\#290](https://github.com/kevinpapst/kimai2/pull/290) ([kevinpapst](https://github.com/kevinpapst)) +- do not allow to stop already stopped timesheets [\#289](https://github.com/kevinpapst/kimai2/pull/289) ([kevinpapst](https://github.com/kevinpapst)) +- added configurable formats for duration [\#287](https://github.com/kevinpapst/kimai2/pull/287) ([kevinpapst](https://github.com/kevinpapst)) +- Updated russian translations [\#286](https://github.com/kevinpapst/kimai2/pull/286) ([kevinpapst](https://github.com/kevinpapst)) +- Update french translation [\#279](https://github.com/kevinpapst/kimai2/pull/279) ([jeau](https://github.com/jeau)) +- Fix standard date format in french [\#278](https://github.com/kevinpapst/kimai2/pull/278) ([jeau](https://github.com/jeau)) +- new translations: spanish, french and italian [\#276](https://github.com/kevinpapst/kimai2/pull/276) ([kevinpapst](https://github.com/kevinpapst)) +- French translation for Kimai [\#275](https://github.com/kevinpapst/kimai2/pull/275) ([jeau](https://github.com/jeau)) +- updated to AdminLTE 2.4.8 [\#274](https://github.com/kevinpapst/kimai2/pull/274) ([kevinpapst](https://github.com/kevinpapst)) +- fixing migration\_v1.md url [\#270](https://github.com/kevinpapst/kimai2/pull/270) ([ltsavar](https://github.com/ltsavar)) +- dashboard widgets are configurable via config [\#269](https://github.com/kevinpapst/kimai2/pull/269) ([kevinpapst](https://github.com/kevinpapst)) +- Spanish translation for Kimai [\#266](https://github.com/kevinpapst/kimai2/pull/266) ([cobaltos](https://github.com/cobaltos)) +- moved theme settings to dynamic compiler pass [\#264](https://github.com/kevinpapst/kimai2/pull/264) ([kevinpapst](https://github.com/kevinpapst)) +- Added config setting to disable password-reset and user-registration [\#261](https://github.com/kevinpapst/kimai2/pull/261) ([kevinpapst](https://github.com/kevinpapst)) +- Added basic API endpoints [\#258](https://github.com/kevinpapst/kimai2/pull/258) ([kevinpapst](https://github.com/kevinpapst)) +- Hotfix for Symfony Flex incompatibility with latest composer changes [\#257](https://github.com/kevinpapst/kimai2/pull/257) ([kevinpapst](https://github.com/kevinpapst)) +- added italian translation [\#253](https://github.com/kevinpapst/kimai2/pull/253) ([kevinpapst](https://github.com/kevinpapst)) +- Delete user [\#249](https://github.com/kevinpapst/kimai2/pull/249) ([kevinpapst](https://github.com/kevinpapst)) +- dashboard widgets from event [\#246](https://github.com/kevinpapst/kimai2/pull/246) ([kevinpapst](https://github.com/kevinpapst)) +- Added timesheet-calendar view [\#236](https://github.com/kevinpapst/kimai2/pull/236) ([kevinpapst](https://github.com/kevinpapst)) +- Improved data fixtures [\#234](https://github.com/kevinpapst/kimai2/pull/234) ([kevinpapst](https://github.com/kevinpapst)) + ## [0.3](https://github.com/kevinpapst/kimai2/tree/0.3) (2018-07-22) [Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.2...0.3) -**Update from 0.2:** - -You need to adjust your `.env` file and add your `from` address for [all emails](https://github.com/kevinpapst/kimai2/blob/master/var/docs/emails.md) generated by Kimai 2: -``` -MAILER_FROM=kimai@example.com -``` - -Users upgrading from 0.2 need to execute: -``` -bin/console doctrine:migrations:version --add 20180701120000 -bin/console doctrine:migrations:migrate -``` - **Fixed bugs:** - Missing assets in fresh installation [\#213](https://github.com/kevinpapst/kimai2/issues/213) @@ -25,14 +57,14 @@ bin/console doctrine:migrations:migrate **Closed issues:** -- Verifying email configuration [\#226](https://github.com/kevinpapst/kimai2/issues/226) - Installation Issue of version1.3.1 [\#208](https://github.com/kevinpapst/kimai2/issues/208) +- Error on bin/console doctrine:schema:create [\#191](https://github.com/kevinpapst/kimai2/issues/191) +- Verifying email configuration [\#226](https://github.com/kevinpapst/kimai2/issues/226) - Add favicon [\#205](https://github.com/kevinpapst/kimai2/issues/205) - Install Kimai as WebApp [\#203](https://github.com/kevinpapst/kimai2/issues/203) - Replace AvanzuAdminTheme with AdminLTE bundle [\#201](https://github.com/kevinpapst/kimai2/issues/201) - Document DB requirements in install docu [\#196](https://github.com/kevinpapst/kimai2/issues/196) - easier creation of tasks [\#195](https://github.com/kevinpapst/kimai2/issues/195) -- Error on bin/console doctrine:schema:create [\#191](https://github.com/kevinpapst/kimai2/issues/191) - Integrate lock bot [\#183](https://github.com/kevinpapst/kimai2/issues/183) - Upgrade to FontAwesome 5 [\#179](https://github.com/kevinpapst/kimai2/issues/179) - Add dynamic column filter [\#174](https://github.com/kevinpapst/kimai2/issues/174) @@ -42,6 +74,7 @@ bin/console doctrine:migrations:migrate **Merged pull requests:** +- prepare release 0.3 [\#231](https://github.com/kevinpapst/kimai2/pull/231) ([kevinpapst](https://github.com/kevinpapst)) - Easier creation of Tasks/Projects/User [\#230](https://github.com/kevinpapst/kimai2/pull/230) ([kevinpapst](https://github.com/kevinpapst)) - Added email configuration docs [\#228](https://github.com/kevinpapst/kimai2/pull/228) ([kevinpapst](https://github.com/kevinpapst)) - Show revenue only for ROLE\_ADMIN [\#227](https://github.com/kevinpapst/kimai2/pull/227) ([kevinpapst](https://github.com/kevinpapst)) @@ -114,6 +147,7 @@ bin/console doctrine:migrations:migrate **Merged pull requests:** +- \[WIP\] Translations [\#173](https://github.com/kevinpapst/kimai2/pull/173) ([simonschaufi](https://github.com/simonschaufi)) - prepare v0.2 release \#177 [\#178](https://github.com/kevinpapst/kimai2/pull/178) ([kevinpapst](https://github.com/kevinpapst)) - various documentation updates [\#176](https://github.com/kevinpapst/kimai2/pull/176) ([kevinpapst](https://github.com/kevinpapst)) - code styles: header\_comment and ordered\_imports [\#175](https://github.com/kevinpapst/kimai2/pull/175) ([kevinpapst](https://github.com/kevinpapst)) diff --git a/UPGRADING.md b/UPGRADING.md index ef6931fb..7930638b 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -5,7 +5,21 @@ Database upgrades are currently ONLY provided for MySQL/MariaDB and SQLite. If you plan on using e.g. PostgreSQL, please read more about the `bin/console doctrine:migrations:diff` and `bin/console doctrine:migrations:migrate` commands and contact us, so we can integrate them into the official releases. -## 0.4 (not yet released) + +A normal upgrade can be executed with these commands: + +```bash +git pull origin master +sudo -u www-data composer install --no-dev --optimize-autoloader +sudo -u www-data bin/console cache:clear --env=prod +sudo -u www-data bin/console cache:warmup --env=prod +bin/console doctrine:migrations:migrate +``` + +There might be version specific tasks that need to be executed before or after these steps, please see below +if your updated version is mentioned below. + +## [0.4](https://github.com/kevinpapst/kimai2/releases/tag/0.4) (2018-09-01) In the time between 0.3 and 0.4 there was a release of composer that introduced a BC break, which leads to problems between Composer and Symfony Flex, resulting in an error like this when running it: @@ -21,7 +35,7 @@ sudo composer self-update sudo -u www-data composer update symfony/flex --no-plugins ``` -Then the full update can be executed as usual: +Then the full update can be executed as usual: ```bash git pull origin master diff --git a/composer.json b/composer.json index 86f5696e..028241c0 100644 --- a/composer.json +++ b/composer.json @@ -97,11 +97,5 @@ "id": "01C3FWRDJJEX9K6Y3A4XDFXPBR", "allow-contrib": true } - }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/kevinpapst/AdminThemeBundle" - } - ] + } } diff --git a/composer.lock b/composer.lock index 0037a75f..8f8e4508 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "18295409680ef770e346af640c2c76d9", + "content-hash": "0cf38f9b4970d089487593f344ed0282", "packages": [ { "name": "beberlei/DoctrineExtensions", @@ -7379,16 +7379,16 @@ }, { "name": "phpunit/phpunit", - "version": "7.3.2", + "version": "7.3.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "34705f81bddc3f505b9599a2ef96e2b4315ba9b8" + "reference": "1bd5629cccfb2c0a9ef5474b4ff772349e1ec898" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34705f81bddc3f505b9599a2ef96e2b4315ba9b8", - "reference": "34705f81bddc3f505b9599a2ef96e2b4315ba9b8", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1bd5629cccfb2c0a9ef5474b4ff772349e1ec898", + "reference": "1bd5629cccfb2c0a9ef5474b4ff772349e1ec898", "shasum": "" }, "require": { @@ -7459,7 +7459,7 @@ "testing", "xunit" ], - "time": "2018-08-22T06:39:21+00:00" + "time": "2018-09-01T15:49:55+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", diff --git a/var/docs/internal.md b/var/docs/internal.md index 007d2072..0da983cc 100644 --- a/var/docs/internal.md +++ b/var/docs/internal.md @@ -8,6 +8,6 @@ Internal documentation for project maintainers - Change .github_changelog_generator config accordingly to new release tag (increase future release) - Create CHANGELOG.md with [github-changelog-generator](https://github.com/github-changelog-generator/github-changelog-generator]) by running `github_changelog_generator kevinpapst/kimai2` - Push a release branch and add it as last PR merge into master -- Edit the release-draft and add the "Full changelog" link + everything from the "Merged pull requests" section from CHANGELOG.md +- Edit the release-draft and add the "Full changelog" link + everything from CHANGELOG.md related to the new version - Create the release - Post a new issue at [YunoHost tracker for Kimai 2](https://github.com/YunoHost-Apps/kimai2_ynh)