From 55aedcd4a8f760c777c127aa6b3554b2fab0be01 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Thu, 25 Oct 2018 22:27:43 +0200 Subject: [PATCH] bump version number for development (#375) --- .github_changelog_generator | 4 ++-- CHANGELOG.md | 32 +++++++++++++++++++++++--- src/Constants.php | 4 ++-- src/Controller/ActivityController.php | 3 +-- src/Controller/DashboardController.php | 3 +-- src/Controller/HelpController.php | 3 +-- src/Controller/HomepageController.php | 3 +-- 7 files changed, 37 insertions(+), 15 deletions(-) diff --git a/.github_changelog_generator b/.github_changelog_generator index 9eb3595a..52dbe73b 100644 --- a/.github_changelog_generator +++ b/.github_changelog_generator @@ -1,3 +1,3 @@ unreleased=true -future-release=0.5 -exclude-labels=duplicate,question,invalid,wontfix \ No newline at end of file +future-release=0.6 +exclude-labels=duplicate,question,invalid,wontfix,release \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index b8b927f0..8955671e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,34 @@ # Change Log +## [0.6](https://github.com/kevinpapst/kimai2/tree/0.6) (unreleased) +[Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.5...0.6) + +**Fixed bugs:** + +- invalid CSRF-Token [\#344](https://github.com/kevinpapst/kimai2/issues/344) + +**Closed issues:** + +- Make settings more accessible [\#365](https://github.com/kevinpapst/kimai2/issues/365) +- Data validation for register page username field. [\#360](https://github.com/kevinpapst/kimai2/issues/360) +- Option for setting default calendar view [\#359](https://github.com/kevinpapst/kimai2/issues/359) +- 500: Internal Server Error after login \(new install\) [\#342](https://github.com/kevinpapst/kimai2/issues/342) +- Invoices export error [\#341](https://github.com/kevinpapst/kimai2/issues/341) +- Interactive help after fresh installation [\#94](https://github.com/kevinpapst/kimai2/issues/94) + +**Merged pull requests:** + +- Sidebar - user-profile links and language settings [\#369](https://github.com/kevinpapst/kimai2/pull/369) ([kevinpapst](https://github.com/kevinpapst)) +- added configurable initial calendar view [\#363](https://github.com/kevinpapst/kimai2/pull/363) ([kevinpapst](https://github.com/kevinpapst)) +- decrease minimum username to 3 character [\#362](https://github.com/kevinpapst/kimai2/pull/362) ([kevinpapst](https://github.com/kevinpapst)) +- Default country \(\#2\) [\#358](https://github.com/kevinpapst/kimai2/pull/358) ([tobybatch](https://github.com/tobybatch)) +- composer: removed deprecated symfony/lt, updated others [\#354](https://github.com/kevinpapst/kimai2/pull/354) ([kevinpapst](https://github.com/kevinpapst)) +- updated admin-lte theme bundle to 2.1.1 [\#350](https://github.com/kevinpapst/kimai2/pull/350) ([kevinpapst](https://github.com/kevinpapst)) +- updated timesheet and email documentation [\#349](https://github.com/kevinpapst/kimai2/pull/349) ([kevinpapst](https://github.com/kevinpapst)) +- updated required dependencies [\#346](https://github.com/kevinpapst/kimai2/pull/346) ([kevinpapst](https://github.com/kevinpapst)) +- Fix password reset [\#345](https://github.com/kevinpapst/kimai2/pull/345) ([kevinpapst](https://github.com/kevinpapst)) +- added arabic translations and locale support in datepicker [\#337](https://github.com/kevinpapst/kimai2/pull/337) ([kevinpapst](https://github.com/kevinpapst)) + ## [0.5](https://github.com/kevinpapst/kimai2/tree/0.5) (2018-09-27) [Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.4...0.5) @@ -62,7 +91,6 @@ **Merged pull requests:** -- prepare release 0.4 [\#292](https://github.com/kevinpapst/kimai2/pull/292) ([kevinpapst](https://github.com/kevinpapst)) - 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)) @@ -115,7 +143,6 @@ **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)) @@ -189,7 +216,6 @@ **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)) - Code sniffer rules \#158 [\#172](https://github.com/kevinpapst/kimai2/pull/172) ([kevinpapst](https://github.com/kevinpapst)) diff --git a/src/Constants.php b/src/Constants.php index e41e115c..202d6b4e 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -17,7 +17,7 @@ class Constants /** * The current release version */ - public const VERSION = 0.5; + public const VERSION = 0.6; /** * The release name */ @@ -25,7 +25,7 @@ class Constants /** * The current release status */ - public const STATUS = 'stable'; + public const STATUS = 'dev'; /** * Used in multiple views */ diff --git a/src/Controller/ActivityController.php b/src/Controller/ActivityController.php index a325840d..222009b3 100644 --- a/src/Controller/ActivityController.php +++ b/src/Controller/ActivityController.php @@ -12,7 +12,6 @@ namespace App\Controller; use App\Entity\Activity; use App\Repository\ActivityRepository; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Response; /** @@ -20,7 +19,7 @@ use Symfony\Component\HttpFoundation\Response; * * @Security("is_granted('ROLE_USER')") */ -class ActivityController extends Controller +class ActivityController extends AbstractController { /** * @return ActivityRepository diff --git a/src/Controller/DashboardController.php b/src/Controller/DashboardController.php index 4328e73f..813544a3 100644 --- a/src/Controller/DashboardController.php +++ b/src/Controller/DashboardController.php @@ -13,7 +13,6 @@ use App\Event\DashboardEvent; use App\Model\DashboardSection; use App\Repository\WidgetRepository; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Routing\Annotation\Route; @@ -23,7 +22,7 @@ use Symfony\Component\Routing\Annotation\Route; * @Route(path="/dashboard") * @Security("is_granted('ROLE_USER')") */ -class DashboardController extends Controller +class DashboardController extends AbstractController { /** * @var EventDispatcherInterface diff --git a/src/Controller/HelpController.php b/src/Controller/HelpController.php index f5664f35..c35cf546 100644 --- a/src/Controller/HelpController.php +++ b/src/Controller/HelpController.php @@ -11,7 +11,6 @@ namespace App\Controller; use App\Constants; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\Routing\Annotation\Route; /** @@ -20,7 +19,7 @@ use Symfony\Component\Routing\Annotation\Route; * @Route(path="/help") * @Security("is_granted('ROLE_USER')") */ -class HelpController extends Controller +class HelpController extends AbstractController { public const README = 'README'; public const DOCS_DIR = 'var/docs/'; diff --git a/src/Controller/HomepageController.php b/src/Controller/HomepageController.php index 9db36a15..08c7824f 100644 --- a/src/Controller/HomepageController.php +++ b/src/Controller/HomepageController.php @@ -11,7 +11,6 @@ namespace App\Controller; use App\Entity\User; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Annotation\Route; @@ -21,7 +20,7 @@ use Symfony\Component\Routing\Annotation\Route; * @Route(path="/homepage") * @Security("is_granted('ROLE_USER')") */ -class HomepageController extends Controller +class HomepageController extends AbstractController { /** * @Route(path="", defaults={}, name="homepage", methods={"GET"})