changed repository url (#3708)

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -24,7 +24,7 @@ body:
                     required: true
                 -   label: I've searched for similar issues in this repository.
                     required: true
-                -   label: I've searched for similar issues in [the discussions](https://github.com/kevinpapst/kimai2/discussions).
+                -   label: I've searched for similar issues in [the discussions](https://github.com/kimai/kimai/discussions).
                     required: true
     -   type: input
         id: version

.github/ISSUE_TEMPLATE/config.yml

@@ -7,7 +7,7 @@ contact_links:
       url: https://github.com/tobybatch/kimai2/issues
       about: For issues specific for Kimai Docker deployment
     - name: Ask a Question
-      url: https://github.com/kevinpapst/kimai2/discussions
+      url: https://github.com/kimai/kimai/discussions
       about: Want to discuss something with a community? Do it in discussions!
     - name: Get Professional support
       url: https://www.kimai.org/store/custom-plugins.html

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,4 +9,4 @@ A clear and concise description of what this pull request adds or changes.
 ## Checklist
 - [ ] I verified that my code applies to the guidelines (`composer code-check`)
 - [ ] I updated the documentation (see [here](https://github.com/kimai/www.kimai.org/tree/master/_documentation))
-- [ ] I agree that this code is used in Kimai and will be published under the [MIT license](https://github.com/kevinpapst/kimai2/blob/master/LICENSE)
+- [ ] I agree that this code is used in Kimai and will be published under the [MIT license](https://github.com/kimai/kimai/blob/master/LICENSE)

CHANGELOG.md

@@ -1,3 +1,3 @@
 # Changelog
 
-See [GitHub release page](https://github.com/kevinpapst/kimai2/releases). 
+See [GitHub release page](https://github.com/kimai/kimai/releases). 

README.md

@@ -3,7 +3,7 @@
 </p>
 
 <p align="center">
-    <a href="https://github.com/kevinpapst/kimai2/actions"><img alt="CI Status" src="https://github.com/kevinpapst/kimai2/workflows/CI/badge.svg"></a>
+    <a href="https://github.com/kimai/kimai/actions"><img alt="CI Status" src="https://github.com/kimai/kimai/workflows/CI/badge.svg"></a>
     <a href="https://codecov.io/gh/kevinpapst/kimai2"><img alt="Code Coverage" src="https://codecov.io/gh/kevinpapst/kimai2/branch/master/graph/badge.svg"></a>
     <a href="https://packagist.org/packages/kevinpapst/kimai2"><img alt="Latest stable version" src="https://poser.pugx.org/kevinpapst/kimai2/v/stable"></a>
     <a href="https://packagist.org/packages/kevinpapst/kimai2"><img alt="License" src="https://poser.pugx.org/kevinpapst/kimai2/license"></a>
@@ -62,8 +62,8 @@ and so many more.
 
 ## Roadmap and releases
 
-You can see a rough development roadmap in the [Milestones](https://github.com/kevinpapst/kimai2/milestones) sections.
-It is open for changes and input from the community, your [ideas and questions](https://github.com/kevinpapst/kimai2/issues) are welcome.
+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.
 
 > Kimai uses a rolling release concept for delivering updates.
 > You don't have to wait for the next official release, upgrade it at any time from the master branch, 
@@ -76,7 +76,7 @@ Kimai is actively developed in my spare time, I put my effort into the software
 ## Contributing
 
 You want to contribute to this repository? This is so great!
-The best way to start is to [open a new issue](https://github.com/kevinpapst/kimai2/issues) for bugs or feature requests or a [discussion](https://github.com/kevinpapst/kimai2/discussions) for questions, support and such.
+The best way to start is to [open a new issue](https://github.com/kimai/kimai/issues) for bugs or feature requests or a [discussion](https://github.com/kimai/kimai/discussions) for questions, support and such.
 
 In case you want to contribute, but you wouldn't know how, here are some suggestions:
 

SECURITY.md

@@ -13,7 +13,7 @@ As announced in the [README](README.md) I only support the latest available rele
 ## Reporting a Vulnerability
 
 Please read the [Bughunter](https://www.kimai.org/documentation/bughunter.html) documentation before posting. 
-Xou can report any security related vulnerability in the [advisories section at GitHub](https://github.com/kevinpapst/kimai2/security/advisories) or via email to kpapst@gmx.net.
+You can report any security related vulnerability in the [advisory section at GitHub](https://github.com/kimai/kimai/security/advisories) or via email to kpapst@gmx.net.
 
 I will work as fast as I can to fix the problem and publish a bugfix release / security update. 
 Depending on the size of the required fixes, this might take a couple of hours or a couple of days.

UPGRADING.md

@@ -9,13 +9,13 @@ Check below if there are more version specific steps required, which need to be
 Perform EACH version specific task between your version and the new one, otherwise you risk data inconsistency or a broken installation.
 
 
-## [1.16](https://github.com/kevinpapst/kimai2/releases/tag/1.16)
+## [1.16](https://github.com/kimai/kimai/releases/tag/1.16)
 
 **DEVELOPER**
 
 - Removed `formDateTime` field from API model `I18nConfig`
 
-## [1.15](https://github.com/kevinpapst/kimai2/releases/tag/1.15)
+## [1.15](https://github.com/kimai/kimai/releases/tag/1.15)
 
 **Many database changes: don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
 
@@ -48,7 +48,7 @@ PHP 8 compatibility forced to upgrade MANY libraries, including but not limited
 
 **API BC break**: Due to team structure changes, it was impossible to keep the (writing) API structure. Please adjust your code accordingly!
 
-## [1.14](https://github.com/kevinpapst/kimai2/releases/tag/1.14)
+## [1.14](https://github.com/kimai/kimai/releases/tag/1.14)
 
 **CRITICAL BC break**: SQLite support was removed. If you are using SQLite, you have to [read this blog post](https://www.kimai.org/blog/2021/sqlite-and-ftp-support-removed/) and migrate to MySQL/MariaDB first!
 
@@ -57,17 +57,17 @@ PHP 8 compatibility forced to upgrade MANY libraries, including but not limited
 Permission changes:
 - `history_invoice` - removed permission entirely
 
-## [1.13](https://github.com/kevinpapst/kimai2/releases/tag/1.13)
+## [1.13](https://github.com/kimai/kimai/releases/tag/1.13)
 
 - Deprecated `now` variable in export templates: create it yourself with `{% set now = create_date('now', app.user) %}`
 - Changed invoice filename generation (check if you use cronjob for invoices)
 - **BC break**: duration entered as plain numbers will now be treated as decimal duration in hours instead of seconds
 
-## [1.12](https://github.com/kevinpapst/kimai2/releases/tag/1.12)
+## [1.12](https://github.com/kimai/kimai/releases/tag/1.12)
 
 - Export templates can now include items from plugins (eg. Expenses).
 
-## [1.10](https://github.com/kevinpapst/kimai2/releases/tag/1.10)
+## [1.10](https://github.com/kimai/kimai/releases/tag/1.10)
 
 **New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
 
@@ -88,7 +88,7 @@ Permission changes:
     - new result types were introduced
     - result data changed in some areas to smooth out inconsistencies (eg. TeamEntity fields changed in nested results)
 
-## [1.9](https://github.com/kevinpapst/kimai2/releases/tag/1.9)
+## [1.9](https://github.com/kimai/kimai/releases/tag/1.9)
 
 **New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
 
@@ -108,7 +108,7 @@ Permission changes:
 - **BC break**: `InvoiceItemInterface` has new methods `getType()` and `getCategory()`
 - **BC break**: API fields changed - see new `/rates` endpoints
 
-## [1.8](https://github.com/kevinpapst/kimai2/releases/tag/1.8)
+## [1.8](https://github.com/kimai/kimai/releases/tag/1.8)
 
 **New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
 
@@ -128,7 +128,7 @@ Permission changes:
 - `edit_teamlead_customer` - removed default permission from ROLE_TEAMLEAD (if you use it: change it in the Role & Permission UI) 
 - `upload_invoice_template` - NEW: permission that allows to upload invoice documents from the UI
 
-## [1.7](https://github.com/kevinpapst/kimai2/releases/tag/1.7)
+## [1.7](https://github.com/kimai/kimai/releases/tag/1.7)
 
 **New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
 
@@ -159,7 +159,7 @@ After the Kimai update was successful, you have to re-install the latest bundle
 - Doctrine bundle was updated to v2, check your code for [the usage of RegistryInterface and ObjectManager](https://github.com/doctrine/DoctrineBundle/blob/master/UPGRADE-2.0.md)
 - Removed the webserver bundle and the command `server:run` - see [docs](https://www.kimai.org/documentation/developers.html)
 
-## [1.6](https://github.com/kevinpapst/kimai2/releases/tag/1.6), [1.6.1](https://github.com/kevinpapst/kimai2/releases/tag/1.6.1), [1.6.2](https://github.com/kevinpapst/kimai2/releases/tag/1.6.2)
+## [1.6](https://github.com/kimai/kimai/releases/tag/1.6), [1.6.1](https://github.com/kimai/kimai/releases/tag/1.6.1), [1.6.2](https://github.com/kimai/kimai/releases/tag/1.6.2)
 
 **New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
 
@@ -173,11 +173,11 @@ After the Kimai update was successful, you have to re-install the latest bundle
 
 Please add default permissions to your [plugin](https://www.kimai.org/documentation/plugins.html).
 
-## [1.5](https://github.com/kevinpapst/kimai2/releases/tag/1.5)
+## [1.5](https://github.com/kimai/kimai/releases/tag/1.5)
 
 [Update as usual](https://www.kimai.org/documentation/updates.html)
 
-## [1.4](https://github.com/kevinpapst/kimai2/releases/tag/1.4)
+## [1.4](https://github.com/kimai/kimai/releases/tag/1.4)
 
 **There is a new directory, which needs to be writable by the webserver: `public/avatars/`.**
 
@@ -191,7 +191,7 @@ Activated Javascript select component by default (check mobile devices).
 - Dashboard widgets and rows need to define their `type` by FQCN
 - Switched to Symfony 4.3 event types, this could fail in plugins, but only if they didn't use the official constants for event names
 
-## [1.3](https://github.com/kevinpapst/kimai2/releases/tag/1.3)
+## [1.3](https://github.com/kimai/kimai/releases/tag/1.3)
 
 Added `manage_tag` permission for new tag features
 
@@ -200,7 +200,7 @@ Added `manage_tag` permission for new tag features
 - Refactored toolbars and search, plugins needs to be checked 
 - Invoices now supports multiple repositories, some method signatures had to be changed (eg. `calculateSumIdentifier()`)  
 
-## [1.2](https://github.com/kevinpapst/kimai2/releases/tag/1.2)
+## [1.2](https://github.com/kimai/kimai/releases/tag/1.2)
 
 **If you are still using 0.7 or below, you need to upgrade to 1.1 before upgrading to this version.**
 
@@ -217,11 +217,11 @@ Added `manage_tag` permission for new tag features
 
 - Custom export renderer need to check for usage of `Timesheet::getEnd()` as running entries can now be exported as well
 
-## [1.1](https://github.com/kevinpapst/kimai2/releases/tag/1.1)
+## [1.1](https://github.com/kimai/kimai/releases/tag/1.1)
 
 [Update as usual](https://www.kimai.org/documentation/updates.html), nothing special for this release if you upgrade from 1.0 / 1.0.1.
 
-## [1.0](https://github.com/kevinpapst/kimai2/releases/tag/1.0)
+## [1.0](https://github.com/kimai/kimai/releases/tag/1.0)
 
 This release contains several changes, as I still have the goal to stabilize the code base to prevent 
 such "challenges" after 1.0 for a while.
@@ -248,7 +248,7 @@ Removed permission:
 Thanks to the new structure, you should be able to remove almost everything from your `local.yaml` (tip: start over from scratch!). Please read [the updated permission docu](https://www.kimai.org/documentation/permissions.html). 
 - default widgets were removed from `kimai.yaml`, that shouldn't cause any issues ... but if something is odd: [look here for help](https://www.kimai.org/documentation/dashboard.html)
 
-## [0.9](https://github.com/kevinpapst/kimai2/releases/tag/0.9)
+## [0.9](https://github.com/kimai/kimai/releases/tag/0.9)
 
 Remember to execute the necessary timezone conversion script, if you haven't updated to 0.8 before (see below)!
 
@@ -259,7 +259,7 @@ This release contains some BC breaks which were necessary before 1.0 will be rel
 - **Kimai requires PHP 7.2 now => [PHP 7.1 expired 4 month ago](https://www.php.net/supported-versions.php)**
 - The `.env` variable `DATABASE_PREFIX` was removed and the table prefix is now hardcoded to `kimai2_`. If you used another prefix, 
 you have to rename your tables manually before starting the update process. You can delete the row `DATABASE_PREFIX` from your `.env` file.
-- API: Format for DateTime objects changed, now including timezone identifier (previously `2019-03-02 14:23` - now `2019-03-02T14:23:00+00:00`), see [#718](https://github.com/kevinpapst/kimai2/pull/718)
+- API: Format for DateTime objects changed, now including timezone identifier (previously `2019-03-02 14:23` - now `2019-03-02T14:23:00+00:00`), see [#718](https://github.com/kimai/kimai/pull/718)
 - API: changed from snake_case to camelCase (affected fields: hourlyRate vs hourly_rate / fixedRate vs fixed_rate / orderNumber vs order_number / i18n config object)
 - Plugin mechanism changed: existing Plugins have to be deleted or updated
 
@@ -284,15 +284,15 @@ kimai:
 ```
 Or switch the mode directly in the new System configuration screen within Kimai.  
 
-## [0.8.1](https://github.com/kevinpapst/kimai2/releases/tag/0.8.1)
+## [0.8.1](https://github.com/kimai/kimai/releases/tag/0.8.1)
 
 A bug fixing release. Remember to execute the necessary timezone conversion script, if you haven't updated to 0.8 before (see below)!
 
-## [0.8](https://github.com/kevinpapst/kimai2/releases/tag/0.8)
+## [0.8](https://github.com/kimai/kimai/releases/tag/0.8)
 
 After you followed the normal update and database migration process (see above), you need to execute a bash command to convert your timesheet data for timezone support:
 
-- Read this [pull request](https://github.com/kevinpapst/kimai2/pull/372) BEFORE you follow the instructions to convert the 
+- Read this [pull request](https://github.com/kimai/kimai/pull/372) BEFORE you follow the instructions to convert the 
 timezones in your existing time records with `bin/console kimai:convert-timezone`. Without that, you will end up with wrong times in your database.
 
 ### Apply necessary changes to your `local.yaml`: 
@@ -305,21 +305,21 @@ timezones in your existing time records with `bin/console kimai:convert-timezone
   - `edit_export_other_timesheet` - for the new export feature
   - `system_information` - to see the new about screen
 
-## [0.7](https://github.com/kevinpapst/kimai2/releases/tag/0.7)
+## [0.7](https://github.com/kimai/kimai/releases/tag/0.7)
 
 The configuration `kimai.theme.active_warning` was deprecated and should be replaced in your local.yaml, 
 [read config docs for more information](https://www.kimai.org/documentation/timesheet.html#limit-active-entries).
 
-## [0.6.1](https://github.com/kevinpapst/kimai2/releases/tag/0.6.1)
+## [0.6.1](https://github.com/kimai/kimai/releases/tag/0.6.1)
 
 A bugfix release to address database compatibility issues with older MySQL/MariaDB versions.
 
-## [0.6](https://github.com/kevinpapst/kimai2/releases/tag/0.6)
+## [0.6](https://github.com/kimai/kimai/releases/tag/0.6)
 
 The API has some minor BC breaks: some fields were renamed and entities have a larger attribute set than collections. 
 Be aware that the API is still is development mode and shouldn't be considered stable for now.
 
-## [0.5](https://github.com/kevinpapst/kimai2/releases/tag/0.5)
+## [0.5](https://github.com/kimai/kimai/releases/tag/0.5)
 
 Some configuration nodes were removed, if you have one of them in your `local.yaml` you need to delete them before you start the update:
 - `kimai.invoice.calculator`
@@ -331,7 +331,7 @@ The new config `kimai.invoice.documents` was introduced, holding a list of direc
 **BC break:** InvoiceTemplate name was changed from 255 characters to 60. If you used longer invoice-template names, they will be truncated when upgrading the database.
 Please make sure that they are unique in the first 60 character before you upgrade your database with `doctrine:migrations:migrate`. 
 
-## [0.4](https://github.com/kevinpapst/kimai2/releases/tag/0.4)
+## [0.4](https://github.com/kimai/kimai/releases/tag/0.4)
 
 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:
@@ -347,7 +347,7 @@ sudo composer self-update
 sudo -u www-data composer update symfony/flex --no-plugins --no-scripts
 ```
 
-## [0.3](https://github.com/kevinpapst/kimai2/releases/tag/0.3)
+## [0.3](https://github.com/kimai/kimai/releases/tag/0.3)
 
 You need to adjust your `.env` file and add your `from` address for [all emails](https://www.kimai.org/documentation/emails.html) generated by Kimai 2:
 ```

assets/js/plugins/KimaiAjaxModalForm.js

@@ -146,7 +146,7 @@ export default class KimaiAjaxModalForm extends KimaiReducedClickHandler {
 
         // -----------------------------------------------------------------------
         // a fix for firefox focus problems with datepicker in modal
-        // see https://github.com/kevinpapst/kimai2/issues/618
+        // see https://github.com/kimai/kimai/issues/618
         let enforceModalFocusFn = jQuery.fn.modal.Constructor.prototype.enforceFocus;
         jQuery.fn.modal.Constructor.prototype.enforceFocus = function() {};
         remoteModal.on('hidden.bs.modal', function () {

package.json

@@ -1,5 +1,6 @@
 {
-  "homepage": "https://github.com/kevinpapst/kimai2",
+  "name": "kimai2",
+  "homepage": "https://github.com/kimai/kimai",
   "license": "MIT",
   "maintainers": [
     {
@@ -8,10 +9,9 @@
       "url": "https://www.kevinpapst.de"
     }
   ],
-  "name": "kimai2",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/kevinpapst/kimai2.git"
+    "url": "git+https://github.com/kimai/kimai.git"
   },
   "scripts": {
     "dev-server": "./node_modules/.bin/encore dev-server",

src/Constants.php

@@ -17,11 +17,11 @@ class Constants
     /**
      * The current release version
      */
-    public const VERSION = '1.30.0';
+    public const VERSION = '1.30.1';
     /**
      * The current release: major * 10000 + minor * 100 + patch
      */
-    public const VERSION_ID = 13000;
+    public const VERSION_ID = 13001;
     /**
      * The current release status, either "stable" or "dev"
      */
@@ -37,7 +37,7 @@ class Constants
     /**
      * Used in multiple views
      */
-    public const GITHUB = 'https://github.com/kevinpapst/kimai2/';
+    public const GITHUB = 'https://github.com/kimai/kimai/';
     /**
      * Homepage, used in multiple views
      */

src/Form/Type/UserType.php

@@ -42,7 +42,7 @@ class UserType extends AbstractType
             // an array of users, which will always be included in the result list
             // why? if the base entity could include disabled users, which should not be hidden in/removed from the list
             // eg. when editing a team that has disabled users, these users would be removed silently
-            // see https://github.com/kevinpapst/kimai2/pull/1841
+            // see https://github.com/kimai/kimai/pull/1841
             'include_users' => [],
             'documentation' => [
                 'type' => 'integer',

src/Invoice/Renderer/AbstractSpreadsheetRenderer.php

@@ -105,7 +105,7 @@ abstract class AbstractSpreadsheetRenderer extends AbstractRenderer
                 }
 
                 if ($contentLooksLikeFormula && $firstReplacerPos === 0) {
-                    // see https://github.com/kevinpapst/kimai2/pull/2054
+                    // see https://github.com/kimai/kimai/pull/2054
                     $cell->setValueExplicit($value, DataType::TYPE_STRING);
                 } else {
                     $cell->setValue($value);

src/Migrations/Version20190201150324.php

@@ -16,7 +16,7 @@ use Doctrine\DBAL\Schema\Schema;
 
 /**
  * Adds the timezone column to the timesheet table
- * See https://github.com/kevinpapst/kimai2/pull/372 for further information.
+ * See https://github.com/kimai/kimai/pull/372 for further information.
  *
  * @version 0.8
  */

src/Migrations/Version20210802174320.php

@@ -27,7 +27,7 @@ final class Version20210802174320 extends AbstractMigration
     public function up(Schema $schema): void
     {
         $teams = $schema->getTable('kimai2_teams');
-        // @see https://github.com/kevinpapst/kimai2/issues/2706
+        // @see https://github.com/kimai/kimai/issues/2706
         if ($teams->hasForeignKey('FK_3BEDDC7F8F7DE5D7')) {
             $teams->removeForeignKey('FK_3BEDDC7F8F7DE5D7');
         }

src/Timesheet/RateService.php

@@ -81,7 +81,7 @@ final class RateService implements RateServiceInterface
         }
 
         $factor = 1.00;
-        // do not apply once a value was calculated - see https://github.com/kevinpapst/kimai2/issues/1988
+        // do not apply once a value was calculated - see https://github.com/kimai/kimai/issues/1988
         if ($record->getFixedRate() === null && $record->getHourlyRate() === null) {
             $factor = $this->getRateFactor($record);
         }

templates/calendar/user.html.twig

@@ -289,7 +289,7 @@
                 height: 'auto',
                 nowIndicator: true,
                 now: '{{ now|date_format('c') }}',
-                {# see https://github.com/kevinpapst/kimai2/issues/2155 #}
+                {# see https://github.com/kimai/kimai/issues/2155 #}
                 timezone: '{{ app.user.timezone == 'UTC' ? 'GMT' : app.user.timezone }}',
                 weekends: {% if config.showWeekends %}true{% else %}false{% endif %},
                 businessHours: {

tests/Plugin/Fixtures/TestPlugin/composer.json

@@ -1,7 +1,7 @@
 {
   "name": "kimai/test-plugin-composer",
   "description": "Just a test fixture for the PluginManager",
-  "homepage": "https://github.com/kevinpapst/kimai2",
+  "homepage": "https://github.com/kimai/kimai",
   "type": "kimai-plugin",
   "require": {
     "kimai/kimai2-composer": "*",

tests/Plugin/PluginManagerTest.php

@@ -74,6 +74,6 @@ class PluginManagerTest extends TestCase
         $this->assertEquals('TestPlugin', $plugin->getId());
         $this->assertEquals('TestPlugin from composer.json', $plugin->getName());
         $this->assertEquals('Just a test fixture for the PluginManager', $meta->getDescription());
-        $this->assertEquals('https://github.com/kevinpapst/kimai2', $meta->getHomepage());
+        $this->assertEquals('https://github.com/kimai/kimai', $meta->getHomepage());
     }
 }