From 19db59ef86666fd9274d36db21db50f32668addb Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Sun, 1 Oct 2023 20:48:23 +0200 Subject: [PATCH 1/6] cleanup favicon and move to new location --- _docu_versioned/1.30.0/saml-google.md | 2 +- _documentation/saml-google.md | 2 +- _layouts/base.html | 6 +++--- _layouts/documentation.html | 2 +- apple-touch-icon.png | Bin 24282 -> 0 bytes favicon-32x32.png | Bin 5674 -> 0 bytes feed.xml | 4 ++-- {assets/icon => images}/apple-touch-icon.png | Bin {assets/icon => images}/favicon.ico | Bin {assets/icon => images}/icon_16x16.png | Bin {assets/icon => images}/icon_32x32.png | Bin touch-icon-192x192.png | Bin 43900 -> 0 bytes 12 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 apple-touch-icon.png delete mode 100644 favicon-32x32.png rename {assets/icon => images}/apple-touch-icon.png (100%) rename {assets/icon => images}/favicon.ico (100%) rename {assets/icon => images}/icon_16x16.png (100%) rename {assets/icon => images}/icon_32x32.png (100%) delete mode 100644 touch-icon-192x192.png diff --git a/_docu_versioned/1.30.0/saml-google.md b/_docu_versioned/1.30.0/saml-google.md index 4fcc2a64b..5d26a5023 100644 --- a/_docu_versioned/1.30.0/saml-google.md +++ b/_docu_versioned/1.30.0/saml-google.md @@ -55,7 +55,7 @@ You have to adjust more keys, please read the main SAML configuration! - Go to [https://admin.google.com/ac/apps/unified](https://admin.google.com/ac/apps/unified) - Choose "Add app" followed by "Add custom SAML app" -- Choose your app name (e.g. "Kimai") and [add this image](http://www.kimai.org/assets/icon/apple-touch-icon.png) +- Choose your app name (e.g. "Kimai") and [add this image](http://www.kimai.org/images/apple-touch-icon.png) - Copy & paste the values from the Google Step-by-Step (page 2) guide into your Kimai configuration: - `SSO-URL` into `Single Sign-On URL` - `Entity-ID` into `Entity ID` diff --git a/_documentation/saml-google.md b/_documentation/saml-google.md index d554d0c79..e5c6d10d4 100644 --- a/_documentation/saml-google.md +++ b/_documentation/saml-google.md @@ -56,7 +56,7 @@ You have to adjust more keys, please read the main SAML configuration! - Go to [https://admin.google.com/ac/apps/unified](https://admin.google.com/ac/apps/unified) - Choose "Add app" followed by "Add custom SAML app" -- Choose your app name (e.g. "Kimai") and [add this image](http://www.kimai.org/assets/icon/apple-touch-icon.png) +- Choose your app name (e.g. "Kimai") and [add this image](http://www.kimai.org/images/apple-touch-icon.png) - Copy & paste the values from the Google Step-by-Step (page 2) guide into your Kimai configuration: - `SSO-URL` into `Single Sign-On URL` - `Entity-ID` into `Entity ID` diff --git a/_layouts/base.html b/_layouts/base.html index dfbef256b..fd67847b1 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -13,9 +13,9 @@ - - - + + + {%- assign page_title = page.title %} {%- assign prefix = ' – Kimai' %} diff --git a/_layouts/documentation.html b/_layouts/documentation.html index c78a08745..48ce12580 100644 --- a/_layouts/documentation.html +++ b/_layouts/documentation.html @@ -9,7 +9,7 @@ </button> <div class="navbar-brand navbar-brand-autodark h1"> <a href="{% link _pages/documentation.md %}" class="header-brand"> - <img src="{{ '/assets/icon/apple-touch-icon.png' | absolute_url }}" height="32" class="navbar-brand-image me-1" alt="Kimai logo"> Kimai – Docs + <img src="{{ '/images/apple-touch-icon.png' | absolute_url }}" height="32" class="navbar-brand-image me-1" alt="Kimai logo"> Kimai – Docs </a> </div> <div class="navbar-nav flex-row d-lg-none"> diff --git a/apple-touch-icon.png b/apple-touch-icon.png deleted file mode 100644 index 3668f51d74c85990d669ea859ca1b8615ebceef6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24282 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 Bt4#m^ diff --git a/favicon-32x32.png b/favicon-32x32.png deleted file mode 100644 index e8a0715f0344e2d58c9132521bb2a8850eb6a5e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5674 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 KnObS{kbeR3nzh{k diff --git a/feed.xml b/feed.xml index efa695b64..1958ba8db 100644 --- a/feed.xml +++ b/feed.xml @@ -27,7 +27,7 @@ redirect_from: <description>Kimai - an open source time tracking software for freelancer and agencies</description> <image> <description>Kimai logo</description> - <url>https://www.kimai.org/assets/icon/apple-touch-icon.png</url> + <url>https://www.kimai.org/images/apple-touch-icon.png</url> <title>Kimai - Open Source Time-Tracking https://www.kimai.org/ 184 @@ -58,4 +58,4 @@ redirect_from: {% endif %} {% endfor %} - \ No newline at end of file + diff --git a/assets/icon/apple-touch-icon.png b/images/apple-touch-icon.png similarity index 100% rename from assets/icon/apple-touch-icon.png rename to images/apple-touch-icon.png diff --git a/assets/icon/favicon.ico b/images/favicon.ico similarity index 100% rename from assets/icon/favicon.ico rename to images/favicon.ico diff --git a/assets/icon/icon_16x16.png b/images/icon_16x16.png similarity index 100% rename from assets/icon/icon_16x16.png rename to images/icon_16x16.png diff --git a/assets/icon/icon_32x32.png b/images/icon_32x32.png similarity index 100% rename from assets/icon/icon_32x32.png rename to images/icon_32x32.png diff --git a/touch-icon-192x192.png b/touch-icon-192x192.png deleted file mode 100644 index a22c7704d78c7040baf8bb67196b239e1d493d18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43900 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 From 68c2aa8d10e98c1d544739b923a52f6fe5a8adc6 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Mon, 2 Oct 2023 07:28:16 +0200 Subject: [PATCH 2/6] added missing .table classes --- _docu_versioned/1.14/theme.md | 1 + _docu_versioned/1.14/users.md | 1 + _docu_versioned/1.30.0/imports.md | 2 ++ _docu_versioned/1.30.0/plugin-import.md | 2 ++ _docu_versioned/1.30.0/rates.md | 1 + _docu_versioned/1.30.0/saml-azure.md | 1 + _docu_versioned/1.30.0/saml-google.md | 1 + _docu_versioned/1.30.0/translations.md | 1 + _documentation/api-pagination.md | 3 ++- _documentation/developers.md | 1 + _documentation/emails.md | 1 + _documentation/invoices.md | 5 +++++ _documentation/permissions.md | 2 ++ _documentation/plugin-import.md | 4 ++++ _documentation/rates.md | 1 + _documentation/saml-azure.md | 1 + _documentation/saml-google.md | 1 + _documentation/sql-examples.md | 2 ++ _documentation/theme.md | 2 +- _documentation/translations.md | 1 + _includes/pages/demo-users.md | 1 + 21 files changed, 33 insertions(+), 2 deletions(-) diff --git a/_docu_versioned/1.14/theme.md b/_docu_versioned/1.14/theme.md index a00cdb860..c6769ef47 100644 --- a/_docu_versioned/1.14/theme.md +++ b/_docu_versioned/1.14/theme.md @@ -29,6 +29,7 @@ Please stick to the following alignments in your listing: | Text | Left | | Count (int) | Center (badge) | | Collections (Text) | Left (label) | +{: .table } Always align the table header to the content cell. diff --git a/_docu_versioned/1.14/users.md b/_docu_versioned/1.14/users.md index 020a3336f..ec9e94f55 100644 --- a/_docu_versioned/1.14/users.md +++ b/_docu_versioned/1.14/users.md @@ -31,6 +31,7 @@ There are four pre-defined roles in Kimai, which define the ACLs/permissions. | ROLE_TEAMLEAD | Manages [teams]({% link _documentation/teams.md %}) with permissions for invoices and access to all **team** timesheets | | ROLE_ADMIN | Can manage all content and timesheet related data, but lack user administration and system privileges | | ROLE_SUPER_ADMIN | Has permissions to manage everything in Kimai, from content to timesheets to users, plugins and system configurations | +{: .table } {% include alert.html type="success" alert="Every user is automatically member of the ROLE_USER, this behaviour cannot be changed." %} diff --git a/_docu_versioned/1.30.0/imports.md b/_docu_versioned/1.30.0/imports.md index 2fc993a4c..8921bd8e1 100644 --- a/_docu_versioned/1.30.0/imports.md +++ b/_docu_versioned/1.30.0/imports.md @@ -45,6 +45,7 @@ Supported attributes (field names are case-insensitive): | Time budget | time budget, time-budget | | Visible | visible | | Meta fields | meta.xxx | +{: .table } ### Options @@ -118,6 +119,7 @@ Supported attributes (field names are case-insensitive): | Time budget | time budget, time-budget | | Visible | visible | | Meta fields | meta.xxx | +{: .table } ### Options diff --git a/_docu_versioned/1.30.0/plugin-import.md b/_docu_versioned/1.30.0/plugin-import.md index 5061b78e4..d051ab0a1 100644 --- a/_docu_versioned/1.30.0/plugin-import.md +++ b/_docu_versioned/1.30.0/plugin-import.md @@ -32,6 +32,7 @@ Supported attributes (field names are case-insensitive): | Time budget | time budget, time-budget | | Visible | visible | | Meta fields | meta.xxx | +{: .table } #### Example @@ -64,6 +65,7 @@ Supported attributes (field names are case-insensitive): | Time budget | time budget, time-budget | | Visible | visible | | Meta fields | meta.xxx | +{: .table } #### Example diff --git a/_docu_versioned/1.30.0/rates.md b/_docu_versioned/1.30.0/rates.md index a318cce74..85985267f 100644 --- a/_docu_versioned/1.30.0/rates.md +++ b/_docu_versioned/1.30.0/rates.md @@ -66,6 +66,7 @@ This leads to the following decision matrix: |----------------|---------------|--------------|---------------| | None-user rule | 5 | 3 | 1 | | User specific | 6 | 4 | 2 | +{: .table } If no rate can be found, the `users hourly-rate preference` will be used to calculate the records rate. In case that the `users hourly-rate` is not set or equals `0`, the records rate will be set to `0`. diff --git a/_docu_versioned/1.30.0/saml-azure.md b/_docu_versioned/1.30.0/saml-azure.md index ddc6ba3db..fef05a813 100644 --- a/_docu_versioned/1.30.0/saml-azure.md +++ b/_docu_versioned/1.30.0/saml-azure.md @@ -43,6 +43,7 @@ This documentation is available in other languages as well [in the Microsoft doc | Reply URL (Assertion Consumer Service URL) | https://timetracking.example.com/auth/saml/acs | | Sign on URL | https://timetracking.example.com/ | | Logout Url | https://timetracking.example.com/auth/saml/logout | +{: .table } - Edit the **User Attributes & Claims** and ensure the following settings: {% include docs-image.html src="/images/documentation/azure-saml-pic4.png" title="User Attributes & Claims" width="900px" %} diff --git a/_docu_versioned/1.30.0/saml-google.md b/_docu_versioned/1.30.0/saml-google.md index 5d26a5023..14f2536f5 100644 --- a/_docu_versioned/1.30.0/saml-google.md +++ b/_docu_versioned/1.30.0/saml-google.md @@ -74,6 +74,7 @@ You have to adjust more keys, please read the main SAML configuration! | Basic Information > Last name | LastName | | Employee Details > Employee ID | AccountNumber | | Employee Details > Title | Title | + {: .table } - Back on the overview page: activate the new application for your users - The last configuration step takes care of the `User role` mapping, which can be defined in two ways: - Using Google Groups (recommended): diff --git a/_docu_versioned/1.30.0/translations.md b/_docu_versioned/1.30.0/translations.md index e307c30a5..a77f25483 100644 --- a/_docu_versioned/1.30.0/translations.md +++ b/_docu_versioned/1.30.0/translations.md @@ -42,6 +42,7 @@ Feel free to send your self-made language files or contributing to the weblate p | Swedish | [![Translation status](https://hosted.weblate.org/widgets/kimai/sv/svg-badge.svg)](https://hosted.weblate.org/engage/kimai/sv/) | | Turkish | [![Translation status](https://hosted.weblate.org/widgets/kimai/tr/svg-badge.svg)](https://hosted.weblate.org/engage/kimai/tr/) | | Vietnamese | [![Translation status](https://hosted.weblate.org/widgets/kimai/vi/svg-badge.svg)](https://hosted.weblate.org/engage/kimai/vi/) | +{: .table } Languages and translations in Kimai are configurable. Read below how to add a new language and configure the output formats for date and time values. diff --git a/_documentation/api-pagination.md b/_documentation/api-pagination.md index b92bc08d6..bee7380f6 100644 --- a/_documentation/api-pagination.md +++ b/_documentation/api-pagination.md @@ -38,4 +38,5 @@ Here's a summary of the meaning of each of these headers: | X-Total-Count | Description | 1142 | | X-Total-Pages | Description | 23 | | X-Per-Page | Description | 50 | - +{: .table } + diff --git a/_documentation/developers.md b/_documentation/developers.md index 6c8f918b1..de7c6bfb9 100644 --- a/_documentation/developers.md +++ b/_documentation/developers.md @@ -66,6 +66,7 @@ You can now log in with these accounts: | tony_teamlead | kitten | api_kitten | Teamlead | | anna_admin | kitten | api_kitten | Administrator | | susan_super | kitten | api_kitten | Super-Administrator | +{: .table } Demo data can always be deleted by dropping the schema and re-creating it. The `kimai:reset:dev` command will do that automatically and can always be executed later on to reset your dev database and cache. diff --git a/_documentation/emails.md b/_documentation/emails.md index f86aeaa29..e2e2c9679 100644 --- a/_documentation/emails.md +++ b/_documentation/emails.md @@ -38,6 +38,7 @@ The following specialized transports (usually helper to simplify the connection | SendGrid | composer require symfony/sendgrid-mailer | `sendgrid+smtp://KEY@default` | | Sendinblue | composer require symfony/sendinblue-mailer | `sendinblue+smtp://USERNAME:PASSWORD@default` | | OhMySMTP | composer require symfony/oh-my-smtp-mailer | `ohmysmtp+smtp://API_TOKEN@default` | +{: .table } Be aware that you can achieve the same in most cases (without installing composer packages) by rewriting the MAILER_URL, e.g.: diff --git a/_documentation/invoices.md b/_documentation/invoices.md index 8769c63a4..df9d038a2 100644 --- a/_documentation/invoices.md +++ b/_documentation/invoices.md @@ -409,6 +409,7 @@ Twig rendering is different, you have to access the variables with `{% raw %}{{ | ${user.title} | The current users title | | ${user.see_others} | A boolean indicating if the current user can see other users items | | ${user.meta.X} | The current users [preference]({% link _documentation/user-preferences.md %}) named `X` | +{: .table } ### Timesheet entry variables @@ -452,6 +453,7 @@ For each timesheet record you can use these variables: | ${entry.meta.foo} | The [meta field]({% link _documentation/meta-fields.md %}) with the internal name `foo` (must be in lowercase letters, e.g. `FOO` will be available as `${entry.meta.foo}`. Only available if the field is visible. | | ${entry.type} | The type of this entry (plugins can add custom types) | timesheet | | ${entry.category} | The category of this entry (plugins can add custom types) | work | +{: .table } ### Customer variables @@ -478,6 +480,7 @@ Variables for the customer who is receiving the invoice: | ${customer.budget_open_plain} | The open monetary budget for this customer at the end date of your filter query (plain float value) (since 1.16.7) | | ${customer.time_budget_open} | The open time budget for this customer at the end date of your filter query (formatted) (since 1.16.7) | | ${customer.time_budget_open_plain} | The open time budget for this customer at the end date of your filter query (integer value = seconds) (since 1.16.7) | +{: .table } ### Project variables @@ -503,6 +506,7 @@ The following variables exist, if projects could be found in the filtered data: | ${project.budget_open_plain} | The open monetary budget for this project at the end date of your filter query (plain float value) (since 1.16.7) | | ${project.time_budget_open} | The open time budget for this project at the end date of your filter query (formatted) (since 1.16.7) | | ${project.time_budget_open_plain} | The open time budget for this project at the end date of your filter query (integer value = seconds) (since 1.16.7) | +{: .table } If more than one project was found, you will have further variables (same list as above) called `${project.1.name}`, `${project.2.name}` and so on. The order is not guaranteed, so it is not recommended relying on those variables. @@ -522,6 +526,7 @@ The following variables exist, if activities could be found in the filtered data | ${activity.budget_open_plain} | The open monetary budget for this activity at the end date of your filter query (plain float value) (since 1.16.7) | | ${activity.time_budget_open} | The open time budget for this activity at the end date of your filter query (formatted) (since 1.16.7) | | ${activity.time_budget_open_plain} | The open time budget for this activity at the end date of your filter query (integer value = seconds) (since 1.16.7) | +{: .table } If more than one activity was found, you will have further variables (same list as above) called `${activity.1.name}`, `${activity.2.name}` and so on. The order is not guaranteed, so it is not recommended relying on those variables. diff --git a/_documentation/permissions.md b/_documentation/permissions.md index b0208b9bf..ac2030e18 100644 --- a/_documentation/permissions.md +++ b/_documentation/permissions.md @@ -26,6 +26,7 @@ There are four pre-defined roles in Kimai, which have a customizable set of ACLs | Teamlead | Manages [teams]({% link _documentation/teams.md %}) with permissions for invoices and access to all **team** timesheets. Technical name: `ROLE_TEAMLEAD` | | Administrator | Can manage all content and timesheet related data, but lack user administration and system privileges. Technical name: `ROLE_ADMIN` | | System-Admin | Has permissions to manage everything in Kimai, from content to timesheets to users, plugins and system configurations. Technical name: `ROLE_SUPER_ADMIN` | +{: .table } {% include alert.html type="success" alert="Every user is automatically member of the ROLE_USER, this behaviour cannot be changed." %} @@ -203,6 +204,7 @@ This is the full list of existing permissions with short descriptions: | system_configuration | Configure global Kimai settings | | system_information | Enter the system-information (about) screen | | view_all_data | **SECURITY ALERT**: Allows to see all data (disables team permissions) - `System-Admins` will always own that permission | +{: .table } **Be aware** There are other business rules which might limit access to certain functions, so these permissions are not the only checks in place. diff --git a/_documentation/plugin-import.md b/_documentation/plugin-import.md index 7ca926642..fca81edcf 100644 --- a/_documentation/plugin-import.md +++ b/_documentation/plugin-import.md @@ -31,6 +31,7 @@ Supported attributes (field names are case-insensitive): | Time budget | time budget, time-budget | | Visible | visible | | Meta fields | meta.xxx | +{: .table } ### Example @@ -63,6 +64,7 @@ Supported attributes (field names are case-insensitive): | Time budget | time budget, time-budget | | Visible | visible | | Meta fields | meta.xxx | +{: .table } ### Example @@ -110,6 +112,7 @@ This will import timesheets and create these elements on the fly: | To | TODO ... | | User | Username | | Email | User email (required when creating users) | +{: .table } ### User handling @@ -160,6 +163,7 @@ Want to switch from Clockify to Kimai? Export the data in Clockify, open it in E | Duration (decimal) | The timesheet duration | | Billable Rate (XXX) | Timesheet hourly rate. XXX = currency (which is not imported, but needs to be configured for the customer) | | Billable Amount (XXX) | Timesheet total rate. XXX = currency (which is not imported, but needs to be configured for the customer) | +{: .table } **BE AWARE** you have to choose the correct date-format in Clockify, otherwise you will see errors like: ``` diff --git a/_documentation/rates.md b/_documentation/rates.md index c01a6a4e8..9fbb5ad0a 100644 --- a/_documentation/rates.md +++ b/_documentation/rates.md @@ -85,6 +85,7 @@ This leads to the following decision matrix: |----------------|-----------|---------|----------| | None-user rule | 5 | 3 | 1 | | User specific | 6 | 4 | 2 | +{: .table } If no price can be found, the `users hourly-price preference` will be used to calculate the records rate. In case that the `users hourly-price` is not set or equals `0`, the records rate will be set to `0`. diff --git a/_documentation/saml-azure.md b/_documentation/saml-azure.md index 6d41be349..6e0a7d6f2 100644 --- a/_documentation/saml-azure.md +++ b/_documentation/saml-azure.md @@ -44,6 +44,7 @@ This documentation is available in other languages as well [in the Microsoft doc | Reply URL (Assertion Consumer Service URL) | https://timetracking.example.com/auth/saml/acs | | Sign on URL | https://timetracking.example.com/ | | Logout Url | https://timetracking.example.com/auth/saml/logout | +{: .table } - Edit the **User Attributes & Claims** and ensure the following settings: {% include docs-image.html src="/images/documentation/azure-saml-pic4.png" title="User Attributes & Claims" width="900px" %} diff --git a/_documentation/saml-google.md b/_documentation/saml-google.md index e5c6d10d4..f1deca8f0 100644 --- a/_documentation/saml-google.md +++ b/_documentation/saml-google.md @@ -75,6 +75,7 @@ You have to adjust more keys, please read the main SAML configuration! | Basic Information > Last name | LastName | | Employee Details > Employee ID | AccountNumber | | Employee Details > Title | Title | + {: .table } - Back on the overview page: activate the new application for your users - The last configuration step takes care of the `User role` mapping, which can be defined in two ways: - Using Google Groups (recommended): diff --git a/_documentation/sql-examples.md b/_documentation/sql-examples.md index 9c8bf4708..90dd5b29b 100644 --- a/_documentation/sql-examples.md +++ b/_documentation/sql-examples.md @@ -30,6 +30,7 @@ The output looks like this: | Acme company | test@example.com | John Doe | 1,745.4 | | Acme company | chris_user | Chris Maier | 45.8 | | Foo Bar | test@example.com | John Doe | 345.0 | +{: .table } Duration is formatted as decimal time. So `1,745.4` is one-thousand-seven-hundred-forty-five hours and 24 minutes. @@ -57,6 +58,7 @@ GROUP BY | test@example.com | John Doe | Acme company | 1,745.4 | | test@example.com | John Doe | Foo Bar | 345.0 | | chris_user | Chris Maier | Acme company | 45.8 | +{: .table } Duration is formatted as decimal time. So `1,745.4` is one-thousand-seven-hundred-forty-five hours and 24 minutes. diff --git a/_documentation/theme.md b/_documentation/theme.md index c661ebbb1..35f5a0044 100644 --- a/_documentation/theme.md +++ b/_documentation/theme.md @@ -33,7 +33,7 @@ Use the following alignments in your data-tables: | Text | Start | | | Count (int) | Center | badge | | Collections (Text) | Start | label | - +{: .table } ## Max. active entries warning diff --git a/_documentation/translations.md b/_documentation/translations.md index 0362c0a2a..622ada2de 100644 --- a/_documentation/translations.md +++ b/_documentation/translations.md @@ -17,6 +17,7 @@ Feel free to send your self-made language files or contributing to the weblate p {%- for locale in site.data.multi-language %} | {{ locale[1] }} | [![Translation status](https://hosted.weblate.org/widgets/kimai/{{ locale[0] }}/svg-badge.svg)](https://hosted.weblate.org/engage/kimai/{{ locale[0] }}/) | {%- endfor %} +{: .table } All translations in Kimai are managed at Weblate and should be changed there exclusively! Do not chang ethe source files of Kimai. diff --git a/_includes/pages/demo-users.md b/_includes/pages/demo-users.md index 7b77beecf..42fb5fa50 100644 --- a/_includes/pages/demo-users.md +++ b/_includes/pages/demo-users.md @@ -6,3 +6,4 @@ | **anna_admin** ({{ site.data[page.lang].translation.demo.role_admin }}) | **kitten** | api_kitten | | **susan_super** ({{ site.data[page.lang].translation.demo.role_super }}) | **kitten** | api_kitten | | **admin** ({{ site.data[page.lang].translation.demo.role_super }}) | **password** | - | +{: .table } From 6215b56150b8627192c1e7f001c7462656d5d0a0 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Mon, 2 Oct 2023 22:37:35 +0200 Subject: [PATCH 3/6] remove ancient content --- _posts/2007-01-14-the-backend-of-kimai.md | 28 ----------- .../2007-01-14-the-kimai-front-end-plans.md | 22 -------- _posts/2007-01-19-time-views.md | 14 ------ _posts/2007-01-20-2000-downloads.md | 10 ---- _posts/2007-04-09-jquery-rocks.md | 11 ---- _posts/2007-04-13-opera-and-explorer.md | 16 ------ _posts/2007-04-24-join-us.md | 13 ----- _posts/2007-05-29-new-team-members.md | 9 ---- .../2007-06-22-first-look-of-kimai-0-7-x.md | 17 ------- ...2007-07-29-0-7-9-available-for-download.md | 10 ---- _posts/2007-08-08-update-problem.md | 15 ------ _posts/2007-08-26-version-0-7-10-released.md | 12 ----- _posts/2007-08-27-csv-export.md | 17 ------- ...ssword-encryption-bugfix-release-0-7-11.md | 11 ---- _posts/2007-09-24-statistics-extension.md | 12 ----- ...d-be-called-yash-yet-another-stats-hack.md | 12 ----- _posts/2007-10-20-mysql-5.md | 12 ----- .../2007-10-29-subversion-and-bugtracker.md | 13 ----- _posts/2007-11-11-windows-integration.md | 11 ---- _posts/2008-01-24-2-new-frontenders.md | 12 ----- _posts/2008-02-01-new-logo.md | 10 ---- ...008-02-19-kimai-comes-redesigned-in-0-8.md | 10 ---- _posts/2008-04-20-bye-tom.md | 10 ---- _posts/2008-04-20-new-website-online.md | 11 ---- _posts/2008-04-24-new-php-developer.md | 12 ----- .../2008-04-26-wanted-extension-developers.md | 12 ----- ...2008-07-27-beta-testers-wanted-for-v0-8.md | 18 ------- _posts/2008-08-25-self-test.md | 12 ----- _posts/2008-08-31-0-8-0-out-now.md | 20 -------- _posts/2008-09-03-pdo-problems-in-0-8-0.md | 16 ------ _posts/2008-12-15-schon-wieder-geburtstag.md | 2 +- _posts/2009-01-04-pre-release-for-testers.md | 24 --------- ...09-02-07-0-8-0-819-for-testers-pdo-only.md | 15 ------ _posts/2009-02-08-kimai-0-7-12.md | 37 -------------- _posts/2009-06-19-bye-bye-folks.md | 2 +- .../2009-07-20-the-condemned-live-longer.md | 2 +- ...8-22-a-very-promising-extension-package.md | 10 ---- _posts/2009-08-23-v0-8-1-884-released.md | 10 ---- ...2009-11-05-release-candidate-kimai-v0-9.md | 18 ------- _posts/2009-11-20-kimai-0-9-released.md | 25 ---------- ...-03-26-new-beta-version-0-9-1-available.md | 41 --------------- _posts/2010-06-19-beta-2-for-kimai-0-9-1.md | 39 --------------- _posts/2010-08-01-kimai-0-9-1-is-released.md | 18 ------- _posts/2011-01-05-happy-birthday-kimai.md | 2 +- _posts/2011-01-05-kimai-0-9-2-beta.md | 50 ------------------- _posts/2011-02-25-kimai-0-9-2-beta-the-2nd.md | 23 --------- _posts/2013-08-03-test-kimai-v0-9-3-beta-1.md | 48 ------------------ _posts/2014-04-30-kimai-0-9-3-rc-1.md | 18 ------- _posts/2014-04-30-kimai-apps.md | 12 ----- 49 files changed, 4 insertions(+), 800 deletions(-) delete mode 100644 _posts/2007-01-14-the-backend-of-kimai.md delete mode 100644 _posts/2007-01-14-the-kimai-front-end-plans.md delete mode 100644 _posts/2007-01-19-time-views.md delete mode 100644 _posts/2007-01-20-2000-downloads.md delete mode 100644 _posts/2007-04-09-jquery-rocks.md delete mode 100644 _posts/2007-04-13-opera-and-explorer.md delete mode 100644 _posts/2007-04-24-join-us.md delete mode 100644 _posts/2007-05-29-new-team-members.md delete mode 100644 _posts/2007-06-22-first-look-of-kimai-0-7-x.md delete mode 100644 _posts/2007-07-29-0-7-9-available-for-download.md delete mode 100644 _posts/2007-08-08-update-problem.md delete mode 100644 _posts/2007-08-26-version-0-7-10-released.md delete mode 100644 _posts/2007-08-27-csv-export.md delete mode 100644 _posts/2007-09-15-password-encryption-bugfix-release-0-7-11.md delete mode 100644 _posts/2007-09-24-statistics-extension.md delete mode 100644 _posts/2007-10-20-it-could-be-called-yash-yet-another-stats-hack.md delete mode 100644 _posts/2007-10-20-mysql-5.md delete mode 100644 _posts/2007-10-29-subversion-and-bugtracker.md delete mode 100644 _posts/2007-11-11-windows-integration.md delete mode 100644 _posts/2008-01-24-2-new-frontenders.md delete mode 100644 _posts/2008-02-01-new-logo.md delete mode 100644 _posts/2008-02-19-kimai-comes-redesigned-in-0-8.md delete mode 100644 _posts/2008-04-20-bye-tom.md delete mode 100644 _posts/2008-04-20-new-website-online.md delete mode 100644 _posts/2008-04-24-new-php-developer.md delete mode 100644 _posts/2008-04-26-wanted-extension-developers.md delete mode 100644 _posts/2008-07-27-beta-testers-wanted-for-v0-8.md delete mode 100644 _posts/2008-08-25-self-test.md delete mode 100644 _posts/2008-08-31-0-8-0-out-now.md delete mode 100644 _posts/2008-09-03-pdo-problems-in-0-8-0.md delete mode 100644 _posts/2009-01-04-pre-release-for-testers.md delete mode 100644 _posts/2009-02-07-0-8-0-819-for-testers-pdo-only.md delete mode 100644 _posts/2009-02-08-kimai-0-7-12.md delete mode 100644 _posts/2009-08-22-a-very-promising-extension-package.md delete mode 100644 _posts/2009-08-23-v0-8-1-884-released.md delete mode 100644 _posts/2009-11-05-release-candidate-kimai-v0-9.md delete mode 100644 _posts/2009-11-20-kimai-0-9-released.md delete mode 100644 _posts/2010-03-26-new-beta-version-0-9-1-available.md delete mode 100644 _posts/2010-06-19-beta-2-for-kimai-0-9-1.md delete mode 100644 _posts/2010-08-01-kimai-0-9-1-is-released.md delete mode 100644 _posts/2011-01-05-kimai-0-9-2-beta.md delete mode 100644 _posts/2011-02-25-kimai-0-9-2-beta-the-2nd.md delete mode 100644 _posts/2013-08-03-test-kimai-v0-9-3-beta-1.md delete mode 100644 _posts/2014-04-30-kimai-0-9-3-rc-1.md delete mode 100644 _posts/2014-04-30-kimai-apps.md diff --git a/_posts/2007-01-14-the-backend-of-kimai.md b/_posts/2007-01-14-the-backend-of-kimai.md deleted file mode 100644 index 8c5f58094..000000000 --- a/_posts/2007-01-14-the-backend-of-kimai.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -title: "The backend of Kimai" -date: "2007-01-14 21:18:41 +0200" -author: skilleven -tags: [v1] -tags: [v1] ---- - -At this moment we are radically rewriting the core of Kimai. -This is a necessary step for further development. -As Kimai grows it will be harder to manage, so a good solid structure must exist. -The basic idea behind the rewrite is separation of 'layout' and function: -the parts of Kimai that generate HTML will be in one place, the functionality behind it is in other places. -The big advantage is clear, I think: front-end developers can work on the HTML without being able to break the PHP code. -And PHP developers can not break the HTML. -This actually just means that specialists can concentrate on their field of work and do a better job in less time. - -This big change in the core of Kimai will not be noticed by most users. -Kimai will still have the same look and feel. -There are some other changes planned that will affect the user experience in a positive way, though most users will not even notice it. -First of all security. The rewrite will fix some minor security issues that we found. -And the second change is the speed. We will introduce a caching system which will make Kimai run faster. - -This also means that it is easier for users to change the HTML to their specific needs and that people can make their own custom HTML-themes. -This seems like a positive change. But we don't propagate it. The reason why is that the functionality of Kimai might change in future versions. -All custom themes should be changed whenever there is a change in the HTML and we can't guarantee this for third party templates. -It will of course be possible to change the look and feel of Kimai with CSS. -The HTML and CSS are set up in such a way that radical layout changes are possible without touching the HTML. diff --git a/_posts/2007-01-14-the-kimai-front-end-plans.md b/_posts/2007-01-14-the-kimai-front-end-plans.md deleted file mode 100644 index 71fb12dd2..000000000 --- a/_posts/2007-01-14-the-kimai-front-end-plans.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -title: "The Kimai front-end plans" -date: "2007-01-14 13:06:47 +0200" -author: skilleven -tags: [v1] -tags: [v1] ---- - -There are some major changes planned for the front-end part (HTML and JavaScript) of Kimai. -First of all, the current version of Kimai is totally dependent on JavaScript. -Without JavaScript Kimai doesn't work. -We are working on a future version which will still work perfectly when JavaScript is disabled or crippled. -Don't worry, the nice JavaScript effects will keep on working, but only if JavaScript is enabled. - -The next big change will be browser support. -A future version of Kimai will work on all browsers. -Right now only real browsers are supported, in the future we will support Explorer versions as well. -These two changes are necessary for a web based time tracker. -Many freelancers don't work from one location so they are dependent on the network and computer settings provided by the company they are at the moment. -Not all networks allow (advanced) JavaScript and not all computers have a real browser installed. - -We are also working on some layout options. We'll keep you posted on the progress we're making. diff --git a/_posts/2007-01-19-time-views.md b/_posts/2007-01-19-time-views.md deleted file mode 100644 index 9aa8e4726..000000000 --- a/_posts/2007-01-19-time-views.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -title: "Time Views" -date: "2007-01-19 23:44:00 +0200" -author: skilleven -tags: [v1] ---- - -We are working on some user interface changes. -An important one that deserves to be mentioned is the 'Time View Selector'. -In the current version you can select a day, a month or a year. -This is not as flexible as it ought to be. -In version 1.0 you will be able to define a custom date range. -An example: if a project started in November 2006 and ended in January 2007 you can view this timespace. -Of course there will still be options to quickly select some useful predefined date ranges like last week, a certain month or a certain year. diff --git a/_posts/2007-01-20-2000-downloads.md b/_posts/2007-01-20-2000-downloads.md deleted file mode 100644 index a38e0c6aa..000000000 --- a/_posts/2007-01-20-2000-downloads.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "2000+ downloads!" -date: "2007-01-20 11:13:00 +0200" -author: skilleven -tags: [v1] ---- - -We would like to thank everybody who have downloaded and tried the beta versions of Kimai so far. -We just cracked the 2000 downloads mark when we take only [MacUpdate](http://www.macupdate.com/info.php/id/23590) as a reference. -Please keep testing and please do give us feedback on [our forum]({{ site.kimai_v1_repo }}/issues). Thanks! diff --git a/_posts/2007-04-09-jquery-rocks.md b/_posts/2007-04-09-jquery-rocks.md deleted file mode 100644 index cf32ec6fa..000000000 --- a/_posts/2007-04-09-jquery-rocks.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: "jQuery rocks!" -date: "2007-04-09 08:38:47 +0200" -author: skilleven -tags: [v1] ---- - -I confess, this is very technical. But I'm bound to say that implementing the jQuery lib was a very good decision. -This thing rocks like crazy! Just have a look at the revised JavaScript of Kimai, compare it with the scripts in version 0.6.1 and you know what I'm talking about... - -Thanks again John Resig for this awesome framework! Find out why jQuery rocks [via Google](http://www.google.de/search?q=jquery+rocks). diff --git a/_posts/2007-04-13-opera-and-explorer.md b/_posts/2007-04-13-opera-and-explorer.md deleted file mode 100644 index 0b450fde9..000000000 --- a/_posts/2007-04-13-opera-and-explorer.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: "Opera and Explorer" -date: "2007-04-13 06:09:46 +0200" -author: skilleven -tags: [v1] ---- - -Kimai's upcoming beta will now work perfectly with Opera. -Its CSS and Javascript behavior are almost the same as in Firefox. -Internet Explorer seems to be a bit of a problem though. -Explorer handles the DOM in a different way than other browsers. -Due to that it may take a bit of work here. -If somebody has experiences regarding the HTTP-Request behavior of jQuery under Internet Explorer, I welcome any hints ;) - -So, Kimai 0.7.0 will fully support Opera (tested on 9.20). -Internet Explorer (up from version 7) might then be supported in the following beta version. diff --git a/_posts/2007-04-24-join-us.md b/_posts/2007-04-24-join-us.md deleted file mode 100644 index 41e1cfde4..000000000 --- a/_posts/2007-04-24-join-us.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: "Join us!" -date: "2007-04-24 15:49:57 +0200" -author: skilleven -tags: [Team] ---- - -Since Kimai is slowly moving closer to a genuine 1.0.0 release, the need for proper documentation/help to accompany the software is increasing. -We're looking for a new team member, who can make the documentation for Kimai. -Please [contact us]({{ site.kimai_v1_repo }}/issues) if you think you could do this. -Furthermore we're looking for some more official beta-testers. - -Before 0.7.0 finally releases some of you may want to have a preview and test its weaknesses. diff --git a/_posts/2007-05-29-new-team-members.md b/_posts/2007-05-29-new-team-members.md deleted file mode 100644 index 2ecc9a62d..000000000 --- a/_posts/2007-05-29-new-team-members.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -title: "New Team Members" -date: "2007-05-29 22:11:00 +0200" -author: skilleven -tags: [Team] ---- - -We welcome Torben Boe from HamBug as Quality Management Representative. -I'm also very happy to announce a new Kimai PHP developer: Thomas Wensing is going to join the crew by friday June, 1st. diff --git a/_posts/2007-06-22-first-look-of-kimai-0-7-x.md b/_posts/2007-06-22-first-look-of-kimai-0-7-x.md deleted file mode 100644 index f39ede939..000000000 --- a/_posts/2007-06-22-first-look-of-kimai-0-7-x.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -title: "First Look of Kimai 0.7.x" -date: "2007-06-22 08:10:38 +0200" -author: skilleven -tags: [v1] ---- - -After countless hours of development work, Kimai is finally at a stage of development that allows us to offer you a first look of our next release. -This version is still under heavy development and is not ready for download or install onto your server. -We have, however, set up a demo that you can experiment with http://kimai-dev.hambug.net/ to give us your feedback. - -Please be aware that this release has several ugly bugs, such as problems with Umlauts and cosmetic/operational browser incompatibilities. -Since the demo has to run in virtual user mode, no administration panel is available. -These issues/limitations should not prevent you from experiencing Kimai. -Feel free to send us bug reports and comments - positive or negative ;) here on the blog. -As any previous versions it's best viewed with Firefox. -Opera and Safari are also pretty close to render Kimai properly. No Internet Explorer support yet. diff --git a/_posts/2007-07-29-0-7-9-available-for-download.md b/_posts/2007-07-29-0-7-9-available-for-download.md deleted file mode 100644 index 534aaee4f..000000000 --- a/_posts/2007-07-29-0-7-9-available-for-download.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "0.7.9 Available For Download" -date: "2007-07-29 22:29:03 +0200" -author: skilleven -tags: [v1] ---- - -For all users of 0.6.1 - PLEASE, backup your existing data before using the new versio. -Please use UTF-8 (utf8\_unicode\_ci) for fresh installments. -Have fun. diff --git a/_posts/2007-08-08-update-problem.md b/_posts/2007-08-08-update-problem.md deleted file mode 100644 index 2dfda25d8..000000000 --- a/_posts/2007-08-08-update-problem.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: "Update Problem..." -date: "2007-08-08 20:48:43 +0200" -author: skilleven -tags: [v1] ---- - -I noticed today that users will face a little problem when updating from version 0.6.1 to 0.7.9. - -After the Update you will not be able to access the admin panel even when you're logged in as user 'admin'. -This is because one field of the database is not updated correctly. - -We will publish a fix with version 0.8 but until then you can easily fix this issue by editing the database using e.g. PHPMyAdmin. -Find your admin user in the table 'usr' and change the value of usr_sts from 2 (two) to 0 (zero). -You'll find the crown button in the main menu then. diff --git a/_posts/2007-08-26-version-0-7-10-released.md b/_posts/2007-08-26-version-0-7-10-released.md deleted file mode 100644 index e21d2b201..000000000 --- a/_posts/2007-08-26-version-0-7-10-released.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: "Version 0.7.10 released" -date: "2007-08-26 01:35:06 +0200" -author: skilleven -tags: [v1] ---- - -This version corrects a bug that appears when your Kimai installment makes use of the database prefix (which is the case by default). -Normally timesheet records are splitted in two when crossing midnight. -This bug caused Kimai not to do so. So this update is for all of you, who don't have regular 9 to 5 jobs ... ;) - -[Get it here.](/download/) diff --git a/_posts/2007-08-27-csv-export.md b/_posts/2007-08-27-csv-export.md deleted file mode 100644 index 25413ebf1..000000000 --- a/_posts/2007-08-27-csv-export.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -title: "CSV Export" -date: "2007-08-27 15:30:07 +0200" -author: skilleven -tags: [v1] ---- - -Urs Gerig wrote a little extension to Kimai to export his timesheets as CSV. -Thanks for contributing this often requested feature, Urs! - -*"Since I need to present my data in Excel, an export function was nescessary. So here please find my way of solving it. -You may use it for Kimai, if you like. It's meant to run on Windows. -Best, Urs"* - -I tested it on the Mac and it works fine. If anyone may check it out on Linux please leave a comment if it works or not. -The script is not secured in any way yet! It's unlikely but still a potential danger for your installment. -So don't leave it in your Kimai directory permanently if you use it. diff --git a/_posts/2007-09-15-password-encryption-bugfix-release-0-7-11.md b/_posts/2007-09-15-password-encryption-bugfix-release-0-7-11.md deleted file mode 100644 index 8bbda21ec..000000000 --- a/_posts/2007-09-15-password-encryption-bugfix-release-0-7-11.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: "Password Encryption Bugfix > Release 0.7.11" -date: "2007-09-15 13:39:47 +0200" -author: skilleven -tags: [v1] ---- - -User Andreas Bulling found out that Kimai doesn't encrypt passwords set via the admin panel. -I fixed this today and put a new release on the website. Thanks Andreas! - -[Get it here.](/download/) diff --git a/_posts/2007-09-24-statistics-extension.md b/_posts/2007-09-24-statistics-extension.md deleted file mode 100644 index 4a5542a36..000000000 --- a/_posts/2007-09-24-statistics-extension.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: "Statistics Extension" -date: "2007-09-24 19:05:45 +0200" -author: skilleven -tags: [v1] ---- - -The first extension is available for Kimai. -Alexander Schroll today announced his 'stats' extension, which generates detailed reports and timelines. -Very helpful tool - thank you, Alexander! - -[Download 'stats' extension]({{ site.kimai_v1_repo }}/issues) diff --git a/_posts/2007-10-20-it-could-be-called-yash-yet-another-stats-hack.md b/_posts/2007-10-20-it-could-be-called-yash-yet-another-stats-hack.md deleted file mode 100644 index f8773d39e..000000000 --- a/_posts/2007-10-20-it-could-be-called-yash-yet-another-stats-hack.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: "It could be called YASH (Yet Another Stats Hack) ..." -date: "2007-10-20 23:21:11 +0200" -author: skilleven -tags: [v1] ---- - -...but Martin Klemkow named it "Simplestats". This extension is really nice! -We like it so much that we will ship it as part of the next package. - -Until then you can load the extension via [this forum link]({{ site.kimai_v1_repo }}/issues). -Thanks to Martin! diff --git a/_posts/2007-10-20-mysql-5.md b/_posts/2007-10-20-mysql-5.md deleted file mode 100644 index 3cdc9f718..000000000 --- a/_posts/2007-10-20-mysql-5.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: "MySQL 5" -date: "2007-10-20 23:21:00 +0200" -author: skilleven -tags: [v1] ---- - -Next Kimai release will require MySQL 5. -So far Kimai worked with both, Version 4/5 of MySQL but we decided to upgrade. -There are simply some very handy features missing in MySQL 4... - -So, if you are already a Kimai user please make sure to have MySQL 5 support on your server in order to be prepared for the next update. diff --git a/_posts/2007-10-29-subversion-and-bugtracker.md b/_posts/2007-10-29-subversion-and-bugtracker.md deleted file mode 100644 index 63979404a..000000000 --- a/_posts/2007-10-29-subversion-and-bugtracker.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: "Subversion and Bugtracker" -date: "2007-10-29 21:50:55 +0200" -author: skilleven -tags: [v1] ---- - -As some of you may have noticed we have set up a public bugtracker lately. -So please, if you have any bugs to report use the tracker and place your tickets right there. -On the same trac site you can now browse though our subversion reporitory for always getting the latest cutting edge -version or just for keeping yourself informed about progress. - -*UPDATE: We moved in between, this old URL was removed therefor* diff --git a/_posts/2007-11-11-windows-integration.md b/_posts/2007-11-11-windows-integration.md deleted file mode 100644 index 002077de6..000000000 --- a/_posts/2007-11-11-windows-integration.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: "Windows Integration" -date: "2007-11-11 15:32:00 +0200" -author: skilleven -tags: [v1] ---- - -The .NET-Developer David Tielke is going to join the team by January 2008. -He will develop a seamless integration of Kimai into the Windows environment. - -Welcome on board, David! diff --git a/_posts/2008-01-24-2-new-frontenders.md b/_posts/2008-01-24-2-new-frontenders.md deleted file mode 100644 index 5cc1b6372..000000000 --- a/_posts/2008-01-24-2-new-frontenders.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: "2 New Frontenders" -date: "2008-01-24 01:04:36 +0200" -author: skilleven -tags: [Team] ---- - -We welcome two new developers on the team! Martin 'mort' Klemkow and Enrico Thies join the core team as JavaScript and ExtJS developers. -Some of you may already know mort from the Friendly-Hacks-Section - he is the programmer of the extension "Simplestats" -(which is great and was going to be part of the next version anyhow). - -We're looking forward to your ideas and improvements! diff --git a/_posts/2008-02-01-new-logo.md b/_posts/2008-02-01-new-logo.md deleted file mode 100644 index 04140196d..000000000 --- a/_posts/2008-02-01-new-logo.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "New Logo" -date: "2008-02-01 14:10:57 +0200" -author: skilleven -tags: [v1] ---- - -Kimai has a new logo. Hope you like it! - -We're also preparing a Website relaunch with a sort of 'fresher' look ;) diff --git a/_posts/2008-02-19-kimai-comes-redesigned-in-0-8.md b/_posts/2008-02-19-kimai-comes-redesigned-in-0-8.md deleted file mode 100644 index 4d744ffca..000000000 --- a/_posts/2008-02-19-kimai-comes-redesigned-in-0-8.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "Kimai comes redesigned in 0.8" -date: "2008-02-19 20:34:56 +0200" -author: skilleven -tags: [v1] ---- - -Just to give you a little apetizer... We're preparing an entirely re-designed frontend. - -Version 0.8 will take a while to release but we strongly believe you'll be happy with the new look ;) diff --git a/_posts/2008-04-20-bye-tom.md b/_posts/2008-04-20-bye-tom.md deleted file mode 100644 index a0d85d7b7..000000000 --- a/_posts/2008-04-20-bye-tom.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "Bye Tom!" -date: "2008-04-20 21:18:02 +0200" -author: skilleven -tags: [Team] ---- - -Today Tom left the project on his own wish due to lack of time and because he is more and more orienting in the direction of .NET/C#/WPF development. - -We wish you good luck, Tom - and may the force be with you! ;) diff --git a/_posts/2008-04-20-new-website-online.md b/_posts/2008-04-20-new-website-online.md deleted file mode 100644 index 0f269c7bf..000000000 --- a/_posts/2008-04-20-new-website-online.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: "New Website Online" -date: "2008-04-20 12:08:52 +0200" -author: skilleven -tags: [Website] ---- - -The redesign of our website is finally online. -It's powered by [REDAXO](http://www.redaxo.de) btw. - hope you like it! - -*UPDATE: Its not Redaxo anymore* diff --git a/_posts/2008-04-24-new-php-developer.md b/_posts/2008-04-24-new-php-developer.md deleted file mode 100644 index c5357281f..000000000 --- a/_posts/2008-04-24-new-php-developer.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: "New PHP-Developer" -date: "2008-04-24 16:17:45 +0200" -author: skilleven -tags: [Team] ---- - -Only four days after Tom's exit we are very happy to announce that Oleg Britvin joints as new PHP Core-Developer. -We now dare to forecast that version 0.8 of Kimai will probably be released in August. -The genuine 1.0 release is focused for Kimai's second birthday December this year. - -Please, we're still looking for translators! diff --git a/_posts/2008-04-26-wanted-extension-developers.md b/_posts/2008-04-26-wanted-extension-developers.md deleted file mode 100644 index b66d829e0..000000000 --- a/_posts/2008-04-26-wanted-extension-developers.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: "Wanted: Extension Developers" -date: "2008-04-26 20:09:31 +0200" -author: skilleven -tags: [v1] ---- - -If you'd like to code an extension: You get the development-version via subversion repository on syncom.org. -Included in the package is an example-extension which helps you getting started. -A short screencast how extensions are build im 0.8 is about to be released soon. - -Check this page again for more info. diff --git a/_posts/2008-07-27-beta-testers-wanted-for-v0-8.md b/_posts/2008-07-27-beta-testers-wanted-for-v0-8.md deleted file mode 100644 index d39097b1a..000000000 --- a/_posts/2008-07-27-beta-testers-wanted-for-v0-8.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: "Beta Testers Wanted For v0.8 " -date: "2008-07-27 08:00:56 +0200" -author: skilleven -tags: [v1] ---- - -We're very busy developing the third generation of Kimai which will (hopefully) be released within the next month. -This is a very important release for us because it contains huge changes all over. -Kimai is now entirely extension based - meaning *every* functionality (even the timetracking itself) is a module within its own directory. -We hope this will inspire many developers to contribute to the project. - -Furthermore Kimai now makes use of PDO. -Therefore it no longer depends on the usage of MySQL -  any  database type (which can operate via PDO) can be connected. -Because of these and many other changes this version needs heavy testing. -Your help is needed - please contact us if you'd like to participate! - -We're looking forward to your replies. ;) diff --git a/_posts/2008-08-25-self-test.md b/_posts/2008-08-25-self-test.md deleted file mode 100644 index f4700d3d4..000000000 --- a/_posts/2008-08-25-self-test.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: "Self-Test..." -date: "2008-08-25 07:57:00 +0200" -author: skilleven -tags: [v1] ---- - -Today I switched over to 0.8 for my real worktime tracking... With little mixed feelings. -I'm using 0.7 since over a year and it never messed up any data. -It's only six days left until release-day and it's really tough to meet the deadline... - -*UPDATE: One week of tracking - no problems, no dataloss...* diff --git a/_posts/2008-08-31-0-8-0-out-now.md b/_posts/2008-08-31-0-8-0-out-now.md deleted file mode 100644 index 3992a0759..000000000 --- a/_posts/2008-08-31-0-8-0-out-now.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: "0.8.0 out now ..." -date: "2008-08-31 14:59:00 +0200" -author: skilleven -tags: [v1] ---- - -Yeah - after almost a year since the last release and a ton of work - here it finally is. - -Unfortunately, we had to make some compromises. -A year sounds like a lot of time - but in fact we could have used at least two more month. -Not everything has become the way it was initially planned and we had to cancel some functionality for this initial release of 0.8. -But the main targets, like the splitting of functionalities into extensions or the redesign of the interface and the database connection could be achieved. -We also added some nice usibility features here and there. - -Just to be honest - we are proud of the result ;) -And we're wondering if you like it as much as we do. -So get your copies and let us know what you think about it. Have Fun. See you 0.8.1 ... ;) - -[Take me to the download page! ](/download/) diff --git a/_posts/2008-09-03-pdo-problems-in-0-8-0.md b/_posts/2008-09-03-pdo-problems-in-0-8-0.md deleted file mode 100644 index a5778ed29..000000000 --- a/_posts/2008-09-03-pdo-problems-in-0-8-0.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: "PDO Problems in 0.8.0" -date: "2008-09-03 09:53:00 +0200" -author: skilleven -tags: [v1] -tags: [v1] ---- - -Since release day I get flooded with mails and forum posts that report installing and update problems... - -I'm very unhappy with this situation and so I decided to make the PDO support in Kimai an *option* not the *default*. -0.8.1 will work with normal MySQL again. This means a lot of extra work and may take about a month. - -I appollogize for all the inconvinience this whole mess caused to many users! -Please only upgrade to 0.8.0 when you are experienced with PHP and server-configurations. -It hurts me - but for all others it's better to wait for the coming version... Sorry! :( diff --git a/_posts/2008-12-15-schon-wieder-geburtstag.md b/_posts/2008-12-15-schon-wieder-geburtstag.md index 954e376cd..669c8aa0f 100644 --- a/_posts/2008-12-15-schon-wieder-geburtstag.md +++ b/_posts/2008-12-15-schon-wieder-geburtstag.md @@ -37,7 +37,7 @@ dann auch mal richtig dokumentieren und Euch (wo ich kann) beim Entwickeln helfe Und weil wir heute Geburtstag haben lasse ich es mir nicht nehmen hier nochmal um Spenden zu bitten. Das Projekt verursacht nicht nur Arbeit (was mir dabei am wenigsten ausmacht) sondern tatsächlich Kosten. Google AdSense vermag die Beträge leider nicht zu ersetzen, da wir dafür scheinbar noch zu sehr ein Randgruppen-Projekt -mit zu wenig Popolarität sind.  +mit zu wenig Popularität sind. Also - klickt doch ruhig mal bei Amazon vorbei. ...Mich motiviert so eine kleine Sachspende auch immer ziemlich weiter zu basteln – wie man sich denken kann... :) diff --git a/_posts/2009-01-04-pre-release-for-testers.md b/_posts/2009-01-04-pre-release-for-testers.md deleted file mode 100644 index 89bf104b4..000000000 --- a/_posts/2009-01-04-pre-release-for-testers.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -title: "Pre-Release For Testers" -date: "2009-01-04 12:32:00 +0200" -author: skilleven -tags: [v1] ---- - -v0.8.0.805 is ready for download. - -Please test and report all errors you encounter. -Important changes: YOU CAN ONLY UPDATE VERSIONS HIGHER THAN 7.0! - -There are two new variables to set in the conf.php if you did not install via the step-by-step installer: - -{% highlight php %} -$server_conn = "mysql"; // If you want to use PDO $server_conn must be set to "pdo". -$server_type = 'mysql';      // the database type (needed for PDO) usually 'mysql' -{% endhighlight %} - -The installation will then be performed in non-PDO mode. - - - -[Download](/download/) diff --git a/_posts/2009-02-07-0-8-0-819-for-testers-pdo-only.md b/_posts/2009-02-07-0-8-0-819-for-testers-pdo-only.md deleted file mode 100644 index ce7e87779..000000000 --- a/_posts/2009-02-07-0-8-0-819-for-testers-pdo-only.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: "0.8.0.819 For Testers (PDO-Only)" -date: "2009-02-07 22:04:00 +0200" -author: skilleven -tags: [v1] ---- - -v 0.8.0.819 is ready for download. - -Please test and report all errors you encounter. -YOU CAN ONLY UPDATE VERSIONS HIGHER THAN 7.0! -Only the PDO connection works! Non-PDO release is still under development. - -Notes from the last blog post are also important for this version. -[Download](/download/) diff --git a/_posts/2009-02-08-kimai-0-7-12.md b/_posts/2009-02-08-kimai-0-7-12.md deleted file mode 100644 index 173f04403..000000000 --- a/_posts/2009-02-08-kimai-0-7-12.md +++ /dev/null @@ -1,37 +0,0 @@ ---- -title: "Kimai 0.7.12" -date: "2009-02-08 19:30:00 +0200" -author: skilleven -tags: [v1] ---- - -Download: Kimai v0.7.121 - -UPDATES (February 10, 2009): -Minor update to fix a bug in safari/chrome browser and updated updater.php (for 0.7.11 users to upgrade to 0.7.121) - -If you decide to **update**, please **back up** your DB and current installation of 0.7.11. - -* * * - -What version is this? This version is my modification of version 0.7.11, I called it version 0.7.12 because this version doesn't use kga array like in v0.7.13r44. -I stripped down some modifications and left the ones that can apply to everyone. -I hope you like them. what's new in this version? - -The modifications in this version are the following: - -- US date format -- Regular user cannot add customers/projects/tasks -- Regular user cannot add comments to projects/tasks -- Ability to show/hide for customers/projects/tasks -- Ability to add comments/descriptions for projects/tasks (only Admin or group leader) -- Streamline the entry form to use just 1 date field for date in and date out -- More compatibility with Internet Explorer 7 (known bug in IE 7: admin layout is messy) -- Error message (using overlay) when failing to add your data to the database (normally because of date/time invalid format) -- Overlays are draggable -- Minor adjustments of user interface - -Database modifications: -In kimai\_conf table, I replaced data type for filter\_knd, filter\_pct, and filter\_evt to varchar(300). - -This change is included in install.php. but not in updater.php so **DO NOT UPGRADE**, NEW INSTALL ONLY PLEASE.  diff --git a/_posts/2009-06-19-bye-bye-folks.md b/_posts/2009-06-19-bye-bye-folks.md index ac3dbf483..ed55462ce 100644 --- a/_posts/2009-06-19-bye-bye-folks.md +++ b/_posts/2009-06-19-bye-bye-folks.md @@ -2,7 +2,7 @@ title: "Bye bye folks ..." date: "2009-06-19 21:35:00 +0200" author: skilleven -tags: [Team] +tags: [v1] --- Like some users might already have noticed - there is not much going on around Kimai lately. diff --git a/_posts/2009-07-20-the-condemned-live-longer.md b/_posts/2009-07-20-the-condemned-live-longer.md index 671ac05d3..5f9a8fac0 100644 --- a/_posts/2009-07-20-the-condemned-live-longer.md +++ b/_posts/2009-07-20-the-condemned-live-longer.md @@ -2,7 +2,7 @@ title: "The condemned live longer..." date: "2009-07-20 21:37:00 +0200" author: skilleven -tags: [Team] +tags: [v1] --- Just a quick note: [Kevin Papst](http://www.kevinpapst.de) takes over stewardship of Kimai! diff --git a/_posts/2009-08-22-a-very-promising-extension-package.md b/_posts/2009-08-22-a-very-promising-extension-package.md deleted file mode 100644 index 1b1d5a93a..000000000 --- a/_posts/2009-08-22-a-very-promising-extension-package.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "A very promising extension package..." -date: "2009-08-22 10:11:00 +0200" -author: skilleven -tags: [v1] ---- - -... was developed by Severin Leonhardt and can be found in this forum thread: - -{% include alert.html alert="The forum is not alive any longer, but the extension was added to the Kimai core" %} diff --git a/_posts/2009-08-23-v0-8-1-884-released.md b/_posts/2009-08-23-v0-8-1-884-released.md deleted file mode 100644 index 03eeb18d2..000000000 --- a/_posts/2009-08-23-v0-8-1-884-released.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "v0.8.1.884 released" -date: "2009-08-23 17:49:00 +0200" -author: skilleven -tags: [v1] ---- - -Kimai 0.8.1.884 released on Sourceforge today. - -Download: [https://sourceforge.net/projects/kimai/files/kimai_0.8.1.884.zip/download](https://sourceforge.net/projects/kimai/files/kimai_0.8.1.884.zip/download) diff --git a/_posts/2009-11-05-release-candidate-kimai-v0-9.md b/_posts/2009-11-05-release-candidate-kimai-v0-9.md deleted file mode 100644 index 98d80f1dc..000000000 --- a/_posts/2009-11-05-release-candidate-kimai-v0-9.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: "Release candidate Kimai v0.9" -date: "2009-11-05 14:41:00 +0200" -author: kevinpapst -tags: [v1] ---- - -We are pleased to announce a release candidate for the next Kimai version. - -Just a quick note for all out there that a release candidate for Kimai v0.9 is available. - -Big thanks fly out to Severin, our new team member. -He contributed a big amount of his free time, added great code, new features and improvements. - -If you want to help us and test the software, you can find it at the [Kimai Sourceforge Page](https://sourceforge.net/projects/kimai/) or -[download it directly](http://sourceforge.net/projects/kimai/files/kimai_0.9.0.1074.zip/download). - -Feedback about this version can be posted in the [Beta test forum]({{ site.kimai_v1_repo }}/issues). diff --git a/_posts/2009-11-20-kimai-0-9-released.md b/_posts/2009-11-20-kimai-0-9-released.md deleted file mode 100644 index 8b8ee3cf6..000000000 --- a/_posts/2009-11-20-kimai-0-9-released.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -title: "Kimai 0.9 released" -date: "2009-11-20 00:15:00 +0200" -author: kevinpapst -tags: [v1] ---- - -Here is the latest release version of Kimai with a big bag of wonderful new features and bug fixes. - -## What is new? - -The export extension (Stats) now supports Print, PDF, XLS, and CSV. -Non-PDO support, an expenses extension, a database recovery and backup utility (beta), an Install wizard, -and... an invoice extension (beta and disabled by default) were added. - -*Many bugs were fixed and updating is strongly recommended* - -## What to do? - -Please [download](/download/) the new Kimai package and upgrade your system soon! - -If you have any questions, don't hesitate to contact us in the [Forum]({{ site.kimai_v1_repo }}/issues). - - If you like Kimai please help us to spread the word. -Follow us at [Twitter](http://twitter.com/kimai_org), write a blog post - just let us know what you think! diff --git a/_posts/2010-03-26-new-beta-version-0-9-1-available.md b/_posts/2010-03-26-new-beta-version-0-9-1-available.md deleted file mode 100644 index b2a326301..000000000 --- a/_posts/2010-03-26-new-beta-version-0-9-1-available.md +++ /dev/null @@ -1,41 +0,0 @@ ---- -title: "New Beta version 0.9.1 available" -date: "2010-03-26 10:48:00 +0200" -author: kevinpapst -tags: [v1] ---- - -We are proud to announce a preview of the the next Kimai version 0.9.1. This is a beta release and is not yet meant for production usage. - -After a longer development process we now want to share a preview of the next Kimai version with you, so you can see all the -exiting new features and test out our bugfixes. - -Please download and install this version and [give us your feedback]({{ site.kimai_v1_repo }}/issues)! - -DOWNLOAD: [kimai_0.9.1.0272.zip](https://sourceforge.net/projects/kimai/files/0.9.x/kimai_0.9.1.0272.zip/download) from Sourceforge. - -## Changelog - -The most important changes at a glance: - -- Budget Extension -- Declaration of time in as period or duration -- Many small and biggger bugfixes -- Currency can be configured -- Customer, Projects and Tasks can be deleted -- configurations from vars.php are now stored in the database and editable from the admin interface -- several new optionals for exporting -- the extensions Invoice, Debug and Demo are deactivated by default - -And the same for the german folks: - -- Budget Extension -- Angabe der Zeit in Zeitraum und Dauer -- Viele kleine und größere Bugfixes -- Währung kann eingestellt werden -- Kunden, Projekte und Tätigkeiten können gelöscht werden -- Einstellungen von vars.php sind jetzt in der Datenbank gespeichert und können über die Oberfläche bearbeitet werden -- Diverse neue Optionen beim Export -- Die Extensions Invoice, Debug und Demo ist standardmäßig deaktiviert. - -*Thanks for the fantastic community feedback since the last release and thanks to Severin for his great work for Kimai!* diff --git a/_posts/2010-06-19-beta-2-for-kimai-0-9-1.md b/_posts/2010-06-19-beta-2-for-kimai-0-9-1.md deleted file mode 100644 index 1499df6eb..000000000 --- a/_posts/2010-06-19-beta-2-for-kimai-0-9-1.md +++ /dev/null @@ -1,39 +0,0 @@ ---- -title: "Beta 2 for Kimai 0.9.1" -date: "2010-06-19 22:03:00 +0200" -author: kevinpapst -tags: [v1] ---- - -Another news from Kimai with an Beta announcement for 0.9.1 beta 2. - -Another beta for testing is available. - -## Changelog - -Since our last beta we made some bigger improvements: - -- Added option to round time tracked with buzzer. -- Allow filtering by events. -- Added buttons for quickly changing the activ filters in the sublists. -- Tasks can be assigned to projects. - -... some smaller stuff: - -- Some performance improvements. -- Current username is always shown. -- New option to place currency sign in front of the value. -- It's possible now to only export times or expenses. -- Allow to set the comment for a running task. -- Better usable with IE. -- Added summary to PDF list export. -- Allow to change the task and project while a recording is running. -- Added Swedish language file by Conny Sjölund. -- Updated french translation file by Vincent Brunetta. -- Decimal separator can be configured globally. - -and many bugfixes... - -Go, get it at Sourceforge: [kimai_0.9.1.0319.zip](http://sourceforge.net/projects/kimai/files/0.9.x/kimai_0.9.1.0319.zip/download) - -And finally let us know what you think! diff --git a/_posts/2010-08-01-kimai-0-9-1-is-released.md b/_posts/2010-08-01-kimai-0-9-1-is-released.md deleted file mode 100644 index f31578d2c..000000000 --- a/_posts/2010-08-01-kimai-0-9-1-is-released.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: "Kimai 0.9.1 is released" -date: "2010-08-01 15:46:00 +0200" -author: kevinpapst -redirect_from: /en/blog/kimai-0.9.1-is-released.html -tags: [v1] ---- - -We are pleased to announce the release of Kimai 0.9.1. - -Please look through the beta version announcements to get a list of all changes. -This version brings so many bugfixes and new features that we can't list them all ;D - -[Grab a copy](/download/) of this release and let us know what you think either here or in our [Time-Tracking forum]({{ site.kimai_v1_repo }}/issues). - -We hope you enjoy this package! - -*Your Kimai-Team* diff --git a/_posts/2011-01-05-happy-birthday-kimai.md b/_posts/2011-01-05-happy-birthday-kimai.md index 3b4edfbbb..cc1570765 100644 --- a/_posts/2011-01-05-happy-birthday-kimai.md +++ b/_posts/2011-01-05-happy-birthday-kimai.md @@ -5,7 +5,7 @@ author: kevinpapst tags: [v1] --- -Oh what a shame, we all forgot our own birthday... Okay, I have to admit I didn't knew the date - but Torsten told me that Kimai is now 4 Years old ;) +Oh what a shame, we all forgot our own birthday... Okay, I have to admit I didn't knew the date - but Torsten told me that Kimai is now 4 years old ;) and if anyone wants to save the date for next time - its the 15th of December. I would like to use that date to thank the Kimai community: you are great! diff --git a/_posts/2011-01-05-kimai-0-9-2-beta.md b/_posts/2011-01-05-kimai-0-9-2-beta.md deleted file mode 100644 index 1ab70d9dc..000000000 --- a/_posts/2011-01-05-kimai-0-9-2-beta.md +++ /dev/null @@ -1,50 +0,0 @@ ---- -title: "Kimai 0.9.2 beta" -date: "2011-01-05 12:03:00 +0200" -author: kevinpapst -tags: [v1] ---- - -And here comes the birthday present ;) Time to test again - the next beta version is here. - -## Changelog - -- Multiplicator for expenses -- Calendar fpr Time-Tracking dialog -- During change of duration the starttime instead of endtime is adjusted -- Export displays abstract before detailed listing -- Many small bugfixes and improvements -- Creation of bills do not require further PHP Extensions -- New field "recoverable" for "expenses" -- Support for Timezones -- Bills can be created through database-layer -- Pluginsystem for Authentification -- Tabs in Floatern for improved usability -- Projects can be hidden from Customers (internal projects) -- Display warning for existing install folder -- Exportsettings will be saved for each user -- Initial Interface for mobile usage -- Sublists can display Time and Costs - -and in german: - -- Multiplikatorfeld bei Auslagen -- Kalender im Zeiterfassendialog -- Beim Ändern der Dauer wird Anfangszeit statt Endzeit angepasst -- Beim Export kommt Zusammenfassung vor detailierter Auflistung -- Viele kleinere Bugfixes und Verbesserungen -- Erstellen von Rechnungen benötigt keine weitere PHP Extensions -- Neues feld "Wiedererstattbar" bei Auslagen -- Zeitzonen werden unterstützt -- Rechnungen können mit beiden Datenbanklayern erzeugt werden -- Pluginsystem für die Authentifizierung -- Tabs in Floatern, damit es übersichtlicher wird -- Projekte können vor dem Kunden versteckt werden (interne Projekte) -- Bei einem noch existierenden Installer Ordner wird gewarnt -- Exporteinstellungen werden pro User gespeichert -- Sehr einfaches mobiles Interfaces unter /mobile -- Sublists können Zeit und Kosten anzeigen - -And as alyways: Please let us know when you find any bugs or see chances for improvements! - -[You can find the file for download here!](http://sourceforge.net/projects/kimai/files/0.9.x/kimai.0.9.2.beta.zip/download) diff --git a/_posts/2011-02-25-kimai-0-9-2-beta-the-2nd.md b/_posts/2011-02-25-kimai-0-9-2-beta-the-2nd.md deleted file mode 100644 index d66e28d5d..000000000 --- a/_posts/2011-02-25-kimai-0-9-2-beta-the-2nd.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -title: "Kimai 0.9.2 beta - the 2nd" -date: "2011-02-25 16:16:00 +0200" -author: kevinpapst -tags: [v1] ---- - -Hi Time-Tracker! - -Some of you know from forum discussions, that we word hard on releasing the next stable version of Kimai. -But before we can do that, we need at least that Beta version to be tested. - -You can fetch the latest beta from Sourceforge: -[kimai.0.9.2.1294.beta.zip](http://sourceforge.net/projects/kimai/files/0.9.x/kimai.0.9.2.1294.beta.zip/download) - -Please open our [forum]({{ site.kimai_v1_repo }}/issues) in another browser-tab during you tests and post any feedback, -so we can improve the stability before releasing the stable version. - -The more you test, the faster the stable version is here :) - -And finally: Thanks for using Kimai! - - diff --git a/_posts/2013-08-03-test-kimai-v0-9-3-beta-1.md b/_posts/2013-08-03-test-kimai-v0-9-3-beta-1.md deleted file mode 100644 index 5a6434296..000000000 --- a/_posts/2013-08-03-test-kimai-v0-9-3-beta-1.md +++ /dev/null @@ -1,48 +0,0 @@ ---- -title: "Test Kimai v0.9.3-beta.1" -date: "2013-08-03 10:48:00 +0200" -author: kevinpapst -tags: [v1] ---- - -Okay, finally we achieved something that we self did not expect any more ;-) a working Beta is here for you to check-out! - -##  Here is a small list of changes - -... and its by far not complete: - -- new skin: Nordic -- New or updated translations by contributors: - - Icelandic - - Polish - - Czech - - Hungarian - - Dutch - - Brazilian - - French - - German and English are maintained by the core team -- New flexible permission system -- Configurable status values for timesheet entries -- New description field for timesheet entries -- Assign timesheet entries to other users -- Edit running timesheet entries like other entries -- Allow multiple running timesheet entries -- Improved budget tracking and visualization -- Improved admin panel -- Improved HTTP Authentication -- New authenticator for LDAP -- Internal Code refactoring / improvement -- Kimai SOAP interface for remote Apps -- Kimai JSON interface for remote Apps -- REMOVED support for PDO -- Invoices from HTML Templates  - -## Links - -Here is the release announcement at GitHub: [Release v0.9.3-beta.1]({{ site.kimai_v1_repo }}/releases/tag/v0.9.3-beta.1) - -And here is the ZIP Download: [kimai_0.9.3.beta.zip]({{ site.kimai_v1_repo }}/releases/download/v0.9.3-beta.1/kimai_0.9.3.beta.zip) - -Please post your feedback in [our issue tracker]({{ site.kimai_v1_repo }}/issues). - -  diff --git a/_posts/2014-04-30-kimai-0-9-3-rc-1.md b/_posts/2014-04-30-kimai-0-9-3-rc-1.md deleted file mode 100644 index de6b8b52e..000000000 --- a/_posts/2014-04-30-kimai-0-9-3-rc-1.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: "Version 0.9.3 Release Candidate" -date: "2014-04-30 23:00:00 +0200" -author: kevinpapst -tags: [v1] ---- - -A last test release before we can finally publish Kimai 0.9.3 :-) - -Please test this version and give use your feedback, so we can publish the final release soon. - -Grab the ZIP file from here: [kimai_0.9.3.rc1.zip]({{ site.kimai_v1_repo }}/releases/download/v0.9.3-rc.1/kimai_0.9.3.rc1.zip) - -Here is the release: [GitHub v0.9.3-rc.1 release]({{ site.kimai_v1_repo }}/releases/tag/v0.9.3-rc.1) - -And these are all included [changes since the last beta version]({{ site.kimai_v1_repo }}/issues?milestone=1&state=closed). - -Thanks for time-tracking with Kimai! diff --git a/_posts/2014-04-30-kimai-apps.md b/_posts/2014-04-30-kimai-apps.md deleted file mode 100644 index e1f57dcfc..000000000 --- a/_posts/2014-04-30-kimai-apps.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: "External Kimai Apps" -date: "2014-04-30 14:00:00 +0200" -author: kevinpapst -tags: [v1] ---- - -Just to let our reader (via RSS feed) know, I created a [page for external applications](https://github.com/kimai/kimai1/wiki/Apps-for-Kimai-1) which make use of our API. - -These apps could simplify your time-tracking process :) - -If you know more apps, let us know in the comments and I will update the page. From 59243281aff900f212f15d1c7d2e175fb7a43847 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Tue, 3 Oct 2023 01:06:05 +0200 Subject: [PATCH 4/6] clean up tags --- _posts/2006-12-12-kimai-blog.md | 2 +- _posts/2007-03-28-jquery-goes-kimai.md | 2 +- _posts/2007-12-06-updates.md | 2 +- _posts/2007-12-15-cheers.md | 8 -------- _posts/2008-12-15-schon-wieder-geburtstag.md | 2 +- _posts/2009-06-19-bye-bye-folks.md | 2 +- _posts/2009-07-20-the-condemned-live-longer.md | 2 +- _posts/2011-01-05-happy-birthday-kimai.md | 2 +- _posts/2014-04-28-website-hosted-at-github.md | 2 +- _posts/2016-07-31-kimai-forum-deactivated.md | 2 +- _posts/2018-02-10-a-new-website.md | 2 +- _posts/2019-02-17-website-changed-to-v2.md | 2 +- _posts/2021-04-02-french-website.md | 2 +- _posts/2021-10-18-kimai-mobile-release.md | 4 ++-- _posts/2022-12-31-next-major-release-preview.md | 2 +- _posts/2023-01-21-beta-2-release.md | 2 +- 16 files changed, 16 insertions(+), 24 deletions(-) delete mode 100644 _posts/2007-12-15-cheers.md diff --git a/_posts/2006-12-12-kimai-blog.md b/_posts/2006-12-12-kimai-blog.md index 4cc5fdf93..6d44d42bc 100644 --- a/_posts/2006-12-12-kimai-blog.md +++ b/_posts/2006-12-12-kimai-blog.md @@ -2,7 +2,7 @@ title: "Kimai Blog" date: "2006-12-12 17:16:30 +0200" author: skilleven -tags: [Website] +tags: [Version 1] --- On the Kimai Blog we will keep you posted on everything Kimai. diff --git a/_posts/2007-03-28-jquery-goes-kimai.md b/_posts/2007-03-28-jquery-goes-kimai.md index 097ba069c..4584a4561 100644 --- a/_posts/2007-03-28-jquery-goes-kimai.md +++ b/_posts/2007-03-28-jquery-goes-kimai.md @@ -2,7 +2,7 @@ title: "jQuery goes Kimai" date: "2007-03-28 21:21:56 +0200" author: skilleven -tags: [v1] +tags: [Version 1] --- Last weekend I browsed through the depths of the web looking for an applicative Ajax framework to use with Kimai. diff --git a/_posts/2007-12-06-updates.md b/_posts/2007-12-06-updates.md index bc860cac8..725db0641 100644 --- a/_posts/2007-12-06-updates.md +++ b/_posts/2007-12-06-updates.md @@ -2,7 +2,7 @@ title: "Updates..." date: "2007-12-06 22:57:23 +0200" author: skilleven -tags: [v1] +tags: [Version 1] --- I'm thinking about deactivating the warning screen that appears every time an update is performed. diff --git a/_posts/2007-12-15-cheers.md b/_posts/2007-12-15-cheers.md deleted file mode 100644 index 5ff76bdb9..000000000 --- a/_posts/2007-12-15-cheers.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -title: "Cheers! ;)" -date: "2007-12-15 00:00:31 +0200" -author: skilleven -tags: [v1] ---- - -Happy 1 Year Kimai! diff --git a/_posts/2008-12-15-schon-wieder-geburtstag.md b/_posts/2008-12-15-schon-wieder-geburtstag.md index 669c8aa0f..d199bc57c 100644 --- a/_posts/2008-12-15-schon-wieder-geburtstag.md +++ b/_posts/2008-12-15-schon-wieder-geburtstag.md @@ -2,7 +2,7 @@ title: "Schon wieder Geburtstag!" date: "2008-12-15 14:18:00 +0200" author: skilleven -tags: [v1] +tags: [Version 1] --- Vor 2 Jahren (und einem Monat ungefähr ...) schrieb ich den Prototyp von Kimai an einem Wochenende und konnte diff --git a/_posts/2009-06-19-bye-bye-folks.md b/_posts/2009-06-19-bye-bye-folks.md index ed55462ce..16119877b 100644 --- a/_posts/2009-06-19-bye-bye-folks.md +++ b/_posts/2009-06-19-bye-bye-folks.md @@ -2,7 +2,7 @@ title: "Bye bye folks ..." date: "2009-06-19 21:35:00 +0200" author: skilleven -tags: [v1] +tags: [Version 1] --- Like some users might already have noticed - there is not much going on around Kimai lately. diff --git a/_posts/2009-07-20-the-condemned-live-longer.md b/_posts/2009-07-20-the-condemned-live-longer.md index 5f9a8fac0..e29b2f6f8 100644 --- a/_posts/2009-07-20-the-condemned-live-longer.md +++ b/_posts/2009-07-20-the-condemned-live-longer.md @@ -2,7 +2,7 @@ title: "The condemned live longer..." date: "2009-07-20 21:37:00 +0200" author: skilleven -tags: [v1] +tags: [Version 1] --- Just a quick note: [Kevin Papst](http://www.kevinpapst.de) takes over stewardship of Kimai! diff --git a/_posts/2011-01-05-happy-birthday-kimai.md b/_posts/2011-01-05-happy-birthday-kimai.md index cc1570765..66da87f56 100644 --- a/_posts/2011-01-05-happy-birthday-kimai.md +++ b/_posts/2011-01-05-happy-birthday-kimai.md @@ -2,7 +2,7 @@ title: "Happy Birthday Kimai" date: "2011-01-05 11:34:00 +0200" author: kevinpapst -tags: [v1] +tags: [Version 1] --- Oh what a shame, we all forgot our own birthday... Okay, I have to admit I didn't knew the date - but Torsten told me that Kimai is now 4 years old ;) diff --git a/_posts/2014-04-28-website-hosted-at-github.md b/_posts/2014-04-28-website-hosted-at-github.md index 92bb4978f..875d4ce64 100644 --- a/_posts/2014-04-28-website-hosted-at-github.md +++ b/_posts/2014-04-28-website-hosted-at-github.md @@ -2,7 +2,7 @@ title: "Website hosting changed" date: "2014-04-28 17:30:00 +0200" author: kevinpapst -tags: [Website] +tags: [Version 1] --- Hi folks, its been a long time since my last posting. diff --git a/_posts/2016-07-31-kimai-forum-deactivated.md b/_posts/2016-07-31-kimai-forum-deactivated.md index 33b7b5729..33034099b 100644 --- a/_posts/2016-07-31-kimai-forum-deactivated.md +++ b/_posts/2016-07-31-kimai-forum-deactivated.md @@ -2,7 +2,7 @@ title: "Deactivated Kimai Forum" date: "2016-07-31 13:30:00 +0200" author: kevinpapst -tags: [Website] +tags: [Version 1] --- With the current day I deactivated the Kimai Forum, as announced month ago on the forum itself. diff --git a/_posts/2018-02-10-a-new-website.md b/_posts/2018-02-10-a-new-website.md index 9b4756496..30c096335 100644 --- a/_posts/2018-02-10-a-new-website.md +++ b/_posts/2018-02-10-a-new-website.md @@ -2,7 +2,7 @@ title: "A new website for Kimai" date: 2018-02-10 author: kevinpapst -tags: [Website] +tags: [Announcement] --- When I started to work on the next major release Kimai v2 a couple of weeks ago, I had the urge to start that new era with a fresh website for Kimai. diff --git a/_posts/2019-02-17-website-changed-to-v2.md b/_posts/2019-02-17-website-changed-to-v2.md index babb65d84..a2d2086de 100644 --- a/_posts/2019-02-17-website-changed-to-v2.md +++ b/_posts/2019-02-17-website-changed-to-v2.md @@ -2,7 +2,7 @@ title: "Website now focusing on Kimai v2" date: "2019-02-17 16:00:00 +0200" author: kevinpapst -tags: [Website] +tags: [Announcement] --- I have spent the last days changing the website again, to include all available information and documentation for Kimai v1 and Kimai v2. diff --git a/_posts/2021-04-02-french-website.md b/_posts/2021-04-02-french-website.md index c07b40191..b09bca773 100644 --- a/_posts/2021-04-02-french-website.md +++ b/_posts/2021-04-02-french-website.md @@ -2,7 +2,7 @@ title: "Website translated to french" date: "2021-04-02 08:00:00 +0200" author: kevinpapst -tags: [Website] +tags: [Announcement] --- A quickie news for all the french speaking users out there: diff --git a/_posts/2021-10-18-kimai-mobile-release.md b/_posts/2021-10-18-kimai-mobile-release.md index bcf2d71c2..2f237638a 100644 --- a/_posts/2021-10-18-kimai-mobile-release.md +++ b/_posts/2021-10-18-kimai-mobile-release.md @@ -10,9 +10,9 @@ Now the application is available on Google Play. Kimai Mobile allows the users to use many workspaces simultaneously via a single application, logging the time for any projects or customers. All data about logging time at Kimai Mobile saves only at self-hosted Kimai Server. -{% include alert.html type="info" alert="Guest post by Cloudrizon GmbH. If you want to share anything around Kimai, you can write for kimai.org as well." %} +> Kimai is a perfect instrument for freelancers or small companies: it is easy to install and absolutely private, and Kimai Mobile allows improving the quality of user experience” -“Kimai is a perfect instrument for freelancers or small companies: it is easy to install and absolutely private, and Kimai Mobile allows improving the quality of user experience”, - says one of the beta-testers, a freelancer. +says one of the beta-testers, a freelancer. [Kimai Mobile](http://www.kimaimobile.com) is the perfect supplement for Kimai Time Tracker Server and is ideal for multi-project jobs. Now Kimai Mobile provides the general functionality: time log, filters, and calendar. diff --git a/_posts/2022-12-31-next-major-release-preview.md b/_posts/2022-12-31-next-major-release-preview.md index 6dd96c008..8c4dbec86 100644 --- a/_posts/2022-12-31-next-major-release-preview.md +++ b/_posts/2022-12-31-next-major-release-preview.md @@ -2,7 +2,7 @@ title: "Next major release" date: "2022-12-31 20:00:00 +0200" author: kevinpapst -tags: [Announcement] +tags: [Release] --- Wooohooo 😀 I am super excited to share this update, as I was working on it for more than one year now!!! 🎉 diff --git a/_posts/2023-01-21-beta-2-release.md b/_posts/2023-01-21-beta-2-release.md index 2919153ab..4917f3430 100644 --- a/_posts/2023-01-21-beta-2-release.md +++ b/_posts/2023-01-21-beta-2-release.md @@ -2,7 +2,7 @@ title: "Beta 2 - Callout for testing" date: "2023-01-21 10:00:00 +0200" author: kevinpapst -tags: [Announcement] +tags: [Release] --- Following the longer news about the next major release this news is a quick heads up that the `Beta 2` was From 334c4bcf18e5489c8f82d33e8dbe6d4ba98ed097 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Tue, 10 Oct 2023 11:43:46 +0200 Subject: [PATCH 5/6] remove expired code --- _posts/2023-08-23-controlling-plugin-mr-software.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/_posts/2023-08-23-controlling-plugin-mr-software.md b/_posts/2023-08-23-controlling-plugin-mr-software.md index 9196e3415..92e75c66e 100644 --- a/_posts/2023-08-23-controlling-plugin-mr-software.md +++ b/_posts/2023-08-23-controlling-plugin-mr-software.md @@ -72,12 +72,11 @@ And I will continue to add more features in the future, that is a promise and [d If you are a user of the MR plugins, I would be happy if you could give the new plugin a try and let me know what you think about it. -### Promo Codes +### Promo Code -As a bonus I have two promo codes for you: +As a bonus I have a promo code for you 🦄 -- `MRIGRATE50` for 50 € off the new plugin (this code can be only be redeemed 20 times and is valid until 2023-09-30) -- `MRIGRATE50` gives you 10% off the price (it is valid until 2023-12-31) +The code `MRIGRATE50` gives you 10% off the price (it is valid until 2023-12-31) ### What's next? From 6cf560742f3dff30f36a6dc0f1cd67c41d0e58ba Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Thu, 12 Oct 2023 22:53:56 +0200 Subject: [PATCH 6/6] re-branding --- _config.yml | 49 +- _data/ar/translation.yml | 12 +- _data/cs/translation.yml | 7 +- _data/da/translation.yml | 13 +- _data/de/translation.yml | 119 +- _data/de_CH/translation.yml | 13 +- _data/developer.yml | 18 +- _data/el/translation.yml | 13 +- _data/en/store.yml | 66 - _data/en/translation.yml | 111 +- _data/eo/translation.yml | 13 +- _data/es/translation.yml | 13 +- _data/eu/translation.yml | 13 +- _data/fa/translation.yml | 10 +- _data/feature.yml | 87 +- _data/fi/translation.yml | 13 +- _data/fo/translation.yml | 13 +- _data/fr/translation.yml | 9 +- _data/he/translation.yml | 7 +- _data/hr/translation.yml | 7 +- _data/hu/translation.yml | 13 +- _data/id/translation.yml | 12 +- _data/it/translation.yml | 6 +- _data/ja/translation.yml | 12 +- _data/ko/translation.yml | 10 +- _data/menu-documentation.yml | 60 +- _data/multi-language.yml | 5 +- _data/nb_NO/translation.yml | 9 +- _data/nl/translation.yml | 12 +- _data/photos.yml | 11 - _data/pl/translation.yml | 12 +- _data/pt/translation.yml | 6 +- _data/pt_BR/translation.yml | 6 +- _data/ro/translation.yml | 12 +- _data/ru/translation.yml | 6 +- _data/sk/translation.yml | 6 +- _data/sl/translation.yml | 12 +- .../cloudrizon-kimai-mobile-app-android.yml | 1 - .../store/cloudrizon-kimai-mobile-app-ios.yml | 1 - .../derpilzcc-readonly-access-bundle.yml | 1 - .../store/gbs-zip-projectrenderer-bundle.yml | 1 - _data/store/glorpen-duration-bundle.yml | 1 - _data/store/infeeeee-kimai2-cmd-argos.yml | 1 - _data/store/keleo-css-custom-bundle.yml | 1 + .../ticesoftware-kimaibar-macos-client.yml | 1 - _data/store/umws-applewatch-app.yml | 1 - _data/sv/translation.yml | 6 +- _data/teaser.yml | 15 + _data/testimonials.yml | 65 + _data/tr/translation.yml | 12 +- _data/uk/translation.yml | 6 +- _data/vi/translation.yml | 10 +- _data/zh_Hans/translation.yml | 6 +- _data/zh_Hant/translation.yml | 12 +- _docu_versioned/1.14/fresh-ubuntu-18.md | 2 +- _docu_versioned/1.14/fresh-ubuntu-20.md | 2 +- _docu_versioned/1.14/installation.md | 2 +- _docu_versioned/1.14/invoices.md | 2 +- _docu_versioned/1.15/invoices.md | 2 +- _docu_versioned/1.30.0/activity.md | 2 +- _docu_versioned/1.30.0/customer.md | 2 +- _docu_versioned/1.30.0/project.md | 2 +- _docu_versioned/1.30.0/users.md | 2 +- _docu_versioned/1.8/invoices.md | 2 +- _documentation/activity.md | 2 +- _documentation/backups.md | 2 +- _documentation/cache.md | 2 +- _documentation/chapter-manual.md | 2 +- _documentation/chapter-on-premise.md | 2 +- _documentation/customer.md | 2 +- _documentation/dashboard.md | 6 +- _documentation/developers.md | 1 + _documentation/export.md | 4 +- _documentation/fresh-ubuntu-18.md | 2 +- _documentation/fresh-ubuntu-20.md | 2 +- _documentation/fresh-ubuntu-22.md | 2 +- _documentation/i18n-am-pm.md | 4 +- _documentation/impersonate-user.md | 67 - _documentation/installation.md | 2 +- _documentation/invoices.md | 4 +- _documentation/meta-fields.md | 49 +- _documentation/permission-structure.md | 6 +- _documentation/plugin-expenses.md | 2 +- _documentation/plugin-management.md | 2 +- _documentation/project.md | 2 +- _documentation/store.md | 6 +- _documentation/timesheet.md | 2 +- _documentation/translations.md | 35 +- _documentation/updates.md | 2 +- _documentation/users.md | 2 +- _includes/alert.html | 27 +- _includes/card-blog-single.html | 63 +- _includes/card-cloud.html | 40 +- _includes/card-demo.html | 29 +- _includes/card-donate.html | 85 +- _includes/card-image.html | 18 - _includes/cta-cloud.html | 8 + _includes/cta-support.html | 8 + _includes/demo-action-button.html | 2 +- _includes/docs-chooser.html | 33 - _includes/docs-menu-card.html | 74 +- _includes/docs-navi.html | 90 +- _includes/docs-version-chooser.html | 2 +- .../{ => documentation}/file-permissions.html | 0 .../{ => documentation}/pdf-templates.md | 0 .../search-custom-field.md | 0 _includes/footer-links.html | 26 +- _includes/footer.html | 151 +- _includes/header-navigation.html | 66 + _includes/latest-news.html | 52 + _includes/link-translated-menu.html | 7 +- _includes/list-cloud-features.html | 38 + _includes/newsletter.html | 163 - _includes/page-title.html | 29 - _includes/pages/about-community.md | 43 + _includes/pages/about-current.md | 88 + _includes/pages/about-history.md | 85 + _includes/pages/about-timeline-v1.html | 33 + _includes/pages/about-timeline-v2.html | 45 + _includes/pages/about.md | 62 - _includes/pages/about_contributors.md | 23 - _includes/pages/blog.html | 50 - _includes/pages/demo-boxes.html | 4 +- _includes/pages/demo.md | 8 +- _includes/pages/documentation.md | 2 +- _includes/pages/donate.md | 5 +- _includes/pages/download.md | 2 +- _includes/pages/features.html | 117 + _includes/pages/homepage-hero-dark.html | 30 + _includes/pages/index.html | 77 - _includes/pages/privacy-policy.md | 30 +- _includes/pages/site-notice.md | 5 +- _includes/pages/store.html | 95 - _includes/section-compare-os-saas.html | 62 + _includes/section-features-images.html | 62 + _includes/section-features.html | 49 + _includes/section-latest-news.html | 16 + _includes/section-list-highlights.html | 18 + _includes/section-newsletter.html | 38 + _includes/section-numbers.html | 92 + _includes/section-screenshots.html | 13 + _includes/section-social-links.html | 12 + _includes/section-teaser.html | 43 + _includes/section-testimonials.html | 74 + _includes/store-list.html | 112 +- _includes/store-plugin-installation.html | 2 +- _includes/store-plugin-update.html | 6 +- _includes/store-screenshots.html | 35 - _includes/store/keleo-controlling.md | 3 +- _includes/store/keleo-css-custom-bundle.md | 3 +- _includes/store/umws-applewatch-app.md | 3 - _layouts/base.html | 22 +- _layouts/blog.html | 65 + _layouts/content.html | 5 - _layouts/default.html | 73 +- _layouts/documentation.html | 251 +- _layouts/download.html | 13 +- _layouts/error.html | 26 +- _layouts/homepage.html | 26 + _layouts/page-empty.html | 29 - _layouts/page.html | 41 +- _layouts/post.html | 75 +- _layouts/store-item.html | 819 +- _layouts/store.html | 97 + _pages/about.md | 6 +- _pages/blog.html | 3 +- _pages/cs/about.md | 6 +- _pages/cs/blog.html | 3 +- _pages/cs/index.html | 4 +- _pages/cs/store.html | 4 +- _pages/de/about.md | 71 - _pages/de/blog.html | 4 +- _pages/de/download.md | 1 + _pages/de/features.html | 8 + _pages/de/index.html | 4 +- _pages/de/store.html | 4 +- _pages/donate.md | 1 + _pages/download.md | 1 + _pages/features.html | 9 + _pages/fr/about.md | 70 +- _pages/fr/blog.html | 4 +- _pages/fr/index.html | 4 +- _pages/fr/store.html | 4 +- _pages/he/about.md | 5 +- _pages/he/blog.html | 4 +- _pages/he/index.html | 4 +- _pages/he/store.html | 4 +- _pages/hr/about.md | 62 - _pages/hr/blog.html | 4 +- _pages/hr/index.html | 4 +- _pages/hr/store.html | 4 +- _pages/index.html | 3 +- _pages/privacy-policy.md | 1 + _pages/pt/about.md | 6 +- _pages/pt/blog.html | 4 +- _pages/pt/index.html | 4 +- _pages/pt/store.html | 4 +- _pages/pt_BR/about.md | 6 +- _pages/pt_BR/blog.html | 4 +- _pages/pt_BR/index.html | 4 +- _pages/pt_BR/store.html | 4 +- _pages/ru/about.md | 6 +- _pages/ru/blog.html | 4 +- _pages/ru/index.html | 4 +- _pages/ru/store.html | 4 +- _pages/site-notice.md | 1 + _pages/store.html | 4 +- _pages/sv/about.md | 5 +- _pages/sv/blog.html | 4 +- _pages/sv/index.html | 4 +- _pages/sv/store.html | 4 +- _pages/uk/about.md | 5 +- _pages/uk/blog.html | 4 +- _pages/uk/index.html | 4 +- _pages/uk/store.html | 4 +- _pages/zh_Hans/about.md | 5 +- _pages/zh_Hans/blog.html | 4 +- _pages/zh_Hans/index.html | 4 +- _pages/zh_Hans/store.html | 4 +- _posts/2022-08-30-kimai-release-1-23.md | 1 + _posts/2022-09-04-kimai-release-1-24.md | 1 + _posts/2022-09-20-kimai-release-1-25.md | 1 + _posts/2022-12-26-repository-url-changed.md | 1 + .../2022-12-31-next-major-release-preview.md | 1 + _posts/2023-01-21-beta-2-release.md | 1 + _posts/2023-05-19-plugin-upgrades-v2.md | 1 + _posts/2023-05-20-kimai-release-2.md | 1 + _posts/2023-08-01-kimai-mobile-ios-release.md | 1 + ...23-08-23-controlling-plugin-mr-software.md | 1 + assets/_fontawesome.scss | 5 - assets/build/016b4a6cdced82ab3aa1.ttf | Bin 189684 -> 0 bytes assets/build/50701fbb8177c2dde530.ttf | Bin 63348 -> 0 bytes assets/build/65a8ce52fc5427e8f94d.eot | Bin 0 -> 405670 bytes assets/build/878f31251d960bd6266f.woff2 | Bin 109808 -> 0 bytes assets/build/9e2b21b135bc7d4c803f.svg | 1660 +++ assets/build/b041b1fa4fe241b23445.woff2 | Bin 24488 -> 0 bytes assets/build/b6879d41b0852f01ed5b.woff2 | Bin 150020 -> 0 bytes assets/build/d12afc36557395143e4b.woff | Bin 0 -> 321020 bytes assets/build/d75e3fd1eb12e9bd6655.ttf | Bin 394668 -> 0 bytes assets/build/d95e1266cd29a2f3b7ce.png | Bin 0 -> 5322 bytes assets/build/db9ddb1898dbd76badca.ttf | Bin 0 -> 320944 bytes assets/build/df635aaf04cd75132f62.woff2 | Bin 0 -> 115680 bytes assets/build/main.css | 38 +- assets/build/main.js | 2 +- assets/build/main.js.LICENSE.txt | 4 +- assets/build/main.rtl.css | 38 +- assets/build/theme.js | 1 + assets/bundle.js | 15 - assets/bundle.scss | 4 - images/blog/cover-1.jpeg | Bin 0 -> 141836 bytes images/blog/cover-10.jpeg | Bin 0 -> 40620 bytes images/blog/cover-11.jpeg | Bin 0 -> 110110 bytes images/blog/cover-13.jpeg | Bin 0 -> 95646 bytes images/blog/cover-14.jpeg | Bin 0 -> 86988 bytes images/blog/cover-16.jpeg | Bin 0 -> 95161 bytes images/blog/cover-17.jpeg | Bin 0 -> 42661 bytes images/blog/cover-3.jpeg | Bin 0 -> 92382 bytes images/blog/cover-4.jpeg | Bin 0 -> 60222 bytes images/blog/cover-5.jpeg | Bin 0 -> 47933 bytes images/blog/cover-9.jpeg | Bin 0 -> 81546 bytes images/features/api.jpg | Bin 0 -> 112874 bytes images/features/authentication.jpg | Bin 0 -> 100455 bytes images/features/invoice.jpg | Bin 0 -> 101932 bytes images/features/reports.jpg | Bin 0 -> 94422 bytes images/kevin-papst.jpeg | Bin 0 -> 37222 bytes images/kimai-header.png | Bin 46685 -> 15997 bytes images/kimai_logo.png | Bin 101871 -> 31168 bytes images/layout/author-pattern.svg | 1 + images/layout/avatar/owl.png | Bin 0 -> 52519 bytes images/layout/hero-bg-pattern-small.png | Bin 0 -> 113774 bytes images/layout/shop-hero.png | Bin 0 -> 243936 bytes images/layout/testimonial/person-1.png | Bin 0 -> 70847 bytes images/layout/testimonial/person-10.jpeg | Bin 0 -> 21279 bytes images/layout/testimonial/person-2.jpeg | Bin 0 -> 24815 bytes images/layout/testimonial/person-3.jpeg | Bin 0 -> 24334 bytes images/layout/testimonial/person-4.jpeg | Bin 0 -> 154406 bytes images/layout/testimonial/person-5.png | Bin 0 -> 59494 bytes images/layout/testimonial/person-6.jpeg | Bin 0 -> 18598 bytes images/layout/testimonial/person-7.png | Bin 0 -> 69328 bytes images/layout/testimonial/person-8.jpeg | Bin 0 -> 18463 bytes images/layout/testimonial/person-9.jpeg | Bin 0 -> 19945 bytes .../workcontract/public-holidays-import.jpeg | Bin 125390 -> 57570 bytes images/screenshots/absence-table.jpg | Bin 0 -> 59237 bytes images/screenshots/dashboard.png | Bin 155210 -> 0 bytes images/screenshots/screenshot-dashboard.jpg | Bin 0 -> 179968 bytes images/screenshots/screenshot-reporting.jpg | Bin 0 -> 149969 bytes package-lock.json | 11781 ++++++++++++++++ package.json | 103 +- src/_code.scss | 71 + src/_variables.scss | 3 + {assets => src}/_website.scss | 65 +- src/bundle.js | 25 + src/bundle.scss | 6 + src/theme.js | 1 + webpack.config.js | 3 +- yarn.lock | 4161 ------ 296 files changed, 16719 insertions(+), 6885 deletions(-) delete mode 100644 _data/photos.yml create mode 100644 _data/teaser.yml create mode 100644 _data/testimonials.yml delete mode 100644 _documentation/impersonate-user.md delete mode 100644 _includes/card-image.html create mode 100644 _includes/cta-cloud.html create mode 100644 _includes/cta-support.html delete mode 100644 _includes/docs-chooser.html rename _includes/{ => documentation}/file-permissions.html (100%) rename _includes/{ => documentation}/pdf-templates.md (100%) rename _includes/{ => documentation}/search-custom-field.md (100%) create mode 100644 _includes/header-navigation.html create mode 100644 _includes/latest-news.html create mode 100644 _includes/list-cloud-features.html delete mode 100644 _includes/newsletter.html delete mode 100644 _includes/page-title.html create mode 100644 _includes/pages/about-community.md create mode 100644 _includes/pages/about-current.md create mode 100644 _includes/pages/about-history.md create mode 100644 _includes/pages/about-timeline-v1.html create mode 100644 _includes/pages/about-timeline-v2.html delete mode 100644 _includes/pages/about.md delete mode 100644 _includes/pages/about_contributors.md delete mode 100644 _includes/pages/blog.html create mode 100644 _includes/pages/features.html create mode 100644 _includes/pages/homepage-hero-dark.html delete mode 100644 _includes/pages/index.html delete mode 100644 _includes/pages/store.html create mode 100644 _includes/section-compare-os-saas.html create mode 100644 _includes/section-features-images.html create mode 100644 _includes/section-features.html create mode 100644 _includes/section-latest-news.html create mode 100644 _includes/section-list-highlights.html create mode 100644 _includes/section-newsletter.html create mode 100644 _includes/section-numbers.html create mode 100644 _includes/section-screenshots.html create mode 100644 _includes/section-social-links.html create mode 100644 _includes/section-teaser.html create mode 100644 _includes/section-testimonials.html delete mode 100644 _includes/store-screenshots.html create mode 100644 _layouts/blog.html delete mode 100644 _layouts/content.html create mode 100644 _layouts/homepage.html delete mode 100644 _layouts/page-empty.html create mode 100644 _layouts/store.html create mode 100644 _pages/de/features.html create mode 100644 _pages/features.html delete mode 100644 assets/_fontawesome.scss delete mode 100644 assets/build/016b4a6cdced82ab3aa1.ttf delete mode 100644 assets/build/50701fbb8177c2dde530.ttf create mode 100644 assets/build/65a8ce52fc5427e8f94d.eot delete mode 100644 assets/build/878f31251d960bd6266f.woff2 create mode 100644 assets/build/9e2b21b135bc7d4c803f.svg delete mode 100644 assets/build/b041b1fa4fe241b23445.woff2 delete mode 100644 assets/build/b6879d41b0852f01ed5b.woff2 create mode 100644 assets/build/d12afc36557395143e4b.woff delete mode 100644 assets/build/d75e3fd1eb12e9bd6655.ttf create mode 100644 assets/build/d95e1266cd29a2f3b7ce.png create mode 100644 assets/build/db9ddb1898dbd76badca.ttf create mode 100644 assets/build/df635aaf04cd75132f62.woff2 create mode 100644 assets/build/theme.js delete mode 100644 assets/bundle.js delete mode 100644 assets/bundle.scss create mode 100644 images/blog/cover-1.jpeg create mode 100644 images/blog/cover-10.jpeg create mode 100644 images/blog/cover-11.jpeg create mode 100644 images/blog/cover-13.jpeg create mode 100644 images/blog/cover-14.jpeg create mode 100644 images/blog/cover-16.jpeg create mode 100644 images/blog/cover-17.jpeg create mode 100644 images/blog/cover-3.jpeg create mode 100644 images/blog/cover-4.jpeg create mode 100644 images/blog/cover-5.jpeg create mode 100644 images/blog/cover-9.jpeg create mode 100644 images/features/api.jpg create mode 100644 images/features/authentication.jpg create mode 100644 images/features/invoice.jpg create mode 100644 images/features/reports.jpg create mode 100644 images/kevin-papst.jpeg create mode 100644 images/layout/author-pattern.svg create mode 100644 images/layout/avatar/owl.png create mode 100644 images/layout/hero-bg-pattern-small.png create mode 100644 images/layout/shop-hero.png create mode 100644 images/layout/testimonial/person-1.png create mode 100644 images/layout/testimonial/person-10.jpeg create mode 100644 images/layout/testimonial/person-2.jpeg create mode 100644 images/layout/testimonial/person-3.jpeg create mode 100644 images/layout/testimonial/person-4.jpeg create mode 100644 images/layout/testimonial/person-5.png create mode 100644 images/layout/testimonial/person-6.jpeg create mode 100644 images/layout/testimonial/person-7.png create mode 100644 images/layout/testimonial/person-8.jpeg create mode 100644 images/layout/testimonial/person-9.jpeg create mode 100644 images/screenshots/absence-table.jpg delete mode 100644 images/screenshots/dashboard.png create mode 100644 images/screenshots/screenshot-dashboard.jpg create mode 100644 images/screenshots/screenshot-reporting.jpg create mode 100644 package-lock.json mode change 100644 => 100755 package.json create mode 100644 src/_code.scss create mode 100644 src/_variables.scss rename {assets => src}/_website.scss (82%) create mode 100644 src/bundle.js create mode 100644 src/bundle.scss create mode 100644 src/theme.js delete mode 100644 yarn.lock diff --git a/_config.yml b/_config.yml index 925bb7c8d..8e6a46a8d 100644 --- a/_config.yml +++ b/_config.yml @@ -6,6 +6,7 @@ baseurl: "" url: "https://www.kimai.org" bing-id: "874E17F27A8EABE9DDAED762FC498BC4" +kimai_customers: "2.1K" kimai_v2_version: "2.0.35" kimai_v2_website: https://github.com/kimai/www.kimai.org kimai_v2_repo: https://github.com/kimai/kimai @@ -130,48 +131,30 @@ plugins: - jekyll-paginate - jekyll-redirect-from +whitelist: + - jekyll-redirect-from + jekyll-mentions: base_url: https://github.com exclude: + - node_modules/ + - _site/ + - src/ + - scripts/ + - .git/ + - .idea/ + - .jekyll-cache/ + - .sass-cache/ + - .DS_Store/ + - .github/ + - gulpfile.js + - package.json - README.md - Gemfile - Gemfile.lock - - node_modules - - gulpfile.js - - package.json - - _site - - src - - scripts - - scripts/*.sh - - vendor - CNAME - LICENSE - - Rakefile - - old - .gitignore - - .git - - .idea - _includes - - .DS_Store - - assets/*.scss - - assets/bundle.js - translate-pages.php - - .github - -whitelist: - - jekyll-redirect-from - -################### REMOVE ME ################### -base_color: '#467fcf' - -author: - name: Kevin Papst - url: https://www.kevinpapst.de - -# Kimai exclusive -use_pagination: false -name: Kimai Time-Tracking - -bio: "Kimai Time-Tracking" -description: "Kimai time-tracking app - a free and open-source PHP based time-tracker for agencies and freelancer" diff --git a/_data/ar/translation.yml b/_data/ar/translation.yml index a7c48b376..9183fb98f 100644 --- a/_data/ar/translation.yml +++ b/_data/ar/translation.yml @@ -3,10 +3,6 @@ developed-at: 'تم تطويره في' store: 'المتجر' access-demo: 'الوصول التجريبي' docu-alert-english: 'المحتوى متوفر باللغة الإنجليزية فقط' -store-buy-title: 'شراء تطبيقات كيماي' -store-buy-marketplace: 'يعد سوق كيماي هذا هو الموقع المركزي للعثور على المكونات الإضافية والمطورين والدعم التجاري لـ كيماي .' -store-buy-support: 'عن طريق شراء مكون إضافي أو تطبيق كيماي ، فإنك تدعم المطور ومجتمعنا.' -store-buy-karma: 'وهل تعلم أن دعم البرامج مفتوحة المصدر مفيد للكارما الخاصة بك؟ 😄' store-contribute-title: 'مساهمة' store-contribute-subtitle: 'هل أنت مطور؟ اقرأ كيف' store-contribute-plugin: 'إنشاء مكون إضافي جديد' @@ -23,11 +19,9 @@ homepage-alert-title: 'تتبع الوقت مجانًا للجميع' homepage-alert-intro: 'Kimai هو حل تتبع الوقت مفتوح المصدر. يتتبع وقت العمل ويطبع ملخصًا لأنشطتك عند الطلب. سنويًا ، شهريًا ، يوميًا ، حسب العميل ، حسب المشروع ... بساطته هي قوته. نظرًا لواجهة Kimai القائمة على المتصفح ، فإنها تعمل عبر الأنظمة الأساسية ، حتى على جهازك المحمول.' homepage-alert-button-download: 'تحميل' homepage-alert-button-demo: 'حاول أولا' -cloud-title: 'كيماي السحابية (SaaS)' cloud-feature-ssl: 'شهادة TLS (SSL) مجانية' cloud-feature-hosting: 'الاستضافة والتحديثات' cloud-feature-backups: 'النسخ الاحتياطية' -cloud-plugin-fields: 'البرنامج المساعد المخصص للحقول' cloud-plugin-tasks: 'البرنامج المساعد لإدارة المهام' cloud-plugin-expenses: 'المكوِّن الإضافي للمصروفات' cloud-plugin-audit: 'البرنامج المساعد Audit-Trail' @@ -42,7 +36,7 @@ newsletter: email-help: Provide your email address to subscribe. field-invalid: The information provided is invalid. Please review the format and try again. field-required: لا يمكن ترك هذا الحقل فارغا. - sendinblue: We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms% + sendinblue: We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms% photos: dashboard: title: Dashboard @@ -57,7 +51,7 @@ demo: title: Test Kimai in one of the demos introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides. - reinstall: Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export). + reinstall: Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. user: Demo user accounts: These accounts are available for your tests. Or you create your own test user in the login form of each demo. role_user: User @@ -289,5 +283,5 @@ developer: kevinpapst: intro: Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development. price-contract: عند الطلب -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/cs/translation.yml b/_data/cs/translation.yml index cd4bfbb6d..e43014034 100644 --- a/_data/cs/translation.yml +++ b/_data/cs/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Vyvinuto v' store: 'Obchod' access-demo: 'Demo přístup' docu-alert-english: 'Obsah je dostupný pouze v angličtině' -store-buy-title: 'Koupit aplikace Kimai' -store-buy-marketplace: 'Tento obchod Kimai je hlavním místem pro vyhledávání pluginů a technické podpory pro Kimai.' -store-buy-support: 'Zakoupením pluginu nebo aplikace Kimai podpoříte vývojáře a naši komunitu.' -store-buy-karma: 'A věděli jste, že podporování open-source softwaru prospěje vaší karmě?😄' store-contribute-title: 'Přispět' store-contribute-subtitle: 'Jste vývojář? Přečtěte si jak' store-contribute-plugin: 'Vytvořit nový plugin' @@ -38,7 +34,6 @@ cloud-title: 'Kimai Cloud (SaaS)' cloud-feature-ssl: 'Certifikát TLS (SSL) zdarma' cloud-feature-hosting: 'Hosting a Aktualizace' cloud-feature-backups: 'Zálohy' -cloud-plugin-fields: 'Custom fields plugin' cloud-plugin-tasks: 'Plugin na organizaci úkolů' cloud-plugin-expenses: 'Plugin na útraty' cloud-plugin-audit: 'Audit-Trail plugin' @@ -82,7 +77,7 @@ newsletter: field-invalid: 'Poskytnuté informace nejsou platné. Zkuste to prosím znovu.' field-required: 'Toto pole nemůže být vynecháno.' captcha-help: 'Omlouváme se za Captcha ověření. Víme, že je to otrava!' - sendinblue: 'Jako marketingovou platformu používáme Sendinblue. Odesláním tohoto formuláře berete na vědomí, že vámi poskytnuté informace budou předány společnosti Sendinblue ke zpracování v souladu s jejich %terms%' + sendinblue: 'Jako marketingovou platformu používáme Sendinblue. Odesláním tohoto formuláře berete na vědomí, že vámi poskytnuté informace budou předány společnosti Brevo ke zpracování v souladu s jejich %terms%' terms: 'podmínky používání' button: 'ODEBÍRAT' photos: diff --git a/_data/da/translation.yml b/_data/da/translation.yml index 0ad3691cd..9fd002aa4 100644 --- a/_data/da/translation.yml +++ b/_data/da/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Developed at' store: 'Marketplace' access-demo: 'Access demo' docu-alert-english: 'Content is only available in English' -store-buy-title: 'Buy Kimai apps' -store-buy-marketplace: 'This Kimai marketplace is the central location to find plugins, developer and commercial support for Kimai.' -store-buy-support: 'By buying a Kimai plugin or app you support the developer and our community.' -store-buy-karma: 'And did you know that supporting open source software is good for your karma? 😄' store-contribute-title: 'Contribute' store-contribute-subtitle: 'Are you a developer? Read how to' store-contribute-plugin: 'create a new plugin' @@ -38,7 +34,6 @@ cloud-title: 'Kimai Cloud (SaaS)' cloud-feature-ssl: 'Free TLS (SSL) certificate' cloud-feature-hosting: 'Hosting and Updates' cloud-feature-backups: 'Backups' -cloud-plugin-fields: 'Custom-fields plugin' cloud-plugin-tasks: 'Task management plugin' cloud-plugin-expenses: 'Expenses plugin' cloud-plugin-audit: 'Audit-Trail plugin' @@ -58,7 +53,7 @@ installation: 'Installation' updates: 'Updates' username: 'Username' password: 'Kodeord' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -82,7 +77,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -110,7 +105,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: 'User' @@ -301,5 +296,5 @@ install: developer: kevinpapst: intro: 'Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development.' -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/de/translation.yml b/_data/de/translation.yml index b51faf329..61e936b55 100644 --- a/_data/de/translation.yml +++ b/_data/de/translation.yml @@ -3,10 +3,10 @@ developed-at: Entwickelt bei store: Store access-demo: Demo aufrufen docu-alert-english: Der Inhalt ist nur auf Englisch verfügbar -store-buy-title: Kimai Marktplatz -store-buy-marketplace: Der zentrale Ort, um neue Plugins, Entwickler und kommerziellen Support für Kimai zu finden. -store-buy-support: Mit dem Kauf eines Kimai-Plugins oder einer Kimai-App unterstützen Sie den Entwickler und unsere Community. -store-buy-karma: Und wussten Sie schon, dass die Unterstützung von Open-Source-Software gut für Ihr Karma ist? 😄 +store-hero-title: "Erweiterungen, Apps, Support" +store-hero-subtitle: "Willkommen im Kimai-Store" +store-hero-intro: "Erweitern Sie Kimai mit unserer großartigen Auswahl an Plugins. Wählen Sie aus Dutzenden von Apps und Erweiterungen im Kimai-Ökosystem und bringen Sie jetzt Superkraft in Ihr Zeiterfassungserlebnis!" +store-hero-counter: "%number% Kunden sind bereits bei uns" store-contribute-title: Beitragen store-contribute-subtitle: Bist Du ein Entwickler? Dann lies wie Du store-contribute-plugin: ein Plugin erstellst @@ -31,19 +31,18 @@ homepage-quote-excel: Vergessen Sie Excel Tabellen, Ihre Arbeitszeiten zu erfass homepage-features-title: Funktionen der Zeiterfassung homepage-features-subtitle: Die folgende, nicht vollständige, Liste stellt einige der aufregenden Funktionen von Kimai vor. homepage-alert-title: Kostenlose Zeiterfassung für jedermann -homepage-alert-intro: Kimai ist eine kostenlose und quelloffene Zeiterfassung. Es erfasst Arbeitszeiten und druckt Zusammenfassungen aller Aktivitäten aus. Es gibt Berichte und Auswertung für jährliche, monatliche und tägliche Zeiten, gruppiert nach Kunden oder Projekten… es können Rechnungen und Exporte erstellt werden oder Sie verfolgenden den Stand ihrer Projekte. +homepage-alert-intro: Kimai ist eine kostenlose und quelloffene Zeiterfassung. Erfasst Arbeitszeiten und druckt Zusammenfassungen aller Aktivitäten aus. Es gibt Berichte und Auswertungen für jährliche, monatliche und tägliche Zeiten, Kunden oder Projekte… es können Rechnungen und Exporte erstellt werden. homepage-alert-button-download: Herunterladen homepage-alert-button-demo: Ausprobieren -cloud-title: Kimai Cloud (SaaS) +cloud-title: 'Kimai Cloud (SaaS)' cloud-feature-ssl: Kostenloses TLS (SSL) Zertifikat cloud-feature-hosting: Hosting & Updates cloud-feature-backups: Backups -cloud-plugin-fields: Eigene-Felder Plugin -cloud-plugin-tasks: Aufgaben-Verwaltung Plugin -cloud-plugin-expenses: Ausgaben Plugin -cloud-plugin-audit: Audit-Trail Plugin cloud-free-plan: Kostenloser Tarif für 5 Benutzer cloud-call-to-action: Kostenlos starten +footer: Kostenlose und einfach zu bedienende Zeiterfassung für Freelancer, Agenturen und Unternehmen. Kimai ist eine Open-Source-Software, die sowohl zum Selbst-Hosting als auch als SaaS verfügbar ist. +slogan: Zeiterfassung einfach gemacht +share-post: Diesen Beitrag teilen new-badge: Neu free-badge: frei price-contract: Auf Anfrage @@ -58,7 +57,7 @@ installation: Installation updates: Aktualisierung username: Benutzername password: Passwort -try-it: Ausprobieren +try-it: Demo plugin-demo-at: Sie können das Plugin testen auf plugin-demo-accounts: Weitere Zugänge finden Sie hier read-more: Weiterlesen @@ -76,15 +75,50 @@ install-assets: Assets installieren ask-question: Frage stellen full-documentation: Vollständige Dokumentation verfügbar hier (nur in Englisch). contact-developer: Wenn Sie Fragen haben, nutzen Sie bitte die folgenden Informationen, um den Entwickler direkt zu kontaktieren. +about-who: Wer entwickelt Kimai? +description: Beschreibung +per-year: pro Jahr +oss-cloud-compare: + title: Eine Software, zwei Versionen + intro: Kimai ist eine Open-Source-Software, die sowohl zum Selbst-Hosting als auch als SaaS verfügbar ist. + onpremise: Von Dir gehostet + saas: Für Dich gehostet +highlight: + title: Unterstützt dein Unternehmen + subtitle: Mit Kimai lässt sich der gewünschte Zeiterfassungs-Workflow spielend leicht in die bestehende Infrastruktur integrieren. +testimonials: + title: Was Benutzer über Kimai sagen +section-teaser: + work-contract: + title: Arbeitszeitkonten + description: Soll- und Überstunden, Monatsabschlüsse. + timesheet: + title: Zeiterfassung + description: Einfache Eingabe geleisteter Arbeit und übersichtliche Kontrolle. + report: + title: Berichte + description: Berichte zur Auswertung von Benutzern und Projekten. + dashboard: + title: Dashboard + description: Dashboard mit konfigurierbaren Widgets. + absence: + title: Abwesenheiten + description: Feiertage, Urlaub, Krankheit und Abwesenheiten. +section-features: + title: Das kann Kimai für Sie tun + subtitle: Kimai bietet noch viel mehr als nur die Zeiterfassung, hier finden Sie eine Liste weiterer wichtiger Business-Funktionen. +homepage: + title: Zeiterfassung für projektorientierte Teams + intro: Unsere Open-Source-Plattform wurde entwickelt, um die Zeitdaten Ihres Unternehmens zu erfassen und zu analysieren, und ist geeignet für Unternehmen jeder Größe. Kimai hilft Ihnen, Zeit und Geld im Blick zu behalten. newsletter: - title: Newsletter + title: Sie wollen nichts mehr verpassen? introduction: Abonnieren Sie unseren Newsletter und bleiben Sie auf dem Laufenden über Kimai und Plugin Updates. email-title: Ihre E-Mail-Adresse email-help: Geben Sie Ihre E-Mail-Adresse an, um sich anzumelden. field-invalid: Die angegebenen Informationen sind ungültig. Bitte überprüfen Sie das Format und versuchen Sie es erneut. field-required: Dieses Feld darf nicht leer sein. captcha-help: Entschuldigen Sie bitte das Captcha, wir wissen, dass es lästig ist! - sendinblue: Wir verwenden Sendinblue als Marketingplattform. Indem Sie dieses Formular abschicken, erklären Sie sich damit einverstanden, dass die von Ihnen zur Verfügung gestellten Informationen an Sendinblue zur Verarbeitung gemäß deren %terms% übertragen werden. + sendinblue: Wir verwenden Brevo als Marketingplattform. Indem Sie dieses Formular abschicken, erklären Sie sich damit einverstanden, dass die von Ihnen zur Verfügung gestellten Informationen an Brevo zur Verarbeitung gemäß deren %terms% übertragen werden. terms: Nutzungsbedingungen button: ANMELDEN photos: @@ -98,7 +132,6 @@ photos: title: Zeiterfassung description: Erstellen und verwalten Sie Ihre Arbeitszeiten und exportieren diese nach Excel, PDF oder HTML donate: - title: Unterstütze Kimai introduction: Indem Sie für Kimai spenden und die Entwicklung unterstützen, helfen Sie uns, Ihr Zeiterfassungs-Erlebnis zu verbessern! please-donate: Die Entwicklung einer freien Software wie Kimai erfordert viel Zeit und Mühe. Wenn Ihnen Kimai gefällt, wenn Sie es täglich nutzen oder Kimai in Ihrem Unternehmen einsetzen, denken Sie bitte daran, die weitere Entwicklung durch eine Spende zu unterstützen. your-donation: | @@ -112,7 +145,7 @@ demo: title: Teste Kimai in einer unserer Demos introduction: "Probieren Sie die Kimai Zeiterfassung aus und wir versprechen Ihnen: Sie werden es weiter nutzen!" choose: Wählen Sie eine unserer Demo-Installationen aus, um sich einen ersten Eindruck davon zu verschaffen, wie sich Kimai anfühlt und welche Funktionen es bietet. - reinstall: Beachten Sie, dass die Demos in regelmäßigen Abständen neu installiert werden und alle eingegebenen Daten entfernt werden. Aber um es Ihnen bequemer zu machen, werden die meisten mit zufälligen Daten vorbefüllt, sodass Sie direkt mit dem Testen von funktionen (wie Rechnung oder Export) beginnen können. + reinstall: Beachten Sie, dass die Demos in regelmäßigen Abständen neu installiert werden und alle eingegebenen Daten entfernt werden. user: Demo Benutzer accounts: "Diese Konten stehen für Ihre Tests zur Verfügung. Sie können aber auch einen eigenen Testbenutzer im Anmeldeformular jeder Demo erstellen." role_user: Benutzer @@ -129,7 +162,6 @@ menu: download: name: Herunterladen title: Kimai herunterladen - header: Kimai herunterladen — kostenlos! description: Download - Kimai Zeiterfassung herunterladen hosted: name: Cloud @@ -146,6 +178,7 @@ menu: description: Erweiterungen und Dienstleistungen für Kimai blog: name: Neuigkeiten + title: Aktuelles von Kimai description: "Neuigkeiten über die Open-Source Zeiterfassung Kimai" subtitle: Neuigkeiten vom Kimai Entwicklungsteam documentation: @@ -159,6 +192,14 @@ menu: name: Datenschutz site-notice: name: Impressum + docu-manual: + name: Benutzerhandbuch + docu-developer: + name: Entwickler + docu-onpremise: + name: Selber hosten + features: + name: Funktionen menu-documentation: manual: name: Kimai benutzen @@ -188,6 +229,12 @@ menu: name: Kimai einrichten description: Installation und Updates von Kimai feature: + auth: + name: "Authentifizierung und Sicherheit" + description: "Kimai unterstützt externe Identitätsanbieter und Anmeldung via LDAP und SAML über mehrere Provider (wie Google Workspace, Azure AD oder Authentik). Darüber hinaus kann eine Zwei-Faktor-Authentifizierung über TOTP-Tokens aktiviert werden." + reporting: + name: "Berichte und Auswertungen" + description: "Analyse der erfassten Zeiten, Kunden, Projekte und Aktivitäten. Auswertung nach Benutzer, Kunden, Projekten, Aktivitäten, Tags, Zeiträumen und vielem mehr." mobile-ready: name: "Mobil einsetzbar" description: "Das Layout ist vollständig responsiv und für den Desktop und mobilen Einsatz konzipiert. Jeder Benutzer kann die anzuzeigenden Datenspalten konfigurieren, z. B. um horizontales Scrollen auf kleinen Geräten zu verhindern." @@ -202,7 +249,7 @@ feature: description: "Kimai kann in jede Sprache lokalisiert werden und ist bereits in mehr als 30 Sprachen übersetzt." teams: name: "Teams" - description: "Teams can be created to group your users into logical groups like departments or project related peer-groups.Customers and projects can be assigned to those teams, which will limit visibility and access for other users." + description: "Mit Teams teilen sie Ihre Benutzer in logische Gruppen ein, denen Kunden und Projekte zugewiesen werden können, was die Sichtbarkeit und den Zugang für andere Benutzer einschränkt." customers: name: "Kunden" description: "Verwalten Sie Ihre Kunden und legen Sie Adresse, Kontakte, Land, Währung, Sichtbarkeit (zur Archivierung) und viele weitere Felder fest." @@ -211,13 +258,13 @@ feature: description: "Verwalten Sie Projekte für jeden Kunden mit Auftragsnummer, Budget und Sichtbarkeit (zur Archivierung)." activities: name: "Tätigkeiten" - description: "Aktivitäten werden verwendet, um die Arbeitseinheit Arbeitszeittabelleneinträgen zuzuweisen. Verwalten Sie Aktivitäten für jedes Projekt mit Auftragsnummer, Budget und Sichtbarkeit (zur Archivierung). Aktivitäten können global sein, keine Duplizierung mehr erforderlich, wenn mehrere Projekte dieselbe Arbeitseinheit teilen." + description: "Tätigkeiten werden Zeiteinträgen zugewiesen und können zur Auswertung und Filterung verwendet werden. Tätigkeiten können global sein, keine Duplizierung notwendig, wenn mehrere Projekte dieselbe Tätigkeit nutzen." invoices: name: "Rechnungen" description: "Verschiedene Rechnungsvorlagen, Möglichkeiten zur Gruppierung von Einträgen, konfigurierbare Rechnungsnummern und Sie können eigene Vorlagen in den Dateiformaten PDF, DOCX, HTML, XLSX und ODS hinzufügen." export: name: "Daten Export" - description: "Stundenzettel können zur Verwendung in anderen Programmen oder zur gemeinsamen Nutzung mit verschiedenen Abteilungen in den Formaten XLSX (Excel), PDF, CSV und HTML exportiert werden. Darüber hinaus können exportierte Datensätze gesperrt und vor weiteren Änderungen geschützt werden." + description: "Stundenzettel können zur Verwendung in anderen Programmen oder zur gemeinsamen Nutzung in verschiedenen Formaten exportiert werden. Exportierte Datensätze werden gesperrt und vor weiteren Änderungen geschützt." expenses: name: "Ausgaben" description: "Behalten Sie den Überblick über Ihre Ausgaben basierend auf Kunde, Projekt und Aktivität. Diese Ausgaben können kategorisiert und in Ihre Rechnungen aufgenommen werden. Die Spesen- und Ausgabenverwaltung ist als kostenpflichtiges Plugin verfügbar." @@ -229,7 +276,7 @@ feature: description: "Die können Benutzer über SAML (Single Sign-On, auch bekannt als SSO) anmelden bzw. registrieren und dafür Ihren vorhandenen Identitätsanbieter wie Google Workspace, Authentik oder Azure Active Directory nutzen." api: name: "JSON API" - description: "Benutzung einer JSON-API, damit externe Apps mit Ihrem bevorzugten Zeiterfassungssystem kommunizieren können!" + description: "Mit einer umfangreichen JSON-API zum Lesen und Schreiben von Daten, so dass externe Anwendungen und Ihre benutzerdefinierten Tools mit Ihrem bevorzugten Time-Tracker kommunizieren können." ldap: name: "LDAP" description: "Verbinden Sie Kimai mit Ihrem Unternehmensverzeichnisserver (LDAP oder Active Directory) und nutzen Sie Ihre vorhandene Authentifizierungsinfrastruktur." @@ -250,7 +297,7 @@ feature: description: "Kimai verwendet eine lokalisierte Version des 24-Stunden-Formats. Aber wenn Sie an das AM/PM-Format gewöhnt sind, können Sie das konfigurieren." time-clock: name: "Stechuhr" - description: "Möchten Sie nicht, dass Ihre Benutzer willkürliche Stundenzettelaufzeichnungen protokollieren? Wechseln Sie in den Stechuhr Modus, der nur „Punch-In“- und „Punch-Out“-Aufnahmen zulässt. Keine manuell eingegebenen Start- und Endzeiten mehr." + description: "Wollen Sie manuelle Zeiten, also willkürliche Stundenzettelaufzeichnungen, verhindern? Wechseln Sie in den Stechuhr Modus, der nur „Punch-In“- und „Punch-Out“-Aufnahmen zulässt." duration-only: name: "Nur Dauer" description: "Wenn Ihre lokalen Gesetze verlangen, dass Sie nur die Dauer anstelle von Start- und Enddatum und Uhrzeit anzeigen, können Sie diesen Modus global aktivieren." @@ -260,9 +307,6 @@ feature: timesheet-filter: name: "Suche nach Zeiten" description: "Sie können alle Zeiterfassungen nach Benutzer, Kunde, Projekt, Aktivität und Datum filtern." - archiving: - name: "Archivierung" - description: "Langjährige Nutzer wissen, dass sich alte Daten in ansammeln können – keine Sorge: Sie können diese ausblenden, indem Sie die Sichtbarkeit von Kunden, Projekten und Aktivitäten einschränken." permissions: name: "Berechtigungen" description: "Anpassbare Berechtigungsstruktur. Weisen Sie Ihrem Benutzer verschiedene Rollen zu, z. B. können Benutzer Zeiten erfassen, Teamleiter können Rechnungen drucken und Projekte/Aktivitäten konfigurieren, Administratoren können Benutzer und Kunden konfigurieren." @@ -278,9 +322,6 @@ feature: password-reset: name: "Passwort vergessen" description: "Passwort vergessen? Kein Problem, Kimai hat eine Funktion zum Zurücksetzen des Passworts per E-Mail." - technology: - name: "Immer aktuell" - description: "Basierend auf neusten Webtechnologien und Frameworks: PHP, Symfony, Doctrine, Flex, Bootstrap, Webpack und viele mehr …" install: requirements: title: Server Anforderungen @@ -303,3 +344,27 @@ install: developer: kevinpapst: intro: Kimai-Entwickler seit 2007. Will Kimai zur besten Open-Source Zeiterfassung der Welt machen. Verfügbar für Support, Installationen und kundenspezifische Plugin-Entwicklung. +history: + about: "Was als Hobbyprojekt begann, ist jetzt die führende Open-Source-Zeiterfassungsanwendung der Welt. Tauchen wir in seine Geschichte ein." + early-days-subtitle: "Kimai hat eine lange Geschichte und ist seit 2006 dabei, hier ist ein kurzer Überblick, wie alles begann." + early-days-title: "Wie alles begann" + year-2006: "Die erste Version von Kimai wird veröffentlicht und gewinnt schnell eine wachsende Benutzerbasis." + year-2009: "Torsten, der ursprüngliche Entwickler, möchte Kimai schließen. Kevin übernimmt und wird zum Maintainer." + year-2014: "Nach der letzten Veröffentlichung von Kimai 1 stockt die Entwicklung und es gibt kaum noch Aktivität." + year-2018: "Die Neufassung von Kimai findet ihren Weg in die Gemeinschaft, die Datenmigration funktioniert." + year-2019: "Erste Plugins werden erstellt, um das Interesse an kostenpflichtiger Open-Source Software zu validieren." + year-2020: "Kimai wird als SaaS angeboten, mit einem kostenlosen und zwei kostenpflichtigen Abonnements." + year-2023: "Die harte Arbeit zahlt sich endlich aus und Kimai ist jetzt mein 100% Vollzeitjob. Danke!" +cta: + get-started: + question: "Bereit loszulegen?" + answer: "Beginnen Sie jetzt Ihre Zeiterfassungsreise" + button: "Support erhalten" + tech-support: + question: "Technischer & Business Support" + answer: "Ich stelle den Support für alle von mir entwickelten Anwendungen sicher und stehe Ihnen und Ihrem Team zur Seite." + button: "Arbeiten wir zusammen" + best-features: + question: "Die besten Funktionen für Sie" + answer: "Kimai bietet eine breite Palette von Funktionen, die sich an den Anforderungen Ihrer Projektzeiterfassung orientieren, sowie Best-Practice-Lösungen, die unseren Kunden die Buchhaltung erleichtern." + button: "Weitere Funktionen über Erweiterungen" diff --git a/_data/de_CH/translation.yml b/_data/de_CH/translation.yml index a7fd94594..0efb32b23 100644 --- a/_data/de_CH/translation.yml +++ b/_data/de_CH/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Developed at' store: 'Marketplace' access-demo: 'Access demo' docu-alert-english: 'Content is only available in English' -store-buy-title: 'Buy Kimai apps' -store-buy-marketplace: 'This Kimai marketplace is the central location to find plugins, developer and commercial support for Kimai.' -store-buy-support: 'By buying a Kimai plugin or app you support the developer and our community.' -store-buy-karma: 'And did you know that supporting open source software is good for your karma? 😄' store-contribute-title: 'Contribute' store-contribute-subtitle: 'Are you a developer? Read how to' store-contribute-plugin: 'create a new plugin' @@ -38,7 +34,6 @@ cloud-title: 'Kimai Cloud (SaaS)' cloud-feature-ssl: 'Free TLS (SSL) certificate' cloud-feature-hosting: 'Hosting and Updates' cloud-feature-backups: 'Backups' -cloud-plugin-fields: 'Custom-fields plugin' cloud-plugin-tasks: 'Task management plugin' cloud-plugin-expenses: 'Expenses plugin' cloud-plugin-audit: 'Audit-Trail plugin' @@ -58,7 +53,7 @@ installation: 'Installation' updates: 'Updates' username: 'Username' password: 'Passwort' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -82,7 +77,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -110,7 +105,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: 'User' @@ -301,5 +296,5 @@ install: developer: kevinpapst: intro: 'Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development.' -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/developer.yml b/_data/developer.yml index 157ffd8a3..faac8d026 100644 --- a/_data/developer.yml +++ b/_data/developer.yml @@ -1,8 +1,8 @@ kevinpapst: name: Kevin Papst - description: Kimai maintainer since 2007 + description: Building Kimai since 2007 intro: Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development. - image: https://avatars1.githubusercontent.com/u/533162?s=460&v=4 + image: /images/kevin-papst.jpeg homepage: https://www.kevinpapst.de github: https://github.com/kevinpapst twitter: https://twitter.com/keleo @@ -11,10 +11,14 @@ kevinpapst: username: kevinpapst paypal: https://www.paypal.me/kevinpapst amazon: https://www.amazon.de/hz/wishlist/ls/MY4BEJ8I4CI9/ + youtube: https://www.youtube.com/@kimai_org purchase_details: - - Read more about the license for this item here - - You can buy the plugin via Lemon Squeezy (CreditCard, instant access) or from the developer (bank-transfer, up to one week) - - Support-questions, bug-reports and feature-requests will be answered in this Github repository + - title: How is the plugin licensed? + content: Read more about the license for this item here + - title: Where can I buy this plugin? + content: You can buy the plugin via Lemon Squeezy (CreditCard, instant access) or from the developer (bank-transfer, up to one week) + - title: Where can I get support for this plugin? + content: Support-questions, bug-reports and feature-requests will be answered in this Github repository keleo: name: Keleo @@ -25,6 +29,7 @@ keleo: twitter: http://twitter.com/keleo mastodon: https://phpc.social/@kevinpapst email: info@keleo.de + youtube: https://www.youtube.com/@kimai_org infeeeee: name: Peter Gyetvai @@ -134,8 +139,9 @@ liaraalis: skilleven: name: Torsten + description: Initial maintainer of Kimai 1 between 2006 and 2009 username: skilleven - photo: https://avatars2.githubusercontent.com/u/11266793?s=460&v=4 + image: /images/layout/avatar/owl.png profile: https://github.com/skilleven ticesoftware: diff --git a/_data/el/translation.yml b/_data/el/translation.yml index 859d16330..9fadcf8d5 100644 --- a/_data/el/translation.yml +++ b/_data/el/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Developed at' store: 'Marketplace' access-demo: 'Access demo' docu-alert-english: 'Content is only available in English' -store-buy-title: 'Buy Kimai apps' -store-buy-marketplace: 'This Kimai marketplace is the central location to find plugins, developer and commercial support for Kimai.' -store-buy-support: 'By buying a Kimai plugin or app you support the developer and our community.' -store-buy-karma: 'And did you know that supporting open source software is good for your karma? 😄' store-contribute-title: 'Contribute' store-contribute-subtitle: 'Are you a developer? Read how to' store-contribute-plugin: 'create a new plugin' @@ -38,7 +34,6 @@ cloud-title: 'Kimai Cloud (SaaS)' cloud-feature-ssl: 'Free TLS (SSL) certificate' cloud-feature-hosting: 'Hosting and Updates' cloud-feature-backups: 'Backups' -cloud-plugin-fields: 'Custom-fields plugin' cloud-plugin-tasks: 'Task management plugin' cloud-plugin-expenses: 'Expenses plugin' cloud-plugin-audit: 'Audit-Trail plugin' @@ -58,7 +53,7 @@ installation: 'Installation' updates: 'Updates' username: 'Username' password: 'Διαπιστευτήριο' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -82,7 +77,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -110,7 +105,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: 'User' @@ -301,5 +296,5 @@ install: developer: kevinpapst: intro: 'Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development.' -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/en/store.yml b/_data/en/store.yml index 3365d04ad..3c85723c1 100644 --- a/_data/en/store.yml +++ b/_data/en/store.yml @@ -133,200 +133,134 @@ items: intro: Get notified whenever a certain amount of your projects budget is used screenshots: cloudrizon-kimai-mobile-app-android0: - title: Splashscreen description: Start screen of the app cloudrizon-kimai-mobile-app-android1: - title: Timesheets description: Simple list-view for all your timesheet records cloudrizon-kimai-mobile-app-android2: - title: Workspaces description: Allows configuring and switching between multiple Kimai instances katjaglass-approval-bundle0: - title: User Screen for week approval description: Displays week details like working time, expected time and actions like submit for approval katjaglass-approval-bundle1: - title: Screen for teamleads — show overview description: Overview screen of open past approvals of the corresponding team members and itself and status of current finished week katjaglass-approval-bundle2: - title: History of Approval for that week description: The approval history including all comments can be viewed by the team leader or users katjaglass-approval-bundle3: - title: Approve or deny a week description: Teamleads can approve or deny a weeks approval katjaglass-approval-bundle4: - title: Admin View description: Admins have the same permission as teamleads, and can additionally browse all colleagues in the overview and have the option to undo an approval audit-trail-bundle0: - title: Audit-logs description: The overview page of all audit trail logs audit-trail-bundle1: - title: Audit-detail view description: An audit trail can look like this, each change will be recorded and you might see more entries in a object timeline audit-trail-bundle2: - title: Access change history description: You access a detailed audit log from the listing page or from the data-table 'Actions' dropdown of each item keleo-css-custom-bundle0: - title: Custom CSS-administration description: The new administration page with all available pre-made rules keleo-css-custom-bundle1: - title: Timesheet description: Default timesheet-view before using rules keleo-css-custom-bundle2: - title: Custom timesheet description: Timesheet view with activated custom rules to highlight active records and hide overlapping records custom-content-bundle0: - title: Warning message description: The warning message is displayed on every page for logged-in users custom-content-bundle1: - title: Javascript description: The Javascript is executed on every page for logged-in users custom-content-bundle2: - title: Warning message description: You can enter a markdown-formatted news with a title custom-content-bundle3: - title: News page description: The news page is linked in the user menu and displays your markdown message custom-fields-bundle0: - title: Custom-field administration description: The listing page shows all available item-types and their configured custom fields custom-fields-bundle1: - title: Create custom field (customer) description: The dialog to create a new custom field for customers custom-fields-bundle2: - title: Edit custom field (project) description: Editing an already existing custom field for projects (type boolean, see default value) custom-fields-bundle3: - title: All timesheets description: The timesheet listing, displaying the visible custom-field called "Location" custom-fields-bundle4: - title: Edit timesheet description: Editing a timesheet record with a new choice-list custom field expenses-bundle0: - title: Expense administration description: Paginated listing of all recorded expenses expenses-bundle1: - title: Search expense description: Your expenses can be filtered with the search found in multiple Kimai screens expenses-bundle2: - title: Edit expense description: Editing or creating a new expense allows you to enter these fields expenses-bundle3: - title: Expense category description: Expenses are categorized to have a better overview and filtering options expenses-bundle4: - title: Edit category description: You can set a name, cost factor and a short help-text for each category invoice-bundle0: - title: Invoice configuration description: The new configuration settings for export template and format language invoice-bundle1: - title: Invoice configuration description: New invoice settings for format language and export template keleo-invoice-format-fixation-bundle0: - title: Language configuration description: Configure the language for formatting all invoice settings kiosk-barcode-bundle0: - title: User listing description: Displays the list of all users with their configured login-code types kiosk-barcode-bundle1: - title: Configuration description: Configure your Kiosk plugin to your needs, login mode and code format depend on each other kiosk-barcode-bundle2: - title: User codes description: This new barcode can now be printed and handed out to the user kiosk-barcode-bundle3: - title: USB scanner description: The 'Barcode with USB scanner' login mode show a screen like this, the input field is pre-selected and the scanner will submit it after finding a code kiosk-barcode-bundle4: - title: Login screen description: The login screen with the optional user-list being activated kiosk-barcode-bundle5: - title: Webcam scanner description: The 'Barcode with device cam' login mode will show the camera video and scan constantly for barcodes kiosk-barcode-bundle6: - title: Login description: Scanning an existing code for a user starts a new timesheet kiosk-barcode-bundle7: - title: Logout Screen description: Or when a timesheet is already running it will be stopped task-management-bundle0: - title: Task administration description: The new administration page with an overview of all tasks with tracked times, status and assignments task-management-bundle1: - title: Edit a task description: When creating or updating a task, you can record these fields task-management-bundle2: - title: Task widgets description: The new dashboard widgets for assigned and pending tasks translation-bundle0: - title: Translation administration description: The new administration page with an overview of all changed translations translation-bundle1: - title: Add translation screen description: The add dialog allows to find a string by searching its content translation-bundle2: - title: Edit screen description: The edit dialog allows changing your custom translation maximiliangross-easy-backup-bundle0: - title: Backup administration description: The new administration page with backups pcsg-recurring-budget-bundle0: - title: Project settings description: Project settings for recurring budget. pcsg-recurring-budget-bundle1: - title: CLI Command description: Output of the CLI command that credits budgets and calculates project statistics. pcsg-recurring-budget-bundle2: - title: PDF Export description: Example of a PDF budget summary export for one month. pcsg-recurring-budget-bundle3: - title: Project-budget overview description: Lists all projects with their currently available (time or money) budgets and total budgets. pcsg-recurring-budget-bundle4: - title: Project budgets history description: Lists all completed budget intervals and shows statistics for each of them. pcsg-recurring-budget-bundle5: - title: Budget-statistics e-mail description: Example of a budget-statistics e-mail sent out to the project teamlead after a completed budget interval. ticesoftware-kimaibar-macos-client1: - title: KimaiBar description: Smart time tracking in your menu bar ticesoftware-kimaibar-macos-client2: - title: Idle or in a call? description: Never forget pausing your timer or continuing it. ticesoftware-kimaibar-macos-client3: - title: Switch projects description: Switch to recent tasks with a single click or add new ones. ticesoftware-kimaibar-macos-client4: - title: Connects with Kimai description: Connect your Kimai server and own your data. owlysk-codetimer-screen1: - title: CodeTimer desktop widget description: Desktop widget for Kimai. owlysk-codetimer-screen2: - title: CodeTimer desktop widget description: Desktop widget for Kimai. owlysk-codetimer-screen3: - title: CodeTimer desktop widget description: Desktop widget for Kimai. controlling-bundle0: - title: Public holidays and groups description: List of all holidays and groups, with the possibility to import and edit the holidays controlling-bundle1: - title: Import holidays description: There is a large list of countries and regions for which you can import holidays per year controlling-bundle2: - title: Employment contract settings description: For each user, one hourly target can be stored per weekday. In addition, you can configure the holiday group, the first working day and the number of holidays. controlling-bundle3: - title: Summary of the working time account description: The summary shows the target and actual hours per month and year, including another line for manual bookings controlling-bundle4: - title: Manual bookings description: Manual bookings allow the adjustment of the hours account, e.g. to carry over hours from the previous year or to write off paid hours controlling-bundle5: - title: Summary of all days description: Daily evaluation of hours worked and owed, including display of all absences (holiday, sickness, etc.), with the option of month-end closing controlling-bundle6: - title: Without contract adjustment description: The selected user has no contract settings saved on the profile and Kimai can therefore only display the hours worked diff --git a/_data/en/translation.yml b/_data/en/translation.yml index 75b5a23c7..25a0b8145 100644 --- a/_data/en/translation.yml +++ b/_data/en/translation.yml @@ -3,10 +3,10 @@ developed-at: Developed at store: Store access-demo: Access demo docu-alert-english: Content is only available in English -store-buy-title: Buy Kimai apps -store-buy-marketplace: This Kimai marketplace is the central location to find plugins, developer and commercial support for Kimai. -store-buy-support: By buying a Kimai plugin or app you support the developer and our community. -store-buy-karma: And did you know that supporting open source software is good for your karma? 😄 +store-hero-title: "Add-ons, Apps, Support" +store-hero-subtitle: "Welcome to the Kimai store" +store-hero-intro: "Enhance Kimai with our great selection of plugins. Choose from dozens of apps and extensions within the Kimai ecosystem and bring super-power to your time-tracking experience now!" +store-hero-counter: "%number% customers are already with us" store-contribute-title: Contribute store-contribute-subtitle: Are you a developer? Read how to store-contribute-plugin: create a new plugin @@ -34,16 +34,15 @@ homepage-alert-title: Free time-tracking for everyone homepage-alert-intro: Kimai is an open-source time tracking solution. It tracks work time and prints out a summary of your activities on demand. Yearly, monthly, daily, by customer, by project … Its simplicity is its strength. Due to Kimai’s browser based interface it runs cross-platform, even on your mobile device. homepage-alert-button-download: Download homepage-alert-button-demo: Try first -cloud-title: Kimai Cloud (SaaS) +cloud-title: 'Kimai Cloud (SaaS)' cloud-feature-ssl: Free TLS (SSL) certificate cloud-feature-hosting: Hosting and Updates cloud-feature-backups: Backups -cloud-plugin-fields: Custom-fields plugin -cloud-plugin-tasks: Task management plugin -cloud-plugin-expenses: Expenses plugin -cloud-plugin-audit: Audit-Trail plugin cloud-free-plan: Free plan available for 5 users cloud-call-to-action: Start for free +footer: Free and easy to use time tracking for freelancers, agencies and companies. Kimai is open source software available for self-hosting and as SaaS. +slogan: Time-tracking made easy +share-post: Share this post new-badge: New free-badge: free price-contract: Upon request @@ -58,7 +57,7 @@ installation: Installation updates: Updates username: Username password: Password -try-it: Try it +try-it: Demo plugin-demo-at: You can test this plugin at plugin-demo-accounts: Find more test accounts here read-more: Read more @@ -74,17 +73,52 @@ clear-cache: Clear cache create-database: Create database install-assets: Install assets ask-question: Ask a question -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. +about-who: Who is building Kimai? +description: Description +per-year: per year +oss-cloud-compare: + title: One software, two versions + intro: Kimai is an open source software that is available for self-hosting as well as SaaS. + saas: Hosted for you + onpremise: Hosted by you +highlight: + title: Supports your business + subtitle: Kimai has all the business core features you need to setup your time-tracking workflows and integrate it with your existing infrastructure. +testimonials: + title: What users say about Kimai +section-teaser: + work-contract: + title: Working time accounts + description: Debit and overtime hours, monthly statements. + timesheet: + title: Time-Tracking + description: Easy input of work done and clear control. + report: + title: Reports + description: Reports for the evaluation of users and projects. + dashboard: + title: Dashboard + description: Dashboard with configurable widgets. + absence: + title: Absences + description: Holidays, holiday, illness and absences. +section-features: + title: What can Kimai do for you? + subtitle: Kimai offers much more than just time-tracking, here is a list of other important business functions. +homepage: + title: Time tracking for project-driven teams + intro: Our open-source platform is designed to keep track of and analyze your companies time-data, making it perfect for businesses of all sizes. Kimai helps you keep an eye on time and money. newsletter: - title: Newsletter + title: Don't Want to Miss Anything? introduction: Subscribe to our newsletter and stay updated about Kimai and Plugin updates. email-title: Your email address email-help: Provide your email address to subscribe. field-invalid: The information provided is invalid. Please review the format and try again. field-required: This field cannot be left blank. captcha-help: Very sorry for the Captcha, we know it's annoying! - sendinblue: We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms% + sendinblue: We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms% terms: terms of use button: SUBSCRIBE photos: @@ -98,7 +132,6 @@ photos: title: Time-Tracking description: Create and manage your working times and export them to Excel, PDF or HTML donate: - title: Support Kimai introduction: By donating to Kimai and sponsoring the development you help us to improve your time-tracking experience! please-donate: Developing a free software like Kimai takes a lot of time and effort. If you like Kimai, if you use it on a daily basis or administrate Kimai in your company, please consider to support further development. your-donation: | @@ -112,7 +145,7 @@ demo: title: Test Kimai in one of the demos introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides. - reinstall: Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export). + reinstall: Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. user: Demo user accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: User @@ -129,7 +162,6 @@ menu: download: name: Download title: Download Kimai - header: Download Kimai — it's FREE! description: Download - Kimai time-tracker hosted: name: Cloud @@ -146,6 +178,7 @@ menu: subtitle: Extend your time-tracking blog: name: News + title: News from Kimai description: News about Kimai, the time-tracking software subtitle: News from the Kimai development team documentation: @@ -159,6 +192,14 @@ menu: name: Privacy policy site-notice: name: Site notice + docu-manual: + name: User manual + docu-developer: + name: Developer + docu-onpremise: + name: Self-hosting + features: + name: Features menu-documentation: manual: name: Using Kimai @@ -188,6 +229,12 @@ menu: name: "Installation & Updates" description: Everything you need to host your Kimai on your own server feature: + auth: + name: "Authentication and Security" + description: "Kimai supports external identity providers and login via LDAP and SAML across multiple providers (such as Google Workspace, Azure AD or Authentik). In addition, two-factor authentication can be enabled via TOTP tokens." + reporting: + name: "Reports and analyses" + description: "Analysis of recorded times, customers, projects and activities. Evaluation according to users, customers, projects, activities, tags, time periods and much more." mobile-ready: name: "Mobile ready" description: "The layout is fully responsive, made for desktop and mobile usage. Every user can configure the data columns that should be shown, e.g. to prevent horizontal scrolling on small devices." @@ -229,7 +276,7 @@ feature: description: "Log in and register users via SAML (single sign-on aka SSO) and re-use your existing identity provider, like Google Workspace, Authentik or Azure Active Directory." api: name: "JSON API" - description: "Featuring a JSON API so external apps can communicate with your favorite time-tracker!" + description: "Featuring an extensive JSON API for reading and writing data, so external apps and your custom tools can communicate with your favorite time-tracker." ldap: name: "LDAP" description: "Connect Kimai with your company directory server (LDAP or Active directory) and use your existing authentication infrastructure." @@ -260,9 +307,6 @@ feature: timesheet-filter: name: "Timesheet filter" description: "You can filter all time-records by user, customer, project, activity and date." - archiving: - name: "Archiving" - description: "Long-term users know old data can pile up in your dropdowns — hide them by limiting the visibility of customers, projects and activities." permissions: name: "Permissions" description: "Customizable permission structure. Assign different roles to your user, e.g. users can record times, teamleads can print invoices and configure project/activities, admins can configure users and customers." @@ -278,9 +322,6 @@ feature: password-reset: name: "Password reset" description: "Forgot your password? Kimai helps you reset it via e-mail." - technology: - name: "Up-to-date" - description: "Based on newest web technologies and frameworks: PHP, Symfony, Doctrine, Flex, Bootstrap, Webpack and many more…" install: requirements: title: Server requirements @@ -303,3 +344,27 @@ install: developer: kevinpapst: intro: Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development. +history: + about: "What started as a hobby project is now the leading open-source time-tracking application in the world. Let's dive into it's history." + early-days-subtitle: "Kimai has a long history and is around since 2006, this is a brief overview how everything started." + early-days-title: "How it all began" + year-2006: "The first version of Kimai is release and slowly gains a growing user and developer base." + year-2009: "Torsten, the initial developer, wants to close down Kimai. Kevin steps in and becomes maintainer." + year-2014: "The last release of Kimai 1 is created, development stales and there is not much more activity." + year-2018: "The re-write of Kimai finds it's way into the community, the data migrations works." + year-2019: "First plugins are created, to validate market-fit and interest in paid open-source software." + year-2020: "Kimai is offered as a subscription based SaaS, with a free and two paid plans." + year-2023: "The hard work is finally paying off and Kimai is now my 100% full-time job. Thank you!" +cta: + get-started: + question: "Ready to get started?" + answer: "Start your time-tracking journey now" + button: "Get support" + tech-support: + question: "Tech & Business Support" + answer: "I ensure support for all applications I've built and I will assist you and your team." + button: "Let's work together" + best-features: + question: "The best time-tracking features for you" + answer: "Kimai provides a wide range of features that build around your project time-tracking needs and best practices solutions to our customers making their bookkeeping easier." + button: "More features via plugin" diff --git a/_data/eo/translation.yml b/_data/eo/translation.yml index aebf0c533..bd0799ea0 100644 --- a/_data/eo/translation.yml +++ b/_data/eo/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Developed at' store: 'Marketplace' access-demo: 'Access demo' docu-alert-english: 'Content is only available in English' -store-buy-title: 'Buy Kimai apps' -store-buy-marketplace: 'This Kimai marketplace is the central location to find plugins, developer and commercial support for Kimai.' -store-buy-support: 'By buying a Kimai plugin or app you support the developer and our community.' -store-buy-karma: 'And did you know that supporting open source software is good for your karma? 😄' store-contribute-title: 'Contribute' store-contribute-subtitle: 'Are you a developer? Read how to' store-contribute-plugin: 'create a new plugin' @@ -38,7 +34,6 @@ cloud-title: 'Kimai Cloud (SaaS)' cloud-feature-ssl: 'Free TLS (SSL) certificate' cloud-feature-hosting: 'Hosting and Updates' cloud-feature-backups: 'Backups' -cloud-plugin-fields: 'Custom-fields plugin' cloud-plugin-tasks: 'Task management plugin' cloud-plugin-expenses: 'Expenses plugin' cloud-plugin-audit: 'Audit-Trail plugin' @@ -58,7 +53,7 @@ installation: 'Installation' updates: 'Updates' username: 'Username' password: 'Pasvorto' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -82,7 +77,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -110,7 +105,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: 'User' @@ -301,5 +296,5 @@ install: developer: kevinpapst: intro: 'Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development.' -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/es/translation.yml b/_data/es/translation.yml index de166939e..7b740b496 100644 --- a/_data/es/translation.yml +++ b/_data/es/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Desarrollado en' store: 'Tienda' access-demo: 'Acceder a la demo' docu-alert-english: 'El contenido sólo está disponible en inglés' -store-buy-title: 'Comprar aplicaciones de Kimai' -store-buy-marketplace: 'Este mercado Kimai es la ubicación central para encontrar plugins, desarrolladores y soporte comercial para Kimai.' -store-buy-support: 'Comprando la aplicación o el plugin Kimai apoyas al desarrollador y nuestra comunidad.' -store-buy-karma: '¿Y sabías que apoyando software de código abierto es bueno para tu karma? 😄' store-contribute-title: 'Contribuir' store-contribute-subtitle: '¿Eres desarrollador? Lee cómo' store-contribute-plugin: 'Crear un nuevo plugin' @@ -38,7 +34,6 @@ cloud-title: 'Kimai Cloud (SaaS)' cloud-feature-ssl: 'Free TLS (SSL) certificate' cloud-feature-hosting: 'Hosting and Updates' cloud-feature-backups: 'Backups' -cloud-plugin-fields: 'Custom-fields plugin' cloud-plugin-tasks: 'Task management plugin' cloud-plugin-expenses: 'Expenses plugin' cloud-plugin-audit: 'Audit-Trail plugin' @@ -57,7 +52,7 @@ installation: 'Installation' updates: 'Updates' username: 'Nombre de usuario' password: 'Contraseña' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -81,7 +76,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -109,7 +104,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: 'Usuario' @@ -301,5 +296,5 @@ developer: kevinpapst: intro: Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development. price-contract: Upon request -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/eu/translation.yml b/_data/eu/translation.yml index 521ec3732..227116acc 100644 --- a/_data/eu/translation.yml +++ b/_data/eu/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Developed at' store: 'Marketplace' access-demo: 'Access demo' docu-alert-english: 'Content is only available in English' -store-buy-title: 'Buy Kimai apps' -store-buy-marketplace: 'This Kimai marketplace is the central location to find plugins, developer and commercial support for Kimai.' -store-buy-support: 'By buying a Kimai plugin or app you support the developer and our community.' -store-buy-karma: 'And did you know that supporting open source software is good for your karma? 😄' store-contribute-title: 'Contribute' store-contribute-subtitle: 'Are you a developer? Read how to' store-contribute-plugin: 'create a new plugin' @@ -38,7 +34,6 @@ cloud-title: 'Kimai Cloud (SaaS)' cloud-feature-ssl: 'Free TLS (SSL) certificate' cloud-feature-hosting: 'Hosting and Updates' cloud-feature-backups: 'Backups' -cloud-plugin-fields: 'Custom-fields plugin' cloud-plugin-tasks: 'Task management plugin' cloud-plugin-expenses: 'Expenses plugin' cloud-plugin-audit: 'Audit-Trail plugin' @@ -58,7 +53,7 @@ installation: 'Installation' updates: 'Updates' username: 'Username' password: 'Pasahitza' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -82,7 +77,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -110,7 +105,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: 'User' @@ -301,5 +296,5 @@ install: developer: kevinpapst: intro: 'Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development.' -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/fa/translation.yml b/_data/fa/translation.yml index 9d07dff39..f15c29328 100644 --- a/_data/fa/translation.yml +++ b/_data/fa/translation.yml @@ -3,10 +3,6 @@ developed-at: 'توسعه یافته در' store: 'بازار' access-demo: 'دسترسی به نسخه نمایشی' docu-alert-english: 'نظر فقط به زبان انگلیسی ممکن است' -store-buy-title: '‌‌توسط Kimai apps' -store-buy-marketplace: 'این بازار Kimai مکان مرکزی برای یافتن پلاگین ها، توسعه دهندگان و پشتیبانی تجاری برای Kimai است.' -store-buy-support: 'با خرید افزونه یا برنامه Kimai از توسعه دهنده و جامعه ما حمایت می کنید.' -store-buy-karma: 'و آیا می دانستید که پشتیبانی از نرم افزار متن باز برای کارما خوب است؟😄' store-contribute-title: 'مشارکت' store-contribute-subtitle: 'آیا شما یک ارتقاء دهنده هستید؟ بخوانید' store-contribute-plugin: 'یک افزونه جدید ایجاد کنید' @@ -34,11 +30,9 @@ homepage-alert-title: 'پیگیری زمان رایگان برای همه' homepage-alert-intro: 'Kimai یک راه حل ردیابی زمان متن باز است. زمان کار را ردیابی می کند و خلاصه ای از فعالیت های شما را در صورت تقاضا چاپ می کند. سالانه، ماهانه، روزانه، توسط مشتری، بر اساس پروژه ... سادگی آن نقطه قوت آن است. با توجه به رابط مبتنی بر مرورگر Kimai، این برنامه به صورت چند پلتفرمی، حتی در دستگاه تلفن همراه شما اجرا می‌شود.' homepage-alert-button-download: 'دانلود' homepage-alert-button-demo: 'اول امتحان کن' -cloud-title: 'Kimai تحت Cloud (SaaS)' cloud-feature-ssl: 'لایسنس رایگان TLS (SSL)' cloud-feature-hosting: 'میزبانی و بروزرسانی' cloud-feature-backups: 'پشتیبان گیری' -cloud-plugin-fields: 'افزونه Custom-fields' cloud-plugin-tasks: 'افزونه مدیریت وظایف' cloud-plugin-expenses: 'افزونه هزینه ها' cloud-plugin-audit: 'افزونه Audit-Trail' @@ -78,7 +72,7 @@ newsletter: email-help: آدرس ایمیل خود را برای اشتراک وارد کنید. field-required: این قسمت را نمی توان خالی گذاشت. captcha-help: برای Captcha بسیار متاسفم، ما می دانیم که آزار دهنده است! - sendinblue: ما از Sendinblue به عنوان پلت فرم بازاریابی خود استفاده می کنیم. با کلیک بر روی زیر برای ارسال این فرم، تأیید می کنید که اطلاعاتی که ارائه کرده اید برای پردازش مطابق با %terms% آنها به Sendinblue منتقل می شود. + sendinblue: ما از Brevo به عنوان پلت فرم بازاریابی خود استفاده می کنیم. با کلیک بر روی زیر برای ارسال این فرم، تأیید می کنید که اطلاعاتی که ارائه کرده اید برای پردازش مطابق با %terms% آنها به Brevo منتقل می شود. terms: شرایط استفاده email-title: Your email address introduction: Subscribe to our newsletter and stay updated about Kimai and Plugin updates. @@ -296,5 +290,5 @@ developer: kevinpapst: intro: Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development. price-contract: Upon request -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/feature.yml b/_data/feature.yml index 4c95ff4e8..96fbdbb0d 100644 --- a/_data/feature.yml +++ b/_data/feature.yml @@ -2,153 +2,190 @@ documentation: "" hosted: true oss: true + icon: bx-devices + featured: false - name: plugins documentation: "_pages/%language%store.html" hosted: false oss: true + icon: bx-plug + featured: true - name: multi-user documentation: "_documentation/users.md" hosted: true oss: true + icon: bxs-user-account + featured: true - name: multi-language documentation: "_documentation/translations.md" hosted: true oss: true + icon: bx-chat + featured: true - name: teams documentation: "_documentation/teams.md" hosted: true oss: true + icon: bx-select-multiple + featured: true - name: customers documentation: "_documentation/customer.md" hosted: true oss: true + icon: bx-store + featured: true - name: projects documentation: "_documentation/project.md" hosted: true oss: true + icon: bx-briefcase + featured: true - name: activities documentation: "_documentation/activity.md" hosted: true oss: true + icon: bx-list-ul + featured: false - name: invoices documentation: "_documentation/invoices.md" hosted: true oss: true + icon: bxs-bank + featured: true - name: export documentation: "_documentation/export.md" hosted: true oss: true + icon: bx-export + featured: true - name: expenses documentation: "_store/%language%keleo-expenses-bundle.md" hosted: true oss: false + icon: bx-receipt + featured: true - name: saml documentation: "_documentation/saml.md" hosted: false oss: true + icon: bx-key + featured: true - name: api documentation: "_documentation/rest-api.md" hosted: true oss: true + icon: bxs-file-json + featured: true - name: 2fa documentation: "_documentation/users.md" hosted: true oss: true - -- name: ldap - documentation: "_documentation/ldap.md" - hosted: true - oss: true + icon: bx-key + featured: true - name: statistics documentation: "_documentation/dashboard.md" hosted: true oss: true + icon: bxs-widget + featured: true - name: docker documentation: "_documentation/docker.md" hosted: false oss: true + icon: bxl-docker + featured: true + +- name: time-clock + documentation: "_documentation/timesheet.md" + hosted: true + oss: true + icon: bx-stopwatch + featured: true + +- name: rates + documentation: "_documentation/timesheet.md" + hosted: true + oss: true + icon: bx-money + featured: false + +- name: ldap + documentation: "_documentation/ldap.md" + hosted: true + oss: true + featured: false - name: migrate-v1 documentation: "_documentation/migration-v1.md" hosted: false oss: true + featured: false - name: active-entries documentation: "_documentation/configurations.md" hosted: true oss: true + featured: false - name: am-pm-format documentation: "_documentation/i18n-am-pm.md" hosted: false oss: true - -- name: time-clock - documentation: "_documentation/timesheet.md" - hosted: true - oss: true + featured: false - name: duration-only documentation: "_documentation/timesheet.md" hosted: true oss: true - -- name: rates - documentation: "_documentation/timesheet.md" - hosted: true - oss: true + featured: false - name: timesheet-filter documentation: "_documentation/timesheet.md" hosted: true oss: true - -- name: archiving - documentation: "" - hosted: false - oss: true + featured: false - name: permissions documentation: "_documentation/permissions.md" hosted: true oss: true + featured: false - name: user-profile documentation: "_documentation/users.md" hosted: true oss: true + featured: false - name: theming documentation: "_documentation/theme.md" hosted: true oss: true + featured: false - name: user-registration documentation: "_documentation/users.md" hosted: false oss: true + featured: false - name: password-reset documentation: "_documentation/users.md" hosted: false oss: true - -- name: technology - documentation: "" - hosted: true - oss: true + featured: false diff --git a/_data/fi/translation.yml b/_data/fi/translation.yml index 574397f0c..aa205ee09 100644 --- a/_data/fi/translation.yml +++ b/_data/fi/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Developed at' store: 'Marketplace' access-demo: 'Access demo' docu-alert-english: 'Content is only available in English' -store-buy-title: 'Buy Kimai apps' -store-buy-marketplace: 'This Kimai marketplace is the central location to find plugins, developer and commercial support for Kimai.' -store-buy-support: 'By buying a Kimai plugin or app you support the developer and our community.' -store-buy-karma: 'And did you know that supporting open source software is good for your karma? 😄' store-contribute-title: 'Contribute' store-contribute-subtitle: 'Are you a developer? Read how to' store-contribute-plugin: 'create a new plugin' @@ -38,7 +34,6 @@ cloud-title: 'Kimai Cloud (SaaS)' cloud-feature-ssl: 'Free TLS (SSL) certificate' cloud-feature-hosting: 'Hosting and Updates' cloud-feature-backups: 'Backups' -cloud-plugin-fields: 'Custom-fields plugin' cloud-plugin-tasks: 'Task management plugin' cloud-plugin-expenses: 'Expenses plugin' cloud-plugin-audit: 'Audit-Trail plugin' @@ -58,7 +53,7 @@ installation: 'Installation' updates: 'Updates' username: 'Username' password: 'Salasana' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -82,7 +77,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -110,7 +105,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: 'User' @@ -301,5 +296,5 @@ install: developer: kevinpapst: intro: 'Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development.' -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/fo/translation.yml b/_data/fo/translation.yml index 529d85378..9d061d390 100644 --- a/_data/fo/translation.yml +++ b/_data/fo/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Developed at' store: 'Marketplace' access-demo: 'Access demo' docu-alert-english: 'Content is only available in English' -store-buy-title: 'Buy Kimai apps' -store-buy-marketplace: 'This Kimai marketplace is the central location to find plugins, developer and commercial support for Kimai.' -store-buy-support: 'By buying a Kimai plugin or app you support the developer and our community.' -store-buy-karma: 'And did you know that supporting open source software is good for your karma? 😄' store-contribute-title: 'Contribute' store-contribute-subtitle: 'Are you a developer? Read how to' store-contribute-plugin: 'create a new plugin' @@ -38,7 +34,6 @@ cloud-title: 'Kimai Cloud (SaaS)' cloud-feature-ssl: 'Free TLS (SSL) certificate' cloud-feature-hosting: 'Hosting and Updates' cloud-feature-backups: 'Backups' -cloud-plugin-fields: 'Custom-fields plugin' cloud-plugin-tasks: 'Task management plugin' cloud-plugin-expenses: 'Expenses plugin' cloud-plugin-audit: 'Audit-Trail plugin' @@ -58,7 +53,7 @@ installation: 'Installation' updates: 'Updates' username: 'Username' password: 'Loyniorð' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -82,7 +77,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -110,7 +105,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: 'User' @@ -301,5 +296,5 @@ install: developer: kevinpapst: intro: 'Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development.' -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/fr/translation.yml b/_data/fr/translation.yml index 4f9ed15f5..ab1c34c4e 100644 --- a/_data/fr/translation.yml +++ b/_data/fr/translation.yml @@ -3,10 +3,6 @@ developed-at: Développé à store: Magasin access-demo: Accéder à la démo docu-alert-english: Le contenu est uniquement disponible en anglais -store-buy-title: Acheter des greffons Kimai -store-buy-marketplace: Le marketplace Kimai est le lieu central pour trouver des plugins, un développeur et un support commercial pour Kimai. -store-buy-support: En achetant un plugin ou une application Kimai, vous soutenez le développeur et notre communauté. -store-buy-karma: Et saviez-vous que soutenir les logiciels libres est bon pour votre karma ? 😄 store-contribute-title: Contribuer store-contribute-subtitle: "Êtes-vous développeur ? Lisez comment" store-contribute-plugin: créer un greffon @@ -24,11 +20,10 @@ homepage-alert-title: Un suivi du temps libre pour tous homepage-alert-intro: Kimai est un outil de suivi du temps gratuit et open source. Il enregistre vos heures de travail et imprime un résumé de toutes les activités si nécessaire. Annuel, mensuel, quotidien, trié par clients ou projets... vous pouvez créer des factures, des exports ou suivre l'état d'avancement de vos projets. La simplicité est la grande force de Kimai. Grâce à son interface basée sur un navigateur, il fonctionne sur toutes les plateformes, même sur votre téléphone portable. homepage-alert-button-download: Télécharger homepage-alert-button-demo: Essayer d'abord -cloud-title: Kimai Cloud (SaaS) +cloud-title: 'Kimai Cloud (SaaS)' cloud-feature-ssl: Certificat TLS (SSL) gratuit cloud-feature-hosting: Hébergement et mises à jour cloud-feature-backups: Sauvegardes -cloud-plugin-fields: Plugin champs personnalisés cloud-plugin-tasks: Plugin gestion des tâches cloud-plugin-expenses: Plugin dépenses cloud-plugin-audit: Plugin d'audit @@ -280,7 +275,7 @@ newsletter: field-required: Cette case ne peut pas être laissée vide. captcha-help: Désolés pour le Captcha, nous savons que c'est ennuyeux ! field-invalid: L'information fournie n'est pas valide. Veuillez revoir le format et réessayer. - sendinblue: Nous utilisons Sendinblue comme plateforme de marketing. En cliquant ci-dessous pour soumettre ce formulaire, vous reconnaissez que les informations que vous avez fournies seront transférées à Sendinblue pour être traitées conformément à leur %terms% + sendinblue: Nous utilisons Brevo comme plateforme de marketing. En cliquant ci-dessous pour soumettre ce formulaire, vous reconnaissez que les informations que vous avez fournies seront transférées à Brevo pour être traitées conformément à leur %terms% terms: conditions d'utilisation button: S’INSCRIRE title: Lettre d'information diff --git a/_data/he/translation.yml b/_data/he/translation.yml index 06d610804..677f5079a 100644 --- a/_data/he/translation.yml +++ b/_data/he/translation.yml @@ -3,10 +3,6 @@ developed-at: 'פותח על ידי' store: 'חנות' access-demo: 'גישה להדגמה' docu-alert-english: 'התוכן זמין באנגלית בלבד' -store-buy-title: 'רכישת יישומוני Kimai' -store-buy-marketplace: 'החנות של Kimai היא המיקום המרכזי למצוא בו תוספים, תמיכה למפתחים או מסחרית ל־Kimai.' -store-buy-support: 'רכישת תוסף או יישומון של Kimai מביעה את תמיכתך במפתח ובקהילה שלנו.' -store-buy-karma: 'ידעת שתמיכה בתוכנה בקוד פתוח מועילה לקארמה שלך? 😄' store-contribute-title: 'תרומה' store-contribute-subtitle: 'יש לך כישורי תכנות? כאן אפשר לקרוא איך' store-contribute-plugin: 'ליצור תוסף חדש' @@ -38,7 +34,6 @@ cloud-title: 'הענן של Kimai‏ (SaaS)' cloud-feature-ssl: 'אישור TLS‏ (SSL) בחינם' cloud-feature-hosting: 'אירוח ועדכונים' cloud-feature-backups: 'גיבויים' -cloud-plugin-fields: 'תוסף שדות מותאמים' cloud-plugin-tasks: 'תוסף ניהול משימות' cloud-plugin-expenses: 'תוסף הוצאות' cloud-plugin-audit: 'תוסף מעקב פעילות' @@ -77,7 +72,7 @@ newsletter: title: רשימת דיוור email-help: נא לספק את כתובת הדוא״ל שלך כדי להירשם. captcha-help: מצטערים על הקאפצ׳ה, אנחנו יודעים שזה מעצבן! - sendinblue: אנו משתמשים ב־Sendinblue בתור פלטפורמת השיווק שלנו. לחיצה כאן למטה להגשת הטופס הזה מביעה את הסכמתך שהמידע שסיפקת יועבר לעיבוד על ידי Sendinblue בכפוף ל%terms% שלהם + sendinblue: אנו משתמשים ב־Brevo בתור פלטפורמת השיווק שלנו. לחיצה כאן למטה להגשת הטופס הזה מביעה את הסכמתך שהמידע שסיפקת יועבר לעיבוד על ידי Brevo בכפוף ל%terms% שלהם terms: תנאי השימוש introduction: ניתן להירשם לרשימת הדיוור שלנו כדי לקבל עדכונים על Kimai על שלל התוספים הנלווים. email-title: כתובת הדוא״ל שלך diff --git a/_data/hr/translation.yml b/_data/hr/translation.yml index efdb276c4..1f35b7308 100644 --- a/_data/hr/translation.yml +++ b/_data/hr/translation.yml @@ -3,10 +3,6 @@ developed-at: Razvijeno na store: Trgovina access-demo: Pogledaj demo docu-alert-english: Sadržaj je dostupan samo na engleskom jeziku -store-buy-title: Kupi Kimai programe -store-buy-marketplace: Ova Kimai trgovina je središnje mjesto za pronalaženje dodataka, programera i komercijalnu podršku za Kimai. -store-buy-support: Kupnjom Kimai dodatka ili programa podržavaš programera i našu zajednicu. -store-buy-karma: Znaš li da je podrška softveru otvorenog koda dobra za tvoju karmu? 😄 store-contribute-title: Doprinesi store-contribute-subtitle: Ti si programer? Pogledaj kako store-contribute-plugin: stvoriti novi dodatak @@ -28,7 +24,6 @@ cloud-title: Kimai oblak (SaaS) cloud-feature-ssl: Besplatan TLS (SSL) certifikat cloud-feature-hosting: Hosting i aktualiziranja cloud-feature-backups: Sigurnosne kopije -cloud-plugin-fields: Dodatak za prilagođena polja cloud-plugin-tasks: Dodatak za upravljanje zadacima cloud-plugin-expenses: Dodatak za troškove cloud-plugin-audit: Dodatak za dnevnik radnji @@ -285,7 +280,7 @@ newsletter: field-invalid: Navedeni podaci nisu ispravni. Pregledaj format i pokušaj ponovo. field-required: Ovo polje ne smije ostati prazno. captcha-help: Oprosti što koristimo Captcha, znamo da živcira! - sendinblue: Koristimo Sendinblue kao našu marketinšku platformu. Pritiskom gumba za slanje ovog obrasca, prihvaćaš da se tvoje navedene informacije šalju na Sendinblue platformu za obradu u skladu s njihovim %terms% + sendinblue: Koristimo Brevo kao našu marketinšku platformu. Pritiskom gumba za slanje ovog obrasca, prihvaćaš da se tvoje navedene informacije šalju na Brevo platformu za obradu u skladu s njihovim %terms% button: PRETPLATI SE terms: uvjetima korištenja title: Bilten diff --git a/_data/hu/translation.yml b/_data/hu/translation.yml index 7b496e083..6a407b4a7 100644 --- a/_data/hu/translation.yml +++ b/_data/hu/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Developed at' store: 'Marketplace' access-demo: 'Access demo' docu-alert-english: 'Content is only available in English' -store-buy-title: 'Buy Kimai apps' -store-buy-marketplace: 'This Kimai marketplace is the central location to find plugins, developer and commercial support for Kimai.' -store-buy-support: 'By buying a Kimai plugin or app you support the developer and our community.' -store-buy-karma: 'And did you know that supporting open source software is good for your karma? 😄' store-contribute-title: 'Contribute' store-contribute-subtitle: 'Are you a developer? Read how to' store-contribute-plugin: 'create a new plugin' @@ -38,7 +34,6 @@ cloud-title: 'Kimai Cloud (SaaS)' cloud-feature-ssl: 'Free TLS (SSL) certificate' cloud-feature-hosting: 'Hosting and Updates' cloud-feature-backups: 'Backups' -cloud-plugin-fields: 'Custom-fields plugin' cloud-plugin-tasks: 'Task management plugin' cloud-plugin-expenses: 'Expenses plugin' cloud-plugin-audit: 'Audit-Trail plugin' @@ -58,7 +53,7 @@ installation: 'Installation' updates: 'Updates' username: 'Username' password: 'Jelszó' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -82,7 +77,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -110,7 +105,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: 'User' @@ -301,5 +296,5 @@ install: developer: kevinpapst: intro: 'Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development.' -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/id/translation.yml b/_data/id/translation.yml index 0d624077f..86b169677 100644 --- a/_data/id/translation.yml +++ b/_data/id/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Developed at' store: 'Store' access-demo: 'Access demo' docu-alert-english: 'Content is only available in English' -store-buy-title: 'Buy Kimai apps' -store-buy-marketplace: 'This Kimai marketplace is the central location to find plugins, developer and commercial support for Kimai.' -store-buy-support: 'By buying a Kimai plugin or app you support the developer and our community.' -store-buy-karma: 'And did you know that supporting open source software is good for your karma? 😄' store-contribute-title: 'Contribute' store-contribute-subtitle: 'Are you a developer? Read how to' store-contribute-plugin: 'create a new plugin' @@ -58,7 +54,7 @@ installation: 'Installation' updates: 'Updates' username: 'Username' password: 'Password' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -74,7 +70,7 @@ clear-cache: 'Clear cache' create-database: 'Create database' install-assets: 'Install assets' ask-question: 'Ask a question' -full-documentation: 'Full documentation available here (in English only).' +full-documentation: 'Full documentation in English' contact-developer: 'If you have any question, please use the following contact information to get in touch with the developer directly.' newsletter: title: 'Newsletter' @@ -84,7 +80,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -112,7 +108,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: 'User' diff --git a/_data/it/translation.yml b/_data/it/translation.yml index 6a25b2e73..569ce72f1 100644 --- a/_data/it/translation.yml +++ b/_data/it/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Sviluppato a' store: 'Negozio' access-demo: 'Accedi alla demo' docu-alert-english: 'Il contenuto è disponibile solo in inglese' -store-buy-title: 'Acquista le app Kimai' -store-buy-marketplace: 'Questo è il marketplace Kimai, il luogo centrale per trovare plugin, sviluppatori e supporto commerciale per Kimai.' -store-buy-support: 'Acquistando un plugin o un''app Kimai sostieni lo sviluppatore e la nostra community.' -store-buy-karma: 'E sapevi che supportare il software open source fa bene al tuo karma? 😄' store-contribute-title: 'Contributo' store-contribute-subtitle: 'Sei uno sviluppatore? Leggi come' store-contribute-plugin: 'creare un nuovo plugin' @@ -82,7 +78,7 @@ newsletter: field-invalid: 'Le informazioni fornite non sono valide. Per favore, controlla il formato e riprova.' field-required: 'Questo campo non può essere lasciato vuoto.' captcha-help: 'Mi dispiace molto per il Captcha, sappiamo che è fastidioso!' - sendinblue: 'Utilizziamo Sendinblue come nostra piattaforma di marketing. Facendo clic di seguito per inviare questo modulo, riconosci che le informazioni fornite verranno trasferite a Sendinblue per l''elaborazione in conformità con i loro %terms%' + sendinblue: 'Utilizziamo Brevo come nostra piattaforma di marketing. Facendo clic di seguito per inviare questo modulo, riconosci che le informazioni fornite verranno trasferite a Brevo per l''elaborazione in conformità con i loro %terms%' terms: 'termini di utilizzo' button: 'SOTTOSCRIVI' photos: diff --git a/_data/ja/translation.yml b/_data/ja/translation.yml index c706156b4..a4f0c8ad0 100644 --- a/_data/ja/translation.yml +++ b/_data/ja/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Developed at' store: 'Marketplace' access-demo: 'Access demo' docu-alert-english: 'Content is only available in English' -store-buy-title: 'Buy Kimai apps' -store-buy-marketplace: 'This Kimai marketplace is the central location to find plugins, developer and commercial support for Kimai.' -store-buy-support: 'By buying a Kimai plugin or app you support the developer and our community.' -store-buy-karma: 'And did you know that supporting open source software is good for your karma? 😄' store-contribute-title: 'Contribute' store-contribute-subtitle: 'Are you a developer? Read how to' store-contribute-plugin: 'create a new plugin' @@ -58,7 +54,7 @@ installation: 'Installation' updates: 'Updates' username: 'Username' password: 'パスワード' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -82,7 +78,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -110,7 +106,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: 'User' @@ -301,5 +297,5 @@ install: developer: kevinpapst: intro: 'Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development.' -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/ko/translation.yml b/_data/ko/translation.yml index 96c7995bb..527608ddd 100644 --- a/_data/ko/translation.yml +++ b/_data/ko/translation.yml @@ -3,10 +3,6 @@ developed-at: '개발:' store: '시장' access-demo: '데모 액세스' docu-alert-english: '콘텐츠는 영어로만 제공됩니다' -store-buy-title: 'Kimai 앱 구매' -store-buy-marketplace: '이 Kimai 장터는 Kimai에 대한 플러그인, 개발자 및 상업적 지원을 찾을 수 있는 가장 중요한 장소입니다.' -store-buy-support: 'Kimai 플러그인 또는 앱을 구입하면 개발자와 커뮤니티를 지원할 수 있습니다.' -store-buy-karma: '그리고 오픈 소스 소프트웨어를 지원하는 것이 당신의 카르마에 좋다는 것을 알고 계셨습니까? 😄' store-contribute-title: '지원' store-contribute-subtitle: '당신은 개발자입니까' store-contribute-plugin: '새로운 플러그인 정보를 만드십시오' @@ -146,7 +142,7 @@ demo: title: Test Kimai in one of the demos introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides. - reinstall: Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export). + reinstall: Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. accounts: These accounts are available for your tests. Or you create your own test user in the login form of each demo. role_user: User role_teamlead: Teamlead @@ -268,7 +264,7 @@ newsletter: field-invalid: The information provided is invalid. Please review the format and try again. field-required: This field cannot be left blank. captcha-help: Very sorry for the Captcha, we know it's annoying! - sendinblue: We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms% + sendinblue: We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms% terms: terms of use button: SUBSCRIBE donate: @@ -290,5 +286,5 @@ developer: kevinpapst: intro: Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development. price-contract: Upon request -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/menu-documentation.yml b/_data/menu-documentation.yml index 64f9662a4..54d4d9b1f 100644 --- a/_data/menu-documentation.yml +++ b/_data/menu-documentation.yml @@ -1,33 +1,39 @@ manual: slug: chapter-manual - manual: - icon: fas fa-book - pages: [ timesheet, weekly-times, calendar, invoices, export, reporting, customer, project, activity, tags, users, user-preferences, permissions, teams, configurations, doctor, contract, public-holiday, absence, dashboard ] - tips: - icon: fas fa-lightbulb - pages: [ initial-setup, rates, billable, keyboard-shortcuts, i18n-am-pm, duration-format, "-", faq, homescreen ] - plugins: - icon: fas fa-plug - pages: [ plugin-custom-fields, plugin-expenses, plugin-task-management, plugin-custom-css, plugin-custom-content, plugin-translation, plugin-invoice, plugin-import, plugin-audit-trail, plugin-contract ] + icon: bx bx-book + chapter: + - id: manual + icon: bx bx-book + pages: [ timesheet, weekly-times, calendar, invoices, export, reporting, customer, project, activity, tags, users, user-preferences, permissions, teams, configurations, doctor, contract, public-holiday, absence, dashboard ] + - id: tips + icon: bx bx-bulb + pages: [ initial-setup, rates, billable, keyboard-shortcuts, i18n-am-pm, duration-format, "-", faq, homescreen ] + - id: plugins + icon: bx bx-plug + pages: [ plugin-custom-fields, plugin-expenses, plugin-task-management, plugin-custom-css, plugin-custom-content, plugin-translation, plugin-invoice, plugin-import, plugin-audit-trail, plugin-contract ] developer: slug: developers - api: - icon: fas fa-code - pages: [ rest-api, rest-api-examples, api-pagination ] - developer: - icon: fas fa-code-branch - pages: [ plugins, translations, meta-fields, theme, store, migration-v2 ] - extend: - icon: fas fa-bullhorn - pages: [ bughunter, permission-structure, sql-examples, impersonate-user, redis, create-release ] + icon: bx bx-code + chapter: + - id: api + icon: bx bx-code + pages: [ rest-api, rest-api-examples, api-pagination ] + - id: developer + icon: bx bx-git-branch + pages: [ plugins, translations, meta-fields, theme, store, migration-v2 ] + - id: extend + icon: bx bxs-balloon + pages: [ bughunter, permission-structure, sql-examples, redis, create-release ] on-premise: slug: chapter-on-premise - installation: - icon: fas fa-tools - pages: [ installation, updates, docker, cache, plugin-management, webserver-configuration, fresh-ubuntu-18, fresh-ubuntu-20, fresh-ubuntu-22, synology ] - on-premise: - icon: fas fa-server - pages: [ backups, local-yaml, emails, logging, commands, faq-onpremise, migration-v1, versions ] - auth: - icon: fas fa-id-card - pages: [ ldap, saml, saml-azure, saml-google, saml-keycloak, saml-authentik ] + icon: bx bx-wrench + chapter: + - id: installation + icon: bx bx-wrench + pages: [ installation, updates, docker, cache, plugin-management, webserver-configuration, fresh-ubuntu-18, fresh-ubuntu-20, fresh-ubuntu-22, synology ] + - id: on-premise + icon: bx bx-server + pages: [ backups, local-yaml, emails, logging, commands, faq-onpremise, migration-v1, versions ] + - id: auth + icon: bx bx-lock + pages: [ ldap, saml, saml-azure, saml-google, saml-keycloak, saml-authentik ] diff --git a/_data/multi-language.yml b/_data/multi-language.yml index d704d333d..7f791c73b 100644 --- a/_data/multi-language.yml +++ b/_data/multi-language.yml @@ -15,20 +15,23 @@ fr: French he: Hebrew hr: Croatian hu: Hungarian +id: Indonesian it: Italian ja: Japanese ko: Korean nb_NO: Norwegian (Bokmål) nl: Dutch +pa: Panjabi pl: Polish pt: Portuguese pt_BR: Portuguese (Brazilian) ro: Romanian ru: Russian sk: Slovakian +sl: Slovenian sv: Swedish tr: Turkish uk: Ukrainian vi: Vietnamese zh_Hant: Chinese (traditional) -zh_CN: Chinese (simplified) +zh_Hans: Chinese (simplified) diff --git a/_data/nb_NO/translation.yml b/_data/nb_NO/translation.yml index 48be61b69..9f6e4788b 100644 --- a/_data/nb_NO/translation.yml +++ b/_data/nb_NO/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Utviklet på' store: 'Butikk' access-demo: 'Prøv demo' docu-alert-english: 'Innholdet er kun tilgjengelig på engelsk' -store-buy-title: 'Kjøp Kimai-programmer' -store-buy-marketplace: 'Denne Kimai-markedsplassen er et sentralt sted å finne programtillegg, utvikler- og kommersielle støtte for Kimai.' -store-buy-support: 'Ved å kjøpe et Kimai-programtillegg eller programmet støtter du utvikleren og vår gemenskap.' -store-buy-karma: 'Visste du at å støtte fri programvare gir deg god karma? 😄' store-contribute-title: 'Bidra' store-contribute-subtitle: 'Er du en utvikler? Les veiledningen' store-contribute-plugin: 'opprett et nytt programtillegg' @@ -24,7 +20,6 @@ homepage-alert-title: 'Gratis tidssporing for alle' homepage-alert-intro: 'Kimai er en fri tidssporingsløsning. Den sporer arbeidstid og skriver ut et sammendrag av dine aktiviteter når du vil. Årlig, månedlig, daglig, per kunde, per prosjekt … Enkelheten er dens styrke. Siden grensesnittet er vev-basert kan du bruke det selv på mobiltelefonen.' homepage-alert-button-download: 'Last ned' homepage-alert-button-demo: 'Prøv først' -cloud-title: 'Kimai-sky (SaaS)' cloud-feature-ssl: 'Gratis TLS (SSL)-sertifikat' cloud-feature-hosting: 'Vertstjening og oppdateringer' cloud-feature-backups: 'Sikkerhetskopier' @@ -272,14 +267,14 @@ newsletter: field-invalid: The information provided is invalid. Please review the format and try again. field-required: Dette feltet må fylles ut. captcha-help: Very sorry for the Captcha, we know it's annoying! - sendinblue: We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms% + sendinblue: We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms% terms: terms of use button: SUBSCRIBE demo: title: Test Kimai in one of the demos introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides. - reinstall: Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export). + reinstall: Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. user: Demo-bruker accounts: These accounts are available for your tests. Or you create your own test user in the login form of each demo. role_admin: Administrator diff --git a/_data/nl/translation.yml b/_data/nl/translation.yml index 5eb3f5090..10cbc7d67 100644 --- a/_data/nl/translation.yml +++ b/_data/nl/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Ontwikkeld door' store: 'Winkel' access-demo: 'Toegang tot demo' docu-alert-english: 'Content is only available in English' -store-buy-title: 'Kimai-apps kopen' -store-buy-marketplace: 'Deze Kimai marktplaats is de centrale omgeving om plugins, ontwikkelaars en commerciële ondersteuning voor Kimai te vinden.' -store-buy-support: 'Door een Kimai plugin of app te kopen steun je de ontwikkelaar en onze community.' -store-buy-karma: 'En wist je dat het ondersteunen van open source software goed is voor je karma? 😄' store-contribute-title: 'Bijdragen' store-contribute-subtitle: 'Ben je een ontwikkelaar? Lees hoe je' store-contribute-plugin: 'Een nieuwe plugin maakt' @@ -58,7 +54,7 @@ installation: 'Installation' updates: 'Updates' username: 'Username' password: 'Wachtwoord' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -82,7 +78,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -110,7 +106,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "Deze accounts zijn beschikbaar voor uw tests. Of u maakt uw eigen testgebruiker in het aanmeldformulier van elke demo." role_user: 'Gebruiker' @@ -301,5 +297,5 @@ install: developer: kevinpapst: intro: 'Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development.' -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/photos.yml b/_data/photos.yml deleted file mode 100644 index b9339884c..000000000 --- a/_data/photos.yml +++ /dev/null @@ -1,11 +0,0 @@ -dashboard: - large: '/images/screenshots/dashboard.png' - small: '/images/screenshots/dashboard-small.jpg' - -invoice: - large: '/images/screenshots/invoices.png' - small: '/images/screenshots/invoices-small.jpg' - -timesheet: - large: '/images/screenshots/time-tracking.png' - small: '/images/screenshots/time-tracking-small.jpg' diff --git a/_data/pl/translation.yml b/_data/pl/translation.yml index ffc9626e5..6d10441b6 100644 --- a/_data/pl/translation.yml +++ b/_data/pl/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Developed at' store: 'Marketplace' access-demo: 'Access demo' docu-alert-english: 'Content is only available in English' -store-buy-title: 'Buy Kimai apps' -store-buy-marketplace: 'This Kimai marketplace is the central location to find plugins, developer and commercial support for Kimai.' -store-buy-support: 'By buying a Kimai plugin or app you support the developer and our community.' -store-buy-karma: 'And did you know that supporting open source software is good for your karma? 😄' store-contribute-title: 'Contribute' store-contribute-subtitle: 'Are you a developer? Read how to' store-contribute-plugin: 'create a new plugin' @@ -58,7 +54,7 @@ installation: 'Installation' updates: 'Updates' username: 'Username' password: 'Hasło' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -82,7 +78,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -110,7 +106,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: 'User' @@ -301,5 +297,5 @@ install: developer: kevinpapst: intro: 'Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development.' -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/pt/translation.yml b/_data/pt/translation.yml index df6fe57c4..0d1db1345 100644 --- a/_data/pt/translation.yml +++ b/_data/pt/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Desenvolvido em' store: 'Mercado' access-demo: 'Acesse a demonstração' docu-alert-english: 'O conteúdo está disponível apenas em inglês' -store-buy-title: 'Compre apps de Kimai' -store-buy-marketplace: 'Este mercado do Kimai é o principal local para encontrar plug-ins, programadores e suporte comercial para o Kimai.' -store-buy-support: 'Ao comprar um plug-in ou uma app para o Kimai, apóia o programador e a nossa comunidade.' -store-buy-karma: 'E sabia que o suporte para software de código aberto é bom para o seu carma? 😄' store-contribute-title: 'Contribua' store-contribute-subtitle: 'É um programador? Saiba mais' store-contribute-plugin: 'Criar um novo plug-in' @@ -82,7 +78,7 @@ newsletter: field-invalid: 'A informação é inválida Revise o formato e tente novamente.' field-required: 'Este campo não pode ser deixado em branco.' captcha-help: 'Lamentamos muito pelo Captcha, sabemos que é irritante!' - sendinblue: 'Usamos o Sendinblue como a nossa plataforma de marketing. Ao clicar abaixo para enviar este formulário, reconhece que as informações que forneceu serão enviadas ao Sendinblue para processamento de acordo com os %terms%' + sendinblue: 'Usamos o Brevo como a nossa plataforma de marketing. Ao clicar abaixo para enviar este formulário, reconhece que as informações que forneceu serão enviadas ao Brevo para processamento de acordo com os %terms%' terms: 'Termos de uso' button: 'ASSINE' photos: diff --git a/_data/pt_BR/translation.yml b/_data/pt_BR/translation.yml index 4e200bc32..bfcd61d45 100644 --- a/_data/pt_BR/translation.yml +++ b/_data/pt_BR/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Desenvolvido em' store: 'Mercado' access-demo: 'Acesse a demonstração' docu-alert-english: 'O conteúdo está disponível apenas em inglês' -store-buy-title: 'Compre aplicativos Kimai' -store-buy-marketplace: 'Este mercado do Kimai é o principal local para encontrar plug-ins, desenvolvedores e suporte comercial para o Kimai.' -store-buy-support: 'Ao comprar um plug-in ou um aplicativo para o Kimai, você apóia o desenvolvedor e a nossa comunidade.' -store-buy-karma: 'E você sabia que o suporte ao software de código aberto é bom para o seu carma? 😄' store-contribute-title: 'Contribua' store-contribute-subtitle: 'Você é um desenvolvedor? Saiba mais' store-contribute-plugin: 'Criar um novo plug-in' @@ -77,7 +73,7 @@ newsletter: email-help: Informe o seu endereço de e-mail para se inscrever. field-required: Este campo não pode ser deixado em branco. captcha-help: Lamentamos muito pelo Captcha, sabemos que é irritante! - sendinblue: Nós usamos o Sendinblue como a nossa plataforma de marketing. Ao clicar abaixo para enviar este formulário, você reconhece que as informações que você forneceu serão enviadas ao Sendinblue para processamento de acordo com os %terms% + sendinblue: Nós usamos o Brevo como a nossa plataforma de marketing. Ao clicar abaixo para enviar este formulário, você reconhece que as informações que você forneceu serão enviadas ao Brevo para processamento de acordo com os %terms% terms: Termos de uso field-invalid: A informação é inválida Revise o formato e tente novamente. title: Boletim diff --git a/_data/ro/translation.yml b/_data/ro/translation.yml index c9de655a4..75a4dd262 100644 --- a/_data/ro/translation.yml +++ b/_data/ro/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Dezvoltat la' store: 'Magazin' access-demo: 'Accesați demo-ul' docu-alert-english: 'Conținutul este disponibil doar în limba engleză' -store-buy-title: 'Cumpărați aplicații Kimai' -store-buy-marketplace: 'Acest market Kimai este locația centrală pentru a găsi plugin-uri, dezvoltatori și suport comercial pentru Kimai.' -store-buy-support: 'Prin cumpărarea unui plugin sau a unei aplicații Kimai, sprijiniți dezvoltatorul și comunitatea noastră.' -store-buy-karma: 'Și știați că susținerea software-ului open source este bună pentru karma dumneavoastră? 😄' store-contribute-title: 'Contribuiți' store-contribute-subtitle: 'Sunteți un dezvoltator? Citiți cum să' store-contribute-plugin: 'creați un nou plugin' @@ -58,7 +54,7 @@ installation: 'Installation' updates: 'Updates' username: 'Username' password: 'Parola' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -82,7 +78,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -110,7 +106,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: 'User' @@ -301,5 +297,5 @@ install: developer: kevinpapst: intro: 'Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development.' -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/ru/translation.yml b/_data/ru/translation.yml index f1ff521cd..135250e08 100644 --- a/_data/ru/translation.yml +++ b/_data/ru/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Разработано в' store: 'магазин' access-demo: 'Демо-доступ' docu-alert-english: 'Содержание доступно только на английском языке' -store-buy-title: 'Покупайте приложения Kimai' -store-buy-marketplace: 'Маркетплейс Kimai — центральное место для поиска плагинов, разработчиков и коммерческой поддержки Kimai.' -store-buy-support: 'Покупая плагин или приложение Kimai, вы поддерживаете разработчика и наше сообщество.' -store-buy-karma: 'А знаете ли вы, что поддержка программного обеспечения с открытым исходным кодом полезна для вашей кармы? 😄' store-contribute-title: 'Сделать вклад' store-contribute-subtitle: 'Вы разработчик? Прочитайте, как' store-contribute-plugin: 'создать новый плагин' @@ -277,7 +273,7 @@ newsletter: field-invalid: Предоставленная информация недействительна. Пожалуйста, пересмотрите формат и повторите попытку. field-required: Это поле нельзя оставлять пустым. captcha-help: Извините за капчу, мы знаем, что она раздражает! - sendinblue: Мы используем Sendinblue в качестве нашей маркетинговой платформы. Нажав ниже, чтобы отправить эту форму, вы признаёте, что предоставленная вами информация будет передана Sendinblue для обработки в соответствии с их %terms% + sendinblue: Мы используем Brevo в качестве нашей маркетинговой платформы. Нажав ниже, чтобы отправить эту форму, вы признаёте, что предоставленная вами информация будет передана Brevo для обработки в соответствии с их %terms% button: ПОДПИСАТЬСЯ terms: условиями использования demo: diff --git a/_data/sk/translation.yml b/_data/sk/translation.yml index f8fcd1e9e..73ae772b7 100644 --- a/_data/sk/translation.yml +++ b/_data/sk/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Vyvinuté v' store: 'Obchod' access-demo: 'Prístup k demu' docu-alert-english: 'Obsah je dostupný iba v Anglickom jazyku' -store-buy-title: 'Zakúpiť aplikácie Kimai' -store-buy-marketplace: 'Tento Kimai obchod je hlavným miestom pre vyhľadávanie doplnkov (pluginov) a technickej podpory pre Kimai.' -store-buy-support: 'Zakúpením pluginu alebo aplikácie Kimai podporíte vývojárov a našu komunitu.' -store-buy-karma: 'Vedeli ste, že podporovanie open-source softvéru prospeje vašej karme?😄' store-contribute-title: 'Prispieť' store-contribute-subtitle: 'Ste vývojár? Prečítajte si ako' store-contribute-plugin: 'Vytvoriť nový plugin' @@ -82,7 +78,7 @@ newsletter: field-invalid: 'Poskytnuté informácie sú neplatné. Skúste to prosím znovu.' field-required: 'Toto pole nemôže byť vynechané.' captcha-help: 'Ospravedlňujeme sa za Captacha overenie, vieme že je to otravné!' - sendinblue: 'Ako marketingovú platformu používame Sendinblue. Odoslaním tohoto formulára beriete na vedomie, že vami poskytnuté údaje budú predané spoločnosti Sendinblue k spracovaniu v súlade s jejich %terms%' + sendinblue: 'Ako marketingovú platformu používame Sendinblue. Odoslaním tohoto formulára beriete na vedomie, že vami poskytnuté údaje budú predané spoločnosti Brevo k spracovaniu v súlade s jejich %terms%' terms: 'podmienky používania' button: 'ODOBERAŤ' photos: diff --git a/_data/sl/translation.yml b/_data/sl/translation.yml index eb37eaeca..f7a73205b 100644 --- a/_data/sl/translation.yml +++ b/_data/sl/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Developed at' store: 'Store' access-demo: 'Access demo' docu-alert-english: 'Content is only available in English' -store-buy-title: 'Buy Kimai apps' -store-buy-marketplace: 'This Kimai marketplace is the central location to find plugins, developer and commercial support for Kimai.' -store-buy-support: 'By buying a Kimai plugin or app you support the developer and our community.' -store-buy-karma: 'And did you know that supporting open source software is good for your karma? 😄' store-contribute-title: 'Contribute' store-contribute-subtitle: 'Are you a developer? Read how to' store-contribute-plugin: 'create a new plugin' @@ -58,7 +54,7 @@ installation: 'Installation' updates: 'Updates' username: 'Username' password: 'Geslo' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -74,7 +70,7 @@ clear-cache: 'Clear cache' create-database: 'Create database' install-assets: 'Install assets' ask-question: 'Ask a question' -full-documentation: 'Full documentation available here (in English only).' +full-documentation: 'Full documentation in English' contact-developer: 'If you have any question, please use the following contact information to get in touch with the developer directly.' newsletter: title: 'Newsletter' @@ -84,7 +80,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -112,7 +108,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: 'User' diff --git a/_data/store/cloudrizon-kimai-mobile-app-android.yml b/_data/store/cloudrizon-kimai-mobile-app-android.yml index 51c0f7343..1ef19cbea 100644 --- a/_data/store/cloudrizon-kimai-mobile-app-android.yml +++ b/_data/store/cloudrizon-kimai-mobile-app-android.yml @@ -1,5 +1,4 @@ developer: "cloudrizon" -image: /images/marketplace/cloudrizon-kimai-mobile-logo.png icon: fab fa-android price: 2,99 € play-store: https://play.google.com/store/apps/details?id=de.cloudrizon.kimaimobile diff --git a/_data/store/cloudrizon-kimai-mobile-app-ios.yml b/_data/store/cloudrizon-kimai-mobile-app-ios.yml index 1b93ddfcb..4ffddee2c 100644 --- a/_data/store/cloudrizon-kimai-mobile-app-ios.yml +++ b/_data/store/cloudrizon-kimai-mobile-app-ios.yml @@ -1,5 +1,4 @@ developer: "cloudrizon" -image: /images/marketplace/cloudrizon-kimai-mobile-logo.png icon: fab fa-app-store-ios new: true price: 3,49 € diff --git a/_data/store/derpilzcc-readonly-access-bundle.yml b/_data/store/derpilzcc-readonly-access-bundle.yml index b8c4be780..882b1cc0b 100644 --- a/_data/store/derpilzcc-readonly-access-bundle.yml +++ b/_data/store/derpilzcc-readonly-access-bundle.yml @@ -1,7 +1,6 @@ developer: derpilzcc icon: fas fa-book price: 0 -download: '' github: https://github.com/fungus75/ReadOnlyAccessBundle bundle: name: "ReadOnlyAccessBundle" diff --git a/_data/store/gbs-zip-projectrenderer-bundle.yml b/_data/store/gbs-zip-projectrenderer-bundle.yml index 4c18ab1dc..6e53e4e26 100644 --- a/_data/store/gbs-zip-projectrenderer-bundle.yml +++ b/_data/store/gbs-zip-projectrenderer-bundle.yml @@ -1,7 +1,6 @@ developer: gbs-it icon: fas fa-file-archive price: 0 -download: '' github: https://github.com/jens-2305/ZipProjectRendererBundle bundle: name: "ZipProjectRendererBundle" diff --git a/_data/store/glorpen-duration-bundle.yml b/_data/store/glorpen-duration-bundle.yml index 37cfcd67c..54a7b7d27 100644 --- a/_data/store/glorpen-duration-bundle.yml +++ b/_data/store/glorpen-duration-bundle.yml @@ -2,7 +2,6 @@ developer: glorpen icon: far fa-hourglass new: true price: 0 -download: '' github: https://github.com/glorpen/kimai-duration-plugin bundle: name: "GlorpenDurationBundle" diff --git a/_data/store/infeeeee-kimai2-cmd-argos.yml b/_data/store/infeeeee-kimai2-cmd-argos.yml index b48755b0f..0bb1688a9 100644 --- a/_data/store/infeeeee-kimai2-cmd-argos.yml +++ b/_data/store/infeeeee-kimai2-cmd-argos.yml @@ -1,7 +1,6 @@ developer: infeeeee icon: fas fa-mouse-pointer price: 0 -download: '' github: https://github.com/infeeeee/kimai2-cmd-argos screenshot: - https://raw.githubusercontent.com/infeeeee/kimai2-cmd-argos/master/img/screenshot-argos-active.png diff --git a/_data/store/keleo-css-custom-bundle.yml b/_data/store/keleo-css-custom-bundle.yml index f264d1cfe..8c1f1e757 100644 --- a/_data/store/keleo-css-custom-bundle.yml +++ b/_data/store/keleo-css-custom-bundle.yml @@ -1,5 +1,6 @@ developer: keleo icon: fab fa-css3 +demo: true price: 0 gumroad: "https://gum.co/custom-css" lemonsqueezy: "https://kimai.lemonsqueezy.com/checkout/buy/98a0a76c-385c-49fc-a481-b4923ff208bc" diff --git a/_data/store/ticesoftware-kimaibar-macos-client.yml b/_data/store/ticesoftware-kimaibar-macos-client.yml index 8f3b8ae1c..b28ae3a4d 100644 --- a/_data/store/ticesoftware-kimaibar-macos-client.yml +++ b/_data/store/ticesoftware-kimaibar-macos-client.yml @@ -1,5 +1,4 @@ developer: "ticesoftware" -image: /images/marketplace/ticesoftware-kimaibar-macos-client.png icon: fab fa-app-store price: 0 app-store: https://apps.apple.com/app/kimaibar/id1630718030 diff --git a/_data/store/umws-applewatch-app.yml b/_data/store/umws-applewatch-app.yml index 68ac1f514..607667564 100644 --- a/_data/store/umws-applewatch-app.yml +++ b/_data/store/umws-applewatch-app.yml @@ -1,5 +1,4 @@ developer: umws -image: /images/marketplace/appleWatchApp_tracking.jpg icon: fab fa-apple price: 1,92 € app-store: https://apps.apple.com/app/kimaitracker/id1494495700 diff --git a/_data/sv/translation.yml b/_data/sv/translation.yml index 4f92520da..8b96034ca 100644 --- a/_data/sv/translation.yml +++ b/_data/sv/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Utvecklad på' store: 'Marknad' access-demo: 'Få tillgång till demo' docu-alert-english: 'Innehållet är endast tillgängligt på engelska' -store-buy-title: 'Köp Kimai-appar' -store-buy-marketplace: 'Denna Kimai-marknadsplats är den centrala platsen för att hitta plugins, utvecklare och kommersiellt stöd för Kimai.' -store-buy-support: 'Genom att köpa en Kimai-plugin eller app stödjer du utvecklaren och vår community.' -store-buy-karma: 'Och visste du att stöd för programvara med öppen källkod är bra för din karma? 😄' store-contribute-title: 'Bidra' store-contribute-subtitle: 'Är du en utvecklare? Läs hur man gör' store-contribute-plugin: 'skapa ett nytt plugin' @@ -82,7 +78,7 @@ newsletter: field-invalid: 'Den angivna informationen är ogiltig. Granska formatet och försök igen.' field-required: 'Detta fält kan inte lämnas tomt.' captcha-help: 'Mycket ledsen för Captcha, vi vet att det är irriterande!' - sendinblue: 'Vi använder Sendinblue som vår marknadsföringsplattform. Genom att klicka nedan för att skicka in det här formuläret godkänner du att informationen du angett kommer att överföras till Sendinblue för behandling i enlighet med deras %terms%' + sendinblue: 'Vi använder Brevo som vår marknadsföringsplattform. Genom att klicka nedan för att skicka in det här formuläret godkänner du att informationen du angett kommer att överföras till Brevo för behandling i enlighet med deras %terms%' terms: 'villkor' button: 'PRENUMERERA' photos: diff --git a/_data/teaser.yml b/_data/teaser.yml new file mode 100644 index 000000000..4893b5c4a --- /dev/null +++ b/_data/teaser.yml @@ -0,0 +1,15 @@ +- name: timesheet + image: teaser-times.jpeg + +- name: report + image: teaser-budget-chart.jpeg + +- name: work-contract + image: teaser-work-contract.jpeg + +- name: dashboard + image: teaser-dashboard.jpeg + +- name: absence + image: teaser-absence.jpeg + diff --git a/_data/testimonials.yml b/_data/testimonials.yml new file mode 100644 index 000000000..e7ad8e45e --- /dev/null +++ b/_data/testimonials.yml @@ -0,0 +1,65 @@ +- rating: 4 + name: "Robert Fox" + position: "Founder of a cleaning company" + image: "/images/layout/testimonial/person-9.jpeg" + content: "I have been using Kimai time-tracking software for the past two years and I can honestly say that it has been a great experience. The customer support is outstanding and they are always willing to help with any issues that arise. They are constantly updating the software and plugins with new features and they listen to customer requests for new features. I can highly recommend Kimai to anyone looking for a reliable and efficient way to track their time." + +- rating: 5 + name: "Jerome Bell" + position: "Project Manager" + image: "/images/layout/testimonial/person-2.jpeg" + content: "I've been using KIMAI for over a year, and their regular updates keep me coming back. They truly listen to customer requests and implement features that make our workflow smoother. Highly recommend!" + +- rating: 4 + name: "Albert Flores" + position: "Freelance Designer" + image: "/images/layout/testimonial/person-10.jpeg" + content: "KIMAI's customer support is top-notch. I had a small issue and they responded quickly, resolving it in no time. It's rare to find such attentive service these days." + +- rating: 5 + name: "Carlos Martinez" + position: "Startup Founder" + image: "/images/layout/testimonial/person-8.jpeg" + content: "As a startup founder, time tracking is crucial. With KIMAI, not only is it easy to keep track of hours, but their quick bugfixing ensures that I never lose a minute. Fantastic software!" + +- rating: 4 + name: "Aisha Patel" + position: "Operations Manager" + image: "/images/layout/testimonial/person-1.png" + content: "We transitioned to KIMAI six months ago, and it's been a game-changer. Their fast response time, combined with great customer support, has made the transition seamless. Keep it up!" + +- rating: 5 + name: "Lucas Kim" + position: "Software Developer" + image: "/images/layout/testimonial/person-6.jpeg" + content: "As a developer, I appreciate when a software provider takes feedback seriously. KIMAI does exactly that. Their commitment to addressing user needs and implementing regular updates makes my job easier and more efficient." + +- rating: 5 + name: "Ella Fitzgerald" + position: "Lead Software Engineer" + image: "/images/layout/testimonial/person-3.jpeg" + content: "KIMAI's API integration is top-notch. It's a breeze to integrate with our other tools, making our development process efficient. They've truly designed it with developers in mind." + +- rating: 4 + name: "Liam Thompson" + position: "DevOps Specialist" + image: "/images/layout/testimonial/person-5.png" + content: "Transitioning to KIMAI was seamless, thanks to their comprehensive documentation. Any time I had a question, their support was quick to guide me. A great tool for any DevOps team." + +- rating: 5 + name: "Sasha Ivanov" + position: "Founder / Design Agency" + image: "/images/layout/testimonial/person-2.jpeg" + content: "KIMAI's detailed reporting helps me ensure that our development sprints stay on track. Plus, the software's stability means I can focus on finding bugs in our product, not in our time-tracking tool." + +- rating: 4 + name: "Mohammed Ali" + position: "Backend Developer" + image: "/images/layout/testimonial/person-4.jpeg" + content: "The customizability of KIMAI is impressive. I've been able to tailor it to our team's unique needs, enhancing our productivity. And their SDK is a joy to work with!" + +- rating: 5 + name: "Nina Rodriguez" + position: "Technical Support Manager" + image: "/images/layout/testimonial/person-7.png" + content: "KIMAI has transformed how our support team manages time. The intuitive interface means less time training and more time assisting customers. Moreover, their regular updates show a commitment to continuous improvement." diff --git a/_data/tr/translation.yml b/_data/tr/translation.yml index 9860e0aef..5041a9fc1 100644 --- a/_data/tr/translation.yml +++ b/_data/tr/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Developed at' store: 'Marketplace' access-demo: 'Access demo' docu-alert-english: 'Content is only available in English' -store-buy-title: 'Buy Kimai apps' -store-buy-marketplace: 'This Kimai marketplace is the central location to find plugins, developer and commercial support for Kimai.' -store-buy-support: 'By buying a Kimai plugin or app you support the developer and our community.' -store-buy-karma: 'And did you know that supporting open source software is good for your karma? 😄' store-contribute-title: 'Contribute' store-contribute-subtitle: 'Are you a developer? Read how to' store-contribute-plugin: 'create a new plugin' @@ -58,7 +54,7 @@ installation: 'Installation' updates: 'Updates' username: 'Username' password: 'Parola' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -82,7 +78,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -110,7 +106,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: 'User' @@ -301,5 +297,5 @@ install: developer: kevinpapst: intro: 'Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development.' -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/uk/translation.yml b/_data/uk/translation.yml index ef7931df9..2c4941936 100644 --- a/_data/uk/translation.yml +++ b/_data/uk/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Зроблено на' store: 'Магазин' access-demo: 'Демонстраційний доступ' docu-alert-english: 'Вміст доступний лише англійською мовою' -store-buy-title: 'Купіть застосунки Kimai' -store-buy-marketplace: 'Маркетплейс Kimai — це центральне місце, де можна знайти розширення, розробника та платну підтримку Kimai.' -store-buy-support: 'Купуючи плаґін чи застосунок Kimai, Ви підтримуєте розробника та нашу спільноту.' -store-buy-karma: 'Чи знали Ви, що підтримка програмного забезпечення з відкритим кодом корисна для вашої карми? 😄' store-contribute-title: 'Зробити внесок' store-contribute-subtitle: 'Ви розробник? Прочитайте, як' store-contribute-plugin: 'зробити нове розширення' @@ -78,7 +74,7 @@ newsletter: email-help: Надайте свою ел.адресу для підписки. field-required: Це поле не можна залишати порожнім. captcha-help: Вибачте за капчу, — ми знаємо, що вона дратує! - sendinblue: В якості маркетингової платформи ми використовуємо Sendinblue. Натискаючи нижче для надсилання цієї форми, Ви погоджуєтеся, що надана Вами інформація буде передана Sendinblue для обробки, з огляду на їх %terms% + sendinblue: В якості маркетингової платформи ми використовуємо Sendinblue. Натискаючи нижче для надсилання цієї форми, Ви погоджуєтеся, що надана Вами інформація буде передана Brevo для обробки, з огляду на їх %terms% terms: умови використання button: ПІДПИСАТИСЯ introduction: Підпишіться на нашу розсилку і будьте в курсі оновлень Kimai та плагінів. diff --git a/_data/vi/translation.yml b/_data/vi/translation.yml index 6b4f4b34c..8aa4cb207 100644 --- a/_data/vi/translation.yml +++ b/_data/vi/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Phát triển tại' store: 'Cửa hàng' access-demo: 'Truy cập bản demo' docu-alert-english: 'Nội dung chỉ có sẵn bằng Tiếng Anh' -store-buy-title: 'Mua ứng dụng Kimai' -store-buy-marketplace: 'Chợ Kimai là vị trí trung tâm để tìm các plugin, nhà phát triển và hỗ trợ thương mại cho Kimai.' -store-buy-support: 'Bằng cách mua plugin hoặc ứng dụng Kimai, bạn hỗ trợ nhà phát triển và cộng đồng của chúng tôi.' -store-buy-karma: 'Và bạn có biết rằng hỗ trợ phần mềm mã nguồn mở là tốt cho nghiệp của bạn không? 😄' store-contribute-title: 'Đóng góp' store-contribute-subtitle: 'Bạn có phải là một nhà phát triển? Đọc để biết cách' store-contribute-plugin: 'tạo một plugin mới' @@ -266,7 +262,7 @@ newsletter: field-invalid: The information provided is invalid. Please review the format and try again. field-required: This field cannot be left blank. captcha-help: Very sorry for the Captcha, we know it's annoying! - sendinblue: We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms% + sendinblue: We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms% terms: terms of use button: SUBSCRIBE title: Newsletter @@ -276,7 +272,7 @@ demo: title: Test Kimai in one of the demos introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides. - reinstall: Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export). + reinstall: Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. user: Demo user role_teamlead: Teamlead role_super: Super-Admin @@ -289,5 +285,5 @@ developer: kevinpapst: intro: Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development. price-contract: Upon request -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_data/zh_Hans/translation.yml b/_data/zh_Hans/translation.yml index 919dacdcb..5f1ea55b7 100644 --- a/_data/zh_Hans/translation.yml +++ b/_data/zh_Hans/translation.yml @@ -3,10 +3,6 @@ developed-at: '开发于' store: '商店' access-demo: '访问演示' docu-alert-english: '内容仅以英文提供' -store-buy-title: '购买 Kimai 应用' -store-buy-marketplace: '这个 Kimai 市场是为 Kimai 寻找插件、开发人员和商业支持的中心位置。' -store-buy-support: '通过购买 Kimai 插件或应用程序，您可以支持开发人员和我们的社区。' -store-buy-karma: '你知道支持开源软件对你的业力有好处吗？ 😄' store-contribute-title: '贡献' store-contribute-subtitle: '您是开发人员吗？阅读如何' store-contribute-plugin: '创建一个新插件' @@ -78,7 +74,7 @@ newsletter: email-help: 提供您的电子邮件地址以进行订阅。 field-required: 此字段不能留空。 captcha-help: 对于验证码，我们深表歉意，我们知道这很烦人！ - sendinblue: 我们使用 Sendinblue 作为我们的营销平台。单击下方提交此表格，即表示您承认您提供的信息将根据其 %terms% 转移到 Sendinblue 进行处理 + sendinblue: 我们使用 Brevo 作为我们的营销平台。单击下方提交此表格，即表示您承认您提供的信息将根据其 %terms% 转移到 Brevo 进行处理 terms: 使用条款 introduction: 订阅我们的时事通讯并随时了解 Kimai 和插件更新。 email-title: 您的电子邮件地址 diff --git a/_data/zh_Hant/translation.yml b/_data/zh_Hant/translation.yml index 3b59ad3ae..053714e56 100644 --- a/_data/zh_Hant/translation.yml +++ b/_data/zh_Hant/translation.yml @@ -3,10 +3,6 @@ developed-at: 'Developed at' store: 'Marketplace' access-demo: 'Access demo' docu-alert-english: 'Content is only available in English' -store-buy-title: 'Buy Kimai apps' -store-buy-marketplace: 'This Kimai marketplace is the central location to find plugins, developer and commercial support for Kimai.' -store-buy-support: 'By buying a Kimai plugin or app you support the developer and our community.' -store-buy-karma: 'And did you know that supporting open source software is good for your karma? 😄' store-contribute-title: 'Contribute' store-contribute-subtitle: 'Are you a developer? Read how to' store-contribute-plugin: 'create a new plugin' @@ -58,7 +54,7 @@ installation: 'Installation' updates: 'Updates' username: 'Username' password: '密碼' -try-it: 'Try it' +try-it: 'Demo' plugin-demo-at: 'You can test this plugin at' plugin-demo-accounts: 'Find more test accounts here' read-more: 'Read more' @@ -82,7 +78,7 @@ newsletter: field-invalid: 'The information provided is invalid. Please review the format and try again.' field-required: 'This field cannot be left blank.' captcha-help: 'Very sorry for the Captcha, we know it''s annoying!' - sendinblue: 'We use Sendinblue as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Sendinblue for processing in accordance with their %terms%' + sendinblue: 'We use Brevo as our marketing platform. By Clicking below to submit this form, you acknowledge that the information you provided will be transferred to Brevo for processing in accordance with their %terms%' terms: 'terms of use' button: 'SUBSCRIBE' photos: @@ -110,7 +106,7 @@ demo: title: 'Test Kimai in one of the demos' introduction: "Try out the Kimai time-tracking demo, and we promise: you'll keep on using it!" choose: 'Please choose one of our demo installations, to get a first impression on how Kimai feels and which functionality it provides.' - reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed. But for your convenience, most are pre-filled with test data, so you can directly start testing features (like invoice or export).' + reinstall: 'Be aware that the demos will be reinstalled on a regular schedule and all entered data will be removed.' user: 'Demo user' accounts: "These accounts are available for your tests. Or you create your own test user in the login form of each demo." role_user: 'User' @@ -301,5 +297,5 @@ install: developer: kevinpapst: intro: 'Project maintainer and core developer since 2007. Wants to make Kimai the best open-source time-tracker of the world. Can be hired for support, installations and custom plugin development.' -full-documentation: Full documentation available here (in English only). +full-documentation: Full documentation in English contact-developer: If you have any question, please use the following contact information to get in touch with the developer directly. diff --git a/_docu_versioned/1.14/fresh-ubuntu-18.md b/_docu_versioned/1.14/fresh-ubuntu-18.md index afdbc62d5..835e5922e 100644 --- a/_docu_versioned/1.14/fresh-ubuntu-18.md +++ b/_docu_versioned/1.14/fresh-ubuntu-18.md @@ -164,7 +164,7 @@ bin/console kimai:install -n bin/console kimai:create-user admin admin@example.com ROLE_SUPER_ADMIN ``` -{% include file-permissions.html %} +{% include documentation/file-permissions.html %} Use `sudo` to run the commands to change file permissions. diff --git a/_docu_versioned/1.14/fresh-ubuntu-20.md b/_docu_versioned/1.14/fresh-ubuntu-20.md index 5143995f8..c2e5b9521 100644 --- a/_docu_versioned/1.14/fresh-ubuntu-20.md +++ b/_docu_versioned/1.14/fresh-ubuntu-20.md @@ -159,7 +159,7 @@ bin/console kimai:install -n bin/console kimai:create-user admin admin@example.com ROLE_SUPER_ADMIN ``` -{% include file-permissions.html %} +{% include documentation/file-permissions.html %} Use `sudo` to run the commands to change file permissions. ## Configure webserver diff --git a/_docu_versioned/1.14/installation.md b/_docu_versioned/1.14/installation.md index 13a503d75..38ecdcd38 100644 --- a/_docu_versioned/1.14/installation.md +++ b/_docu_versioned/1.14/installation.md @@ -46,7 +46,7 @@ Windows users might have to prefix the composer and installation commands with ` The webserver needs write permissions for several directories, so make sure the [file permissions are correct](https://symfony.com/doc/current/setup/file_permissions.html). -{% include file-permissions.html %} +{% include documentation/file-permissions.html %} ### Create your first user diff --git a/_docu_versioned/1.14/invoices.md b/_docu_versioned/1.14/invoices.md index ebdf9add4..6456eb58c 100644 --- a/_docu_versioned/1.14/invoices.md +++ b/_docu_versioned/1.14/invoices.md @@ -38,7 +38,7 @@ Characters outside the replacer may **not** include `{` and `}`. {% assign additional_chars = additional_chars| markdownify %} {% include alert.html icon="fas fa-exclamation" type="warning" alert=additional_chars %} -To change the format, look out for the {% include demo-action-button.html icon="fas fa-cog" %} icon in the invoice screen, or change it from the `System configurations`. +To change the format, look out for the {% include demo-action-button.html icon="bx bx-cog" %} icon in the invoice screen, or change it from the `System configurations`. ### Incrementing the invoice counter diff --git a/_docu_versioned/1.15/invoices.md b/_docu_versioned/1.15/invoices.md index b2de2859d..86f29fc01 100644 --- a/_docu_versioned/1.15/invoices.md +++ b/_docu_versioned/1.15/invoices.md @@ -46,7 +46,7 @@ Characters outside the replacer **cannot** include `{` and `}`. {% assign additional_chars = additional_chars| markdownify %} {% include alert.html icon="fas fa-exclamation" type="warning" alert=additional_chars %} -To change the format, look out for the {% include demo-action-button.html icon="fas fa-cog" %} icon in the invoice screen, or change it from the `System configurations`. +To change the format, look out for the {% include demo-action-button.html icon="bx bx-cog" %} icon in the invoice screen, or change it from the `System configurations`. ### Incrementing the invoice counter diff --git a/_docu_versioned/1.30.0/activity.md b/_docu_versioned/1.30.0/activity.md index deae156fa..34ff65e74 100644 --- a/_docu_versioned/1.30.0/activity.md +++ b/_docu_versioned/1.30.0/activity.md @@ -97,4 +97,4 @@ Besides these filters, you can query for a free search term, which will be searc - `name` - `comment` -{% include search-custom-field.md %} +{% include documentation/search-custom-field.md %} diff --git a/_docu_versioned/1.30.0/customer.md b/_docu_versioned/1.30.0/customer.md index a632aad3a..ea8b1856a 100644 --- a/_docu_versioned/1.30.0/customer.md +++ b/_docu_versioned/1.30.0/customer.md @@ -76,4 +76,4 @@ Besides these filters, you can query for a free search term, which will be searc - `phone` - `address` -{% include search-custom-field.md %} +{% include documentation/search-custom-field.md %} diff --git a/_docu_versioned/1.30.0/project.md b/_docu_versioned/1.30.0/project.md index a3ce31e2d..c62b1cc99 100644 --- a/_docu_versioned/1.30.0/project.md +++ b/_docu_versioned/1.30.0/project.md @@ -75,4 +75,4 @@ Besides these filters, you can query for a free search term, which will be searc - `comment` - `orderNumber` -{% include search-custom-field.md %} +{% include documentation/search-custom-field.md %} diff --git a/_docu_versioned/1.30.0/users.md b/_docu_versioned/1.30.0/users.md index bec6d0b48..54b53384e 100644 --- a/_docu_versioned/1.30.0/users.md +++ b/_docu_versioned/1.30.0/users.md @@ -37,7 +37,7 @@ Besides these filters, you can query for a free search term, which will be searc - `title` - `email` -{% include search-custom-field.md %} +{% include documentation/search-custom-field.md %} ## User registration diff --git a/_docu_versioned/1.8/invoices.md b/_docu_versioned/1.8/invoices.md index b27ebcd6d..e147fbefc 100644 --- a/_docu_versioned/1.8/invoices.md +++ b/_docu_versioned/1.8/invoices.md @@ -49,7 +49,7 @@ Characters outside the replacer **cannot** include `{` and `}`. {% assign additional_chars = additional_chars| markdownify %} {% include alert.html icon="fas fa-exclamation" type="warning" alert=additional_chars %} -To change the format, look out for the {% include demo-action-button.html icon="fas fa-cog" %} icon in the invoice screen, or change it from the `System configurations`. +To change the format, look out for the {% include demo-action-button.html icon="bx bx-cog" %} icon in the invoice screen, or change it from the `System configurations`. ### Incrementing the invoice counter diff --git a/_documentation/activity.md b/_documentation/activity.md index 03011be98..e780ec25f 100644 --- a/_documentation/activity.md +++ b/_documentation/activity.md @@ -96,7 +96,7 @@ Besides these filters, you can query for a free search term, which will be searc - `name` - `comment` -{% include search-custom-field.md %} +{% include documentation/search-custom-field.md %} ## Deleting an activity diff --git a/_documentation/backups.md b/_documentation/backups.md index 223dab058..c63dd0683 100644 --- a/_documentation/backups.md +++ b/_documentation/backups.md @@ -51,7 +51,7 @@ At this step: test Kimai again and don't proceed before it works as expected! Working properly? If not, check your file permissions: -{% include file-permissions.html %} +{% include documentation/file-permissions.html %} Working now? Fine, then go ahead and restore all other files: diff --git a/_documentation/cache.md b/_documentation/cache.md index 7ca3637bf..e3933acf2 100644 --- a/_documentation/cache.md +++ b/_documentation/cache.md @@ -24,7 +24,7 @@ read the [Installation docs]({% link _documentation/installation.md %}) for more Depending on your setup and the way you call the cache command, you have to fix directory permissions afterwards. -{% include file-permissions.html %} +{% include documentation/file-permissions.html %} ### Troubleshooting diff --git a/_documentation/chapter-manual.md b/_documentation/chapter-manual.md index 4581aac3b..51a886518 100644 --- a/_documentation/chapter-manual.md +++ b/_documentation/chapter-manual.md @@ -7,6 +7,6 @@ redirect_from: ---
-{% include docs-menu-card.html navigation=site.data.menu-documentation.manual %} +{% include docs-menu-card.html navigation="manual" %}
diff --git a/_documentation/chapter-on-premise.md b/_documentation/chapter-on-premise.md index dd492d09a..1014877cd 100644 --- a/_documentation/chapter-on-premise.md +++ b/_documentation/chapter-on-premise.md @@ -5,5 +5,5 @@ toc: false ---
-{% include docs-menu-card.html navigation=site.data.menu-documentation.on-premise %} +{% include docs-menu-card.html navigation="on-premise" %}
diff --git a/_documentation/customer.md b/_documentation/customer.md index 55ceaae92..264903aae 100644 --- a/_documentation/customer.md +++ b/_documentation/customer.md @@ -75,7 +75,7 @@ Besides these filters, you can query for a free search term, which will be searc - `phone` - `address` -{% include search-custom-field.md %} +{% include documentation/search-custom-field.md %} ## Deleting a customer diff --git a/_documentation/dashboard.md b/_documentation/dashboard.md index 37fe504e8..b3ac1331c 100644 --- a/_documentation/dashboard.md +++ b/_documentation/dashboard.md @@ -7,8 +7,8 @@ toc: false The Kimai dashboard displays (so called) `widgets`. The ones shipped by default can be changed, re-ordered or completely removed. -Since Kimai version 2 the dashboard can be configured directly in the frontend and every user can have his own set of widgets. +The dashboard can be configured directly by the user via the frontend, every user can have an own set of widgets. -Each widget can have its own set of required permissions, so different user roles see different widgets. +Some widget might require certain permissions to access the data, so different user roles see different widgets. -Upon clicking the {% include demo-action-button.html icon="fas fa-cog" title="Preferences" %} button in the top right corner, you can configure the dashboard. +Upon clicking the {% include demo-action-button.html icon="bx bx-cog" title="Preferences" %} button in the top right corner, you can configure the dashboard. diff --git a/_documentation/developers.md b/_documentation/developers.md index de7c6bfb9..8ec0b0ad2 100644 --- a/_documentation/developers.md +++ b/_documentation/developers.md @@ -8,6 +8,7 @@ redirect_from: - /documentation/developer/index.html - /documentation/developer/ - /v1/developer.html + - /documentation/impersonate-user.html --- This page is for all developers who want to contribute to Kimai. You rock! diff --git a/_documentation/export.md b/_documentation/export.md index 86fd494ae..2457a8014 100644 --- a/_documentation/export.md +++ b/_documentation/export.md @@ -68,8 +68,8 @@ Internally for each template a new ExportRenderer service is registered, called ### PDF Templates -{% include pdf-templates.md %} - +{% include documentation/pdf-templates.md %} + #### Custom fields You can access custom fields with: diff --git a/_documentation/fresh-ubuntu-18.md b/_documentation/fresh-ubuntu-18.md index eeb624bf4..3ab2a6732 100644 --- a/_documentation/fresh-ubuntu-18.md +++ b/_documentation/fresh-ubuntu-18.md @@ -168,7 +168,7 @@ bin/console kimai:install -n bin/console kimai:user:create admin admin@example.com ROLE_SUPER_ADMIN ``` -{% include file-permissions.html %} +{% include documentation/file-permissions.html %} Use `sudo` to run the commands to change file permissions. diff --git a/_documentation/fresh-ubuntu-20.md b/_documentation/fresh-ubuntu-20.md index 420cc9ba4..4adc18589 100644 --- a/_documentation/fresh-ubuntu-20.md +++ b/_documentation/fresh-ubuntu-20.md @@ -176,7 +176,7 @@ bin/console kimai:install -n bin/console kimai:user:create admin admin@example.com ROLE_SUPER_ADMIN ``` -{% include file-permissions.html %} +{% include documentation/file-permissions.html %} Use `sudo` to run the commands to change file permissions. ## Configure webserver diff --git a/_documentation/fresh-ubuntu-22.md b/_documentation/fresh-ubuntu-22.md index 7261349fa..db8154541 100644 --- a/_documentation/fresh-ubuntu-22.md +++ b/_documentation/fresh-ubuntu-22.md @@ -172,7 +172,7 @@ bin/console kimai:install -n bin/console kimai:user:create admin admin@example.com ROLE_SUPER_ADMIN ``` -{% include file-permissions.html %} +{% include documentation/file-permissions.html %} Use `sudo` to run the commands to change file permissions. ## Configure webserver diff --git a/_documentation/i18n-am-pm.md b/_documentation/i18n-am-pm.md index 1b43b108c..6a1e0e4bb 100644 --- a/_documentation/i18n-am-pm.md +++ b/_documentation/i18n-am-pm.md @@ -1,6 +1,6 @@ --- -title: "Switch to AM/PM" -description: Using AM/PM instead of 24h-format +title: "Date and Time formats" +description: How times, dates and money is rendered in Kimai and exports toc: false --- diff --git a/_documentation/impersonate-user.md b/_documentation/impersonate-user.md deleted file mode 100644 index d125cbe0a..000000000 --- a/_documentation/impersonate-user.md +++ /dev/null @@ -1,67 +0,0 @@ ---- -title: Impersonate a user -navigation: Switch account -description: How to impersonate a user and test permissions ---- - -When working on [user roles]({% link _documentation/users.md %}), [permissions]({% link _documentation/permissions.md %}) or -[teams]({% link _documentation/teams.md %}), you might want to test the outcome without creating new users. - -This can be done by `impersonating` a user, which means you switch to a real existing account. - -As this feature is potentially dangerous, it is deactivated and needs configuration file changes to activate it. - -## Activate - -You need to adjust the application firewall and user role settings. Open the file `config/packages/security.yaml` and -add the following line to the `secured_area` firewall: -``` -switch_user: true -``` - -It must look like this: - -```yaml -security: - # ... - firewalls: - dev: - # ... - secured_area: - # ... - switch_user: true - # ... -``` - -This activates the feature. Now adjust the super admin role, so it has the special role `ROLE_ALLOWED_TO_SWITCH`: - -```yaml -security: - # ... - role_hierarchy: - ROLE_SUPER_ADMIN: [ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH] -``` - -Finally refresh your cache: -{% include cache-refresh.html %} - -To switch to another user, add a query string with the `_switch_user` parameter and the username as the value to the current URL (you must -be logged-in as a super admin to use this feature): - -``` -https://example.com/en/dashboard/?_switch_user=anna_admin -``` - -To switch back to the original user, use the special `_exit` username: - -``` -https://example.com/en/dashboard/?_switch_user=_exit -``` - -To deactivate the feature again, simply revert your config changes and refresh the application cache again: - -{% include cache-refresh.html %} - -## See also - -- [Symfony documentation](https://symfony.com/doc/current/security/impersonating_user.html) diff --git a/_documentation/installation.md b/_documentation/installation.md index 6a22d6b7e..243d6a633 100644 --- a/_documentation/installation.md +++ b/_documentation/installation.md @@ -53,7 +53,7 @@ Windows users might have to prefix the composer and installation commands with ` The webserver needs write permissions for several directories, so make sure the [file permissions are correct](https://symfony.com/doc/current/setup/file_permissions.html). -{% include file-permissions.html %} +{% include documentation/file-permissions.html %} ### Create your first user diff --git a/_documentation/invoices.md b/_documentation/invoices.md index df9d038a2..172d37462 100644 --- a/_documentation/invoices.md +++ b/_documentation/invoices.md @@ -313,7 +313,7 @@ There are some additional contents, that will define e.g. page header and footer Please read the MPdf documentation and check the default PDF templates. -{% include pdf-templates.md %} +{% include documentation/pdf-templates.md %} ### Docx templates @@ -554,4 +554,4 @@ Besides these filters, you can query for a free search term, which will be searc - `customer name` - `customer company` -{% include search-custom-field.md %} +{% include documentation/search-custom-field.md %} diff --git a/_documentation/meta-fields.md b/_documentation/meta-fields.md index 59411054c..9970188cb 100644 --- a/_documentation/meta-fields.md +++ b/_documentation/meta-fields.md @@ -75,52 +75,48 @@ class MetaFieldSubscriber implements EventSubscriberInterface ]; } - public function loadTimesheetMeta(TimesheetMetaDefinitionEvent $event) + public function loadTimesheetMeta(TimesheetMetaDefinitionEvent $event): void { $this->prepareEntity($event->getEntity(), new TimesheetMeta()); } - public function loadCustomerMeta(CustomerMetaDefinitionEvent $event) + public function loadCustomerMeta(CustomerMetaDefinitionEvent $event): void { $this->prepareEntity($event->getEntity(), new CustomerMeta()); } - public function loadProjectMeta(ProjectMetaDefinitionEvent $event) + public function loadProjectMeta(ProjectMetaDefinitionEvent $event): void { $this->prepareEntity($event->getEntity(), new ProjectMeta()); } - public function loadActivityMeta(ActivityMetaDefinitionEvent $event) + public function loadActivityMeta(ActivityMetaDefinitionEvent $event): void { $this->prepareEntity($event->getEntity(), new ActivityMeta()); } - public function loadInvoiceMeta(InvoiceMetaDefinitionEvent $event) + public function loadInvoiceMeta(InvoiceMetaDefinitionEvent $event): void { $this->prepareEntity($event->getEntity(), new InvoiceMeta()); } - private function prepareEntity(EntityWithMetaFields $entity, MetaTableTypeInterface $definition) + private function prepareEntity(EntityWithMetaFields $entity, MetaTableTypeInterface $definition): void { - $definition - ->setLabel('Working place') - ->setOptions(['help' => 'Enter the place you work from here']) - ->setName('location') - ->setType(TextType::class) - ->addConstraint(new Length(['max' => 255])) - ->setIsVisible(true); + $definition->setLabel('Working place'); + $definition->setOptions(['help' => 'Enter the place you work from here']); + $definition->setName('location'); + $definition->setType(TextType::class); + $definition->addConstraint(new Length(['max' => 255])); + $definition->setIsVisible(true); $entity->setMetaField($definition); } } ``` -Attention: `setLabel()` and `setOptions()` will be added with 1.4. +### Display and export custom fields -### Displaying and exporting custom fields - -With Kimai 1.4 you can display and export custom fields. -Supported fields will be shown as new columns in the data-tables for timesheets, customers, projects and activities. +Custom-fields can be shown as new columns in the data-tables for timesheets, customers, projects and activities. Additionally, these fields will be added to HTML and Spreadsheet exports. As Kimai cannot query all existing records for possible custom fields, you need to listen to new events and @@ -153,32 +149,31 @@ class MetaFieldDisplaySubscriber implements EventSubscriberInterface ]; } - public function loadTimesheetField(TimesheetMetaDisplayEvent $event) + public function loadTimesheetField(TimesheetMetaDisplayEvent $event): void { $event->addField($this->prepareField(new TimesheetMeta())); } - public function loadCustomerField(CustomerMetaDisplayEvent $event) + public function loadCustomerField(CustomerMetaDisplayEvent $event): void { $event->addField($this->prepareField(new CustomerMeta())); } - public function loadProjectField(ProjectMetaDisplayEvent $event) + public function loadProjectField(ProjectMetaDisplayEvent $event): void { $event->addField($this->prepareField(new ProjectMeta())); } - public function loadActivityField(ActivityMetaDisplayEvent $event) + public function loadActivityField(ActivityMetaDisplayEvent $event): void { $event->addField($this->prepareField(new ActivityMeta())); } - private function prepareField(MetaTableTypeInterface $definition) + private function prepareField(MetaTableTypeInterface $definition): MetaTableTypeInterface { - $definition - ->setLabel('Working place') - ->setName('location') - ->setType(TextType::class); + $definition->setLabel('Working place'); + $definition->setName('location'); + $definition->setType(TextType::class); return $definition; } diff --git a/_documentation/permission-structure.md b/_documentation/permission-structure.md index 31631ade7..30a168aae 100644 --- a/_documentation/permission-structure.md +++ b/_documentation/permission-structure.md @@ -14,9 +14,9 @@ It can be considered bad practice, as it can lead to problems with future update Developer can add/change permissions through plugins, see [Developers documentation]({% link _documentation/developers.md %}). -### Understanding permission structure +## How the config works -Before you learn to configure the permission system, you have to understand the three involved config types: +The Kimai configuration contains the entire permission configuration, which consists of the three types: 1. Permission `sets` - a re-usable mapping of a name (e.g. `FOO`) to an array of "permission names" (e.g. `bar`) 2. Permission `maps` - mappings of role names to an array of "permission sets" (e.g. `FOO`) @@ -55,7 +55,7 @@ At the end the system calculated the final list of permissions: - `ROLE_USER` - view_own_timesheet, start_own_timesheet, view_activity, create_activity, my_profile - `ROLE_ADMIN` - view_own_timesheet, start_own_timesheet, view_activity, create_activity, my_profile, show_roles, other_profiles, delete_activity -### Existing sets +## Existing sets Existing sets can be seen in `kimai.yaml`, their customization is generally not necessary. You cannot extend existing sets, if you define them, they will be overwritten with your config. diff --git a/_documentation/plugin-expenses.md b/_documentation/plugin-expenses.md index a076c7f8e..ebf148c46 100644 --- a/_documentation/plugin-expenses.md +++ b/_documentation/plugin-expenses.md @@ -37,7 +37,7 @@ The search supports filtering by the fields: The free search term will query the field: - `description` -{% include search-custom-field.md %} +{% include documentation/search-custom-field.md %} ## Permissions diff --git a/_documentation/plugin-management.md b/_documentation/plugin-management.md index dad70070a..35910d2ef 100644 --- a/_documentation/plugin-management.md +++ b/_documentation/plugin-management.md @@ -43,4 +43,4 @@ There are three main reasons, why you might experience a 500 error after plugin {% include cache-refresh.html %} Depending on your setup, the cache flush will create directories which cannot be written by your webserver: -{% include file-permissions.html %} +{% include documentation/file-permissions.html %} diff --git a/_documentation/project.md b/_documentation/project.md index c8c068379..2a3768844 100644 --- a/_documentation/project.md +++ b/_documentation/project.md @@ -78,7 +78,7 @@ Besides these filters, you can query for a free search term, which will be searc - `comment` - `orderNumber` -{% include search-custom-field.md %} +{% include documentation/search-custom-field.md %} ## Deleting a project diff --git a/_documentation/store.md b/_documentation/store.md index 7018819e1..e188a483d 100644 --- a/_documentation/store.md +++ b/_documentation/store.md @@ -49,7 +49,7 @@ items: ``` 5. Run `php translate-pages.php`. This will extract your content into an include and then create a store page for every language. -### Developer information +## Developer information The information about yourself or your company comes from the [developer.yml file]({{ site.kimai_v2_website }}/tree/main/_data/developer.yml). @@ -73,10 +73,10 @@ kevinpapst: image: https://avatars1.githubusercontent.com/u/533162?s=460&v=4 homepage: https://www.kevinpapst.de github: https://github.com/kevinpapst - twitter: http://twitter.com/keleo + twitter: https://twitter.com/keleo ``` -### Product information +## Product information Create a new markdown file in the [_store directory]({{ site.kimai_v2_website }}/tree/main/_store/), follow the filename pattern: `company-short-descriptive-name.md` diff --git a/_documentation/timesheet.md b/_documentation/timesheet.md index 21bd76fb1..120511040 100644 --- a/_documentation/timesheet.md +++ b/_documentation/timesheet.md @@ -88,4 +88,4 @@ The search supports filtering by the fields: Besides these filters, you can query for a free search term, which will be searched in the fields: - `description` -{% include search-custom-field.md %} +{% include documentation/search-custom-field.md %} diff --git a/_documentation/translations.md b/_documentation/translations.md index 622ada2de..92232fc47 100644 --- a/_documentation/translations.md +++ b/_documentation/translations.md @@ -10,24 +10,25 @@ redirect_from: Kimai can be localized to any language and is already translated to {% include features/multi-language.md %} -Feel free to send your self-made language files or contributing to the weblate project below – we’re looking for translators and would appreciate your support! +Please be invited to contribute to the Kimai translations – we’re looking for translators and would appreciate your support! +You find the translations at [https://hosted.weblate.org/projects/kimai/](https://hosted.weblate.org/projects/kimai/) and can start translating right away. +You can also click the little image in the table below for your language. Thank you for your help 👍🏻 + | Language | Status | |------------------------|-------------------------------------------------------------------------------------------------------------------------------------------| {%- for locale in site.data.multi-language %} | {{ locale[1] }} | [![Translation status](https://hosted.weblate.org/widgets/kimai/{{ locale[0] }}/svg-badge.svg)](https://hosted.weblate.org/engage/kimai/{{ locale[0] }}/) | {%- endfor %} {: .table } - + All translations in Kimai are managed at Weblate and should be changed there exclusively! Do not chang ethe source files of Kimai. If you want to change certain keys in your installation, you can use the [Translation plugin]({% link _store/keleo-translation-bundle.md %}) for that. -## Developer - -The following documentation is not meant for end-users or translators. It is a technical documentation for the folks working on the Kimai code. +{% include alert.html type="info" alert="The following documentation is not meant for end-users or translators. It is a technical documentation for the folks working on the Kimai code." %} -### Language files +## Language files We try to separate translations in logical units, in order to make it easier to identify the location of application messages. @@ -58,14 +59,14 @@ If you apply changes to any files mentioned on this page, you have to [clear the {% assign cache = cache|markdownify %} {% include alert.html type="danger" alert=cache %} -### Authentication screens +## Authentication screens The authentication screens (login, registration, register account) are translated through the theme bundle which is used in Kimai. The bundle can be [found here](https://github.com/kevinpapst/TablerBundle) and the translations [in this directory](https://github.com/kevinpapst/TablerBundle/tree/main/translations). When you create a new translation, please open a Pull Request in this repository as well. -### Adding a new language +## Adding a new language This example assumes you are creating the (not existing) locale `xx`. @@ -76,7 +77,7 @@ Adjust the `target-language` attributes in the file header, as example for the n ` ``` -### Adding a language variant +## Adding a language variant For a language variant `xx_YY`, the fallback will always be the base language `xx` (eg. `de` for `de_CH`). @@ -96,7 +97,7 @@ Only some specific keys may need to be changed for this variant, and it's possib ``` -### Configure locale formats +## Configure locale formats Locale formats are derived from the file `config/locales.php` which is auto-generated with the command: @@ -104,7 +105,7 @@ Locale formats are derived from the file `config/locales.php` which is auto-gene bin/console kimai:reset:locales ``` -### Register locale +## Register locale You need to activate a new locale (so it can be used in routing) in the file `config/services.yaml` at `parameters.app_locales` divided by a pipe: @@ -114,21 +115,21 @@ parameters: app_locales: en|de|fr|ru|vi|zh_CN ``` -### Number formats +## Number formats The number formats are determined from the user locale. -### Date and time formats +## Date and time formats The date and time formats are determined from the user locale. There are configurations in place to convert between javascript components (e.g. the date-picker) and the PHP backend. -### AM/PM format +## AM/PM format Whether Kimai displays data in 24 hour or AM/PM format depends on the user locale. -### Generate correct ID and resname +## Generate correct ID and resname Run the following command, which will generate the correct XLIFF attributes for you: @@ -136,7 +137,7 @@ Run the following command, which will generate the correct XLIFF attributes for bin/console kimai:translation --resname ``` -### Validate your changes +## Validate your changes This will validate if the technical changes are okay / if the changed and new files can be used by Kimai: @@ -144,7 +145,7 @@ This will validate if the technical changes are okay / if the changed and new fi bin/console lint:xliff translations ``` -### Check for missing translations +## Check for missing translations You can search for missing keys by issuing this command (replace `xx` with your locale): ```bash diff --git a/_documentation/updates.md b/_documentation/updates.md index 32ccf5877..56ddebdc7 100644 --- a/_documentation/updates.md +++ b/_documentation/updates.md @@ -46,7 +46,7 @@ bin/console kimai:update ``` Remember to adjust the file permissions if necessary. -{% include file-permissions.html %} +{% include documentation/file-permissions.html %} {% include upgrading-note.html %} diff --git a/_documentation/users.md b/_documentation/users.md index 82218a03b..0830b4293 100644 --- a/_documentation/users.md +++ b/_documentation/users.md @@ -63,7 +63,7 @@ Besides these filters, you can query for a free search term, which will be searc - `title` - `email` -{% include search-custom-field.md %} +{% include documentation/search-custom-field.md %} ## User registration diff --git a/_includes/alert.html b/_includes/alert.html index 6f5a96251..1fb2037de 100644 --- a/_includes/alert.html +++ b/_includes/alert.html @@ -1,20 +1,13 @@ {% assign alertType = include.type | default: 'primary' %} -{% unless alertType contains 'bg-' %} - {% if alertType == 'info' %} - {% assign alertType = 'bg-yellow-lt' %} - {% elsif alertType == 'primary' %} - {% assign alertType = 'bg-blue-lt' %} - {% elsif alertType == 'danger' %} - {% assign alertType = 'bg-red-lt' %} - {% elsif alertType == 'warning' %} - {% assign alertType = 'bg-orange-lt' %} - {% elsif alertType == 'success' %} - {% assign alertType = 'bg-green-lt' %} - {% endif %} -{% endunless %} -