2.0 beta 3 (#3786)

* added id for custom js options
* readme
* composer update
* fix migration filename

README.md

@@ -14,32 +14,31 @@
 
 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](https://github.com/symfony/symfony), [Bootstrap](https://github.com/twbs/bootstrap), 
-[RESTful API](https://github.com/FriendsOfSymfony/FOSRestBundle), [Doctrine](https://github.com/doctrine/),
+[JSON API](https://github.com/FriendsOfSymfony/FOSRestBundle), [Doctrine](https://github.com/doctrine/),
-[Tabler](https://github.com/kevinpapst/TablerBundle/), [Webpack](https://github.com/webpack/webpack), ES6 and [many](composer.json) [more](package.json).
+[Tabler](https://github.com/kevinpapst/TablerBundle/), ES6 and [many](composer.json) [more](package.json).
 
 ## Introduction
 
 - [Home](https://www.kimai.org) - Kimai project homepage
 - [Blog](https://www.kimai.org/blog/) - Read the latest news
 - [Documentation](https://www.kimai.org/documentation/) - Learn how to use Kimai
-- [Translations](https://hosted.weblate.org/projects/kimai/#languages) - Kimai in your language
+- [Translations](https://hosted.weblate.org/projects/kimai/#languages) - Kimai is translated at Weblate
-- [Migration](https://www.kimai.org/documentation/migration-v1.html) - Import data from Kimai 1 
 
 ### Requirements
 
 - PHP 8.1 minimum
 - MariaDB or MySQL
-- A webserver and subdomain
+- A webserver and subdomain (subdirectory does not work)
 - PHP extensions: `gd`, `intl`, `json`, `mbstring`, `pdo`, `xsl`, `zip`
 
 ### About
 
-The evolution of the most known(?) open source project time-tracker Kimai. It is stable, production ready and ships
+Kimai is a professional grade time-tracking application, build to track your project times.
-with many advanced features, including but not limited to: 
+It ships with many advanced features, including but not limited to: 
 
-JSON API, invoicing, data exports, multi-timer and punch-in punch-out mode, tagging, multi-user and multi-timezones, 
+JSON API, invoicing, data exports, multi-timer and punch-in punch-out mode, tagging, multi-user - multi-timezones - multi-language, 
-authentication via SAML/LDAP/Database, customizable role and team permissions, responsive and ready for your mobile device, 
+authentication via SAML/LDAP/Database, support for 2FA with TOTP, customizable role and team permissions, responsive and ready for your mobile device, 
-user/customer/project specific rates, advanced search & filtering, money and time budgets, reporting, support for plugins 
+user/customer/project specific rates, advanced search & filtering, money and time budgets, advanced reporting, support for plugins 
 and so many more.
 
 ## Installation
@@ -64,9 +63,11 @@ and so many more.
 You can see a rough development roadmap in the [Milestones](https://github.com/kimai/kimai/milestones) sections.
 It is open for changes and input from the community, your [ideas and questions](https://github.com/kimai/kimai/issues) are welcome.
 
-Release versions will be created on a regular basis, every couple of weeks.
+Release versions will be created on a regular basis, every couple of weeks latest.
 Every code change, whether it's a new feature or a bugfix, will be done on the `main` branch.
 
+For the time being and until 2.0 landed everywhere, the [1.x branch](https://github.com/kimai/kimai/tree/1.x) will receive bug fixes. 
+
 ## Contributing
 
 You want to contribute to this repository? This is so great!
@@ -74,11 +75,11 @@ The best way to start is to [open a new issue](https://github.com/kimai/kimai/is
 
 In case you want to contribute, but you wouldn't know how, here are some suggestions:
 
-- Spread the word: More user means more people testing and contributing to Kimai - which in turn means better stability and more and better features. Please vote for Kimai on platforms like Slant, Product Hunt, Softpedia or AlternativeTo, you can toot or tweet about it, share it on LinkedIn, reddit or any of your favorite social media platforms. Every bit helps!
+- Spread the word: More user means more people testing and contributing to Kimai - which in turn means better stability and more and better features. Please vote for Kimai on any software platform, you can toot or tweet about it, share it on LinkedIn, Reddit or any of your favorite social media platforms. Every bit helps!
 - Answer questions: You know the answer to another user's problem? Share your knowledge.
 - Something can be done better? An essential feature is missing? Create a feature request.
-- Report bugs: that shouldn't happen too often.
+- Report bugs makes Kimai better for everyone.
-- You don't have to be programmer, the documentation and translation could use some love as well.
+- You don't have to be programmer, the documentation and translation could always use some attention.
 - Sponsor the project: free software costs money to create!
 
 There is one simple rule in our "Code of conduct": Don't be an ass!

composer.json

@@ -35,7 +35,7 @@
         "gedmo/doctrine-extensions": "^3.6",
         "jeroendesloovere/vcard": "^1.7",
         "jms/serializer-bundle": "^5.0",
-        "kevinpapst/tabler-bundle": "^0.9",
+        "kevinpapst/tabler-bundle": "^0.10",
         "league/csv": "^9.4",
         "mpdf/mpdf": "^8.0",
         "nelmio/api-doc-bundle": "^4.0",

migrations/Version20230126002049.php

@@ -11,8 +11,8 @@ declare(strict_types=1);
 
 namespace DoctrineMigrations;
 
+use App\Doctrine\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
 
 /**
  * All the checks for hasIndex() and hasColumn() are here to simplify testing and development,
@@ -20,7 +20,7 @@ use Doctrine\Migrations\AbstractMigration;
  *
  * @version 2.0
  */
-final class Version20993112235958 extends AbstractMigration
+final class Version20230126002049 extends AbstractMigration
 {
     public function getDescription(): string
     {

templates/timesheet/edit-default.html.twig

@@ -66,7 +66,7 @@
                 {{ form_row(form.metaFields) }}
             {% endif %}
             {% if form.fixedRate is defined or form.hourlyRate is defined or form.billable is defined or form.billableMode is defined or form.exported is defined %}
-                {% embed '@theme/embeds/card.html.twig' with {collapsed: true} %}
+                {% embed '@theme/embeds/card.html.twig' with {collapsed: true, id: 'timesheet_extended_settings'} %}
                     {% import "macros/widgets.html.twig" as widgets %}
                     {% block box_title %}{{ 'extended_settings'|trans }}{% endblock %}
                     {% block box_body_class %}{% endblock %}