add tailwind theme and css variables to files export, bump ui package version

add direct axios dependency to package, bump package versions
move TimezonMismatchModal to ui package
2026-06-15 13:32:43 +01:00 · 2025-12-09 14:30:39 +01:00 · 2025-12-09 14:16:13 +01:00 · 2025-12-04 17:26:07 +01:00 · 2025-12-03 18:08:00 +01:00 · 2025-12-02 17:52:40 +01:00
590 changed files with 14784 additions and 9958 deletions
--- a/.env.example
+++ b/.env.example
@@ -80,8 +80,7 @@ GOTENBERG_URL=http://gotenberg:3000
 # Local setup
 NGINX_HOST_NAME=solidtime.test
 NETWORK_NAME=reverse-proxy-docker-traefik_routing
-FORWARD_DB_PORT=5432
-FORWARD_WEB_PORT=8083
+FORWARD_DB_PORT=54329
 VITE_HOST_NAME=vite.solidtime.test
 VITE_APP_NAME="${APP_NAME}"
 #SAIL_XDEBUG_MODE=develop,debug,coverage
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,11 @@
-<!--
-This project is early stage. The structure and APIs are still subject to change and not stable.
-Therefore, we do not currently accept any contributions, unless you are a member of the team.
+## What does this PR do?

-As soon as we feel comfortable enough that the application structure is stable enough, we will open up the project for contributions.
+<!-- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. -->

-We do accept contributions in the [documentation repository](https://github.com/solidtime-io/docs) f.e. to add new self-hosting guides.
-->
+- Fixes #XXXX (GitHub issue number)
+
+## Checklist (DO NOT REMOVE)
+
+- [ ] I read the [contributing guide](https://github.com/solidtime-io/solidtime/blob/main/CONTRIBUTING.md)
+- [ ] I signed the [Contributor License Agreement](https://cla-assistant.io/solidtime-io/solidtime).
+- [ ] I commented my code, particularly in hard-to-understand areas
--- a/.github/workflows/build-onpremise.yml
+++ b/.github/workflows/build-onpremise.yml
@@ -0,0 +1,216 @@
+on:
+  push:
+    branches:
+      - main
+      - develop
+    tags:
+      - '*'
+  pull_request:
+    paths:
+      - '.github/workflows/build-onpremise.yml'
+      - 'docker/prod/**'
+  workflow_dispatch:
+
+permissions:
+  packages: write
+  contents: read
+  attestations: write
+  id-token: write
+
+env:
+  DOCKER_REPO: registry.on-premise.solidtime.io/solidtime/solidtime
+
+name: Build - On Premise
+jobs:
+  build:
+    strategy:
+      matrix:
+        include:
+          - runs-on: "ubuntu-24.04-arm"
+            platform: "linux/arm64"
+          - runs-on: "ubuntu-24.04"
+            platform: "linux/amd64"
+    runs-on: ${{ matrix.runs-on }}
+    timeout-minutes: 90
+
+    steps:
+      - name: "Check out code"
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
+
+      - name: "Get build"
+        id: release-build
+        run: echo "build=$(git rev-parse --short=8 HEAD)" >> "$GITHUB_OUTPUT"
+
+      - name: "Get Previous tag (normal push)"
+        id: previoustag
+        if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+        with:
+          prefix: "v"
+
+      - name: "Get version"
+        id: release-version
+        run: |
+          if ${{ !startsWith(github.ref, 'refs/tags/v') }}; then
+            if ${{ startsWith(steps.previoustag.outputs.tag, 'v') }}; then
+              version=$(echo "${{ steps.previoustag.outputs.tag }}" | cut -c 2-)
+              echo "app_version=${version}" >> "$GITHUB_OUTPUT"
+            else
+              echo "ERROR: No previous tag found";
+              exit 1;
+            fi
+          else
+            version=$(echo "${{ github.ref }}" | cut -c 12-)
+            echo "app_version=${version}" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: "Copy .env template for production"
+        run: |
+          cp .env.production .env
+          rm .env.production .env.ci .env.example
+
+      - name: "Add version to .env"
+        run: sed -i 's/APP_VERSION=0.0.0/APP_VERSION=${{ steps.release-version.outputs.app_version }}/g' .env
+
+      - name: "Add build to .env"
+        run: sed -i 's/APP_BUILD=0/APP_BUILD=${{ steps.release-build.outputs.build }}/g' .env
+
+      - name: "Output .env"
+        run: cat .env
+
+      - name: "Setup PHP with PECL extension"
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.3'
+          extensions: mbstring, dom, fileinfo, pgsql
+
+      - name: "Install dependencies"
+        run: composer install --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
+        if: steps.cache-vendor.outputs.cache-hit != 'true' # Skip if cache hit
+
+      - name: "Use Node.js"
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+
+      - name: "Checkout invoicing extension"
+        uses: actions/checkout@v4
+        with:
+          repository: solidtime-io/extension-invoicing
+          path: extensions/Invoicing
+          ssh-key: ${{ secrets.SSH_PRIVATE_KEY_INVOICING_EXTENSION }}
+
+      - name: "Install composer dependencies in invoicing extension"
+        run: cd extensions/Invoicing && composer install --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
+
+      - name: "Install npm dependencies in invoicing extension"
+        run: cd extensions/Invoicing && npm ci
+
+      - name: "Activate invoicing extension"
+        run: php artisan module:enable Invoicing
+
+      - name: "Install npm dependencies"
+        run: npm ci
+
+      - name: "Build"
+        run: npm run build
+
+      - name: "Prepare"
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+
+      - name: "Docker meta"
+        id: "meta"
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.DOCKER_REPO }}
+
+      - name: "Login to solidtime OnPremise Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: registry.on-premise.solidtime.io
+          username: ${{ secrets.ONPREMISE_USERNAME }}
+          password: ${{ secrets.ONPREMISE_TOKEN }}
+
+      - name: "Set up QEMU"
+        uses: docker/setup-qemu-action@v3
+
+      - name: "Set up Docker Buildx"
+        uses: docker/setup-buildx-action@v3
+
+      - name: "Build and push by digest"
+        id: build
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: docker/prod/Dockerfile
+          build-args: |
+            DOCKER_FILES_BASE_PATH=docker/prod/
+          platforms: ${{ matrix.platform }}
+          labels: ${{ steps.meta.outputs.labels }}
+          outputs: type=image,"name=${{ env.DOCKER_REPO }}",push-by-digest=true,name-canonical=true,push=true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: "Export digest"
+        run: |
+          mkdir -p ${{ runner.temp }}/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "${{ runner.temp }}/digests/${digest#sha256:}"
+
+      - name: "Upload digest"
+        uses: actions/upload-artifact@v4
+        with:
+          name: digests-${{ env.PLATFORM_PAIR }}
+          path: ${{ runner.temp }}/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+    needs:
+      - build
+    steps:
+      - name: "Download digests"
+        uses: actions/download-artifact@v4
+        with:
+          path: ${{ runner.temp }}/digests
+          pattern: digests-*
+          merge-multiple: true
+
+      - name: "Login to solidtime OnPremise Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: registry.on-premise.solidtime.io
+          username: ${{ secrets.ONPREMISE_USERNAME }}
+          password: ${{ secrets.ONPREMISE_TOKEN }}
+
+      - name: "Set up Docker Buildx"
+        uses: docker/setup-buildx-action@v3
+
+      - name: "Docker meta"
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.DOCKER_REPO }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+
+      - name: "Create manifest list and push"
+        working-directory: ${{ runner.temp }}/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.DOCKER_REPO }}@sha256:%s ' *)
+
+      - name: "Inspect image"
+        run: |
+          docker buildx imagetools inspect ${{ env.DOCKER_REPO }}:${{ steps.meta.outputs.version }}
--- a/.github/workflows/build-private.yml
+++ b/.github/workflows/build-private.yml
@@ -10,6 +10,8 @@ on:
      - '.github/workflows/build-private.yml'
      - 'docker/prod/**'
  workflow_dispatch:
+permissions:
+  contents: read

 name: Build - Private
 jobs:
@@ -17,6 +19,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 20

+
    steps:
      - name: "Check out code"
        uses: actions/checkout@v4
--- a/.github/workflows/build-public.yml
+++ b/.github/workflows/build-public.yml
@@ -11,6 +11,12 @@ on:
      - 'docker/prod/**'
  workflow_dispatch:

+permissions:
+  packages: write
+  contents: read
+  attestations: write
+  id-token: write
+
 env:
  DOCKERHUB_REPO: solidtime/solidtime
  GHCR_REPO: ghcr.io/solidtime-io/solidtime
@@ -26,11 +32,6 @@ jobs:
          - runs-on: "ubuntu-24.04"
            platform: "linux/amd64"
    runs-on: ${{ matrix.runs-on }}
-    permissions:
-      packages: write
-      contents: read
-      attestations: write
-      id-token: write
    timeout-minutes: 90

    steps:
@@ -163,11 +164,6 @@ jobs:

  merge:
    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-      attestations: write
-      id-token: write
    timeout-minutes: 90
    needs:
      - build
--- a/.github/workflows/generate-api-docs.yml
+++ b/.github/workflows/generate-api-docs.yml
@@ -3,6 +3,9 @@ on:
  push:
    branches:
      - main
+permissions:
+  contents: read
+
 jobs:
  api_docs:
    runs-on: ubuntu-latest
--- a/.github/workflows/npm-build.yml
+++ b/.github/workflows/npm-build.yml
@@ -1,6 +1,8 @@
 name: NPM Build

 on: [push]
+permissions:
+  contents: read

 jobs:
  build:
--- a/.github/workflows/npm-format-check.yml
+++ b/.github/workflows/npm-format-check.yml
@@ -0,0 +1,23 @@
+name: NPM Format Check
+
+on: [push]
+
+jobs:
+  format-check:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v4
+
+      - name: "Use Node.js"
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+
+      - name: "Install npm dependencies"
+        run: npm ci
+
+      - name: "Check code formatting"
+        run: npm run format:check 
--- a/.github/workflows/npm-lint.yml
+++ b/.github/workflows/npm-lint.yml
@@ -1,6 +1,8 @@
 name: NPM Lint

 on: [push]
+permissions:
+  contents: read

 jobs:
  build:
--- a/.github/workflows/npm-publish-api.yml
+++ b/.github/workflows/npm-publish-api.yml
@@ -1,6 +1,8 @@
 name: Publish API package to NPM
 on:
  workflow_dispatch
+permissions:
+  contents: read
 jobs:
  build:
    runs-on: ubuntu-latest
--- a/.github/workflows/npm-publish-ui.yml
+++ b/.github/workflows/npm-publish-ui.yml
@@ -1,6 +1,8 @@
 name: Publish UI package to NPM
 on:
  workflow_dispatch
+permissions:
+  contents: read
 jobs:
  build:
    runs-on: ubuntu-latest
--- a/.github/workflows/npm-typecheck.yml
+++ b/.github/workflows/npm-typecheck.yml
@@ -1,7 +1,8 @@
 name: NPM Typecheck

 on: [push]
-
+permissions:
+  contents: read
 jobs:
  build:
    runs-on: ubuntu-latest
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -1,5 +1,7 @@
 name: Static code analysis (PHPStan)
 on: push
+permissions:
+  contents: read
 jobs:
  phpstan:
    runs-on: ubuntu-latest
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -1,13 +1,18 @@
 name: PHPUnit Tests
 on: push
+permissions:
+  contents: read
 jobs:
  phpunit:
    runs-on: ubuntu-latest
    timeout-minutes: 10
+    strategy:
+      matrix:
+        postgres_version: [ 15, 16, 17 ]

    services:
      pgsql_test:
-        image: postgres:15
+        image: postgres:${{ matrix.postgres_version }}
        env:
          PGPASSWORD: 'root'
          POSTGRES_DB: 'laravel'
@@ -63,7 +68,7 @@ jobs:
        run: php artisan test --stop-on-failure --coverage-text --coverage-clover=coverage.xml

      - name: "Upload coverage reports to Codecov"
-        uses: codecov/codecov-action@v5.4.2
+        uses: codecov/codecov-action@v5.4.3
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
          slug: solidtime-io/solidtime
--- a/.github/workflows/pint.yml
+++ b/.github/workflows/pint.yml
@@ -1,5 +1,7 @@
 name: PHP Linting
 on: push
+permissions:
+  contents: read
 jobs:
  pint:
    runs-on: ubuntu-latest
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -1,5 +1,7 @@
 name: Playwright Tests
 on: [push]
+permissions:
+  contents: read
 jobs:
  test:
    runs-on: ubuntu-latest
--- a/.prettierignore
+++ b/.prettierignore
@@ -0,0 +1,27 @@
+# Ignore build outputs
+node_modules/
+vendor/
+storage/
+bootstrap/cache/
+public/build/
+public/hot/
+
+# Ignore lock files
+package-lock.json
+composer.lock
+
+# Ignore generated files
+*.min.js
+*.min.css
+
+# Ignore test results
+test-results/
+playwright-report/
+
+# Ignore IDE files
+.idea/
+.vscode/
+
+# Ignore OS files
+.DS_Store
+Thumbs.db 
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -3,5 +3,6 @@
    "tabWidth": 4,
    "singleQuote": true,
    "bracketSameLine": true,
-    "quoteProps": "preserve"
+    "quoteProps": "preserve",
+    "printWidth": 100
 }
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,81 @@
+# Contributing to solidtime
+
+Contributions are greatly apprecited, please make sure to read the rules and vision for solidtime before contributing. 
+
+## Rules
+
+### Issues for Bugs, Discussions for Feature requests
+
+In order to keep the issues of the repository clean we decided to only use them for bugs. Feature Requests and enhancement are handled in discussions. This also helps us to see which feature requests are popular as they can be upvoted. 
+
+### Only work on approved issues
+
+To respect your time and help us manage contributions effectively, please open an issue or start a discussion and wait for approval before submitting a pull request (PR). This does not apply to tiny fixes or changes however, please keep in mind that we might not merge PRs for various reasons. 
+
+### Contributor License Agreement
+
+You'll also notice that we’ve set up a [Contributor License Agreement (CLA)](https://cla-assistant.io/solidtime-io/solidtime), which must be signed before any PR can be merged. Don’t worry - the process is quick and only takes a few clicks.
+
+We want to be transparent about why we require the CLA and what it means for your contributions and the codebase. That’s why we’ve written a few paragraphs below outlining our plans and vision for solidtime in the **Vision** part of this document. 
+
+### Prevent Duplicate Work
+
+Before you submit a new PR, make sure that none exists already. If you plan to work on an issue, make sure to let us and others know by commenting on the issue/discussion. 
+
+### Give context
+
+Tell us what you thinking was behind the decisions you made while drafting the PR. Treat the PR itself as documentation for everyone who wants to go back and understand why certain decisions were made. 
+
+### Summarize your PR
+
+Please make sure to include a short summary at the top of your PR to make it easy for us to quickly check what the PR is about, without looking at the code changes. 
+
+### Use Github Keywords and Auto-Link Issues
+
+Use phrases like "Closes #123" or "Fixes #123" in the PR description to link the PR with the issue that you are adressing. 
+
+### Mention what you tested and how
+
+Explain how you tested and validated the implementation. 
+
+### Keep Naming consistent
+
+Look at existing code patterns and use naming conventions that already exist in the code base. 
+
+### Testing
+
+We have an exhaustive test-suite of PHPUnit (Backend) and Playwright (Frontend) testing. Whereever applicable please make sure to write add tests to the codebase. 
+
+### Linting & Formatting
+
+Make sure to run linting and formatting commands before you commit the changes. 
+
+For backend changes:
+
+```
+composer fix
+composer analyse
+```
+
+For frontend changes: 
+
+```
+npm run lint:fix
+npm run format
+```
+
+## Vision
+
+We started solidtime to provide an open infrastructure solution for time tracking—one that empowers teams and individuals to fully own their data, instead of depending on proprietary platforms. We believe infrastructure software should be open, accessible, and built to last. However, competing with established market leaders in this space requires long-term financial sustainability.
+
+solidtime is licensed under the AGPL, which we believe is the best available license to strike a balance between openness and financial viability. The AGPL gives us, as the copyright holders, certain exclusive rights that we plan to leverage to fund development. To ensure we retain those rights across the entire codebase, we've put a CLA in place that contributors must sign before submitting code.
+
+One of solidtime’s key advantages is that it's built to be self-hostable. This makes it a great solution for organizations like governments, healthcare providers, and enterprises that are required to keep data on their own infrastructure due to regulations or internal policies. These organizations may need custom licenses, integrations, or modifications that aren't suitable for the open-source version. To support them, we offer relicensed versions of solidtime along with support plans.
+
+We’ll also provide proprietary extensions for solidtime. These will be available to enterprise customers with support plans, but also to individual users or teams who don’t need support, at much more accessible price points. For companies running solidtime on their own infrastructure, this is the easiest way to support the project while gaining additional functionality. While we plan to make it easier to build custom extensions in the future, our current APIs are still highly experimental.
+
+Finally - and perhaps most importantly - we offer a hosted SaaS version called solidtime Cloud, for users who can’t or don’t want to run the software themselves. This version includes proprietary extensions, always runs the latest commit, and includes monitoring and billing features available exclusively on this hosted instance. We expect solidtime Cloud to play a critical role in funding the project long-term.
+
+Having full control over the source code’s licensing also gives us the ability to change the license of the main project in the future. That said, we have no plans to do so and would only consider it in extreme cases - for example, if a malicious actor were to directly compete with our hosted service in a way that threatens the sustainability of the project, the legal interpretation of AGPL changes in a way that would make it unreasonable to use for certain companies, or a new similar license gains wide-spread adoption. Regardless, solidtime will always remain free to self-host for individuals and companies who use it as part of their work, and all previous releases will remain licensed under AGPL.
+
+If you are using the open-source version of solidtime and want to support us, the best way to do so is to spread the word. 
--- a/README.md
+++ b/README.md
@@ -35,10 +35,9 @@ If you have a **feature request**, please [**create a discussion**](https://gith

 ## Contributing

-This project is in a very early stage. The structure and APIs are still subject to change and not stable. 
-Therefore, we do not currently accept any contributions, unless you are a member of the team.
+Please open an issue or start a discussion and wait for approval before submitting a pull request. This does not apply to tiny fixes or changes however, please keep in mind that we might not merge PRs for various reasons. 

-As soon as we feel comfortable enough that the application structure is stable enough, we will open up the project for contributions.
+Please read the [CONTRIBUTING.md](./CONTRIBUTING.md) before sumbitting a Pull Request.

 We do accept contributions in the [documentation repository](https://github.com/solidtime-io/docs) f.e. to add new self-hosting guides.

--- a/app/Actions/Fortify/CreateNewUser.php
+++ b/app/Actions/Fortify/CreateNewUser.php
@@ -26,7 +26,7 @@ class CreateNewUser implements CreatesNewUsers
    /**
     * Create a newly registered user.
     *
-     * @param  array<string, string>  $input
+     * @param  array<string, mixed>  $input
     *
     * @throws ValidationException
     */
--- a/app/Actions/Fortify/UpdateUserProfileInformation.php
+++ b/app/Actions/Fortify/UpdateUserProfileInformation.php
@@ -6,7 +6,6 @@ namespace App\Actions\Fortify;

 use App\Enums\Weekday;
 use App\Models\User;
-use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
@@ -59,8 +58,7 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
            $user->updateProfilePhoto($input['photo']);
        }

-        if ($input['email'] !== $user->email &&
-            $user instanceof MustVerifyEmail) {
+        if ($input['email'] !== $user->email) {
            $user->forceFill([
                'name' => $input['name'],
                'email' => $input['email'],
--- a/app/Actions/Jetstream/AddOrganizationMember.php
+++ b/app/Actions/Jetstream/AddOrganizationMember.php
@@ -57,7 +57,7 @@ class AddOrganizationMember implements AddsTeamMembers
     */
    protected function rules(): array
    {
-        return array_filter([
+        return [
            'email' => [
                'required',
                'email',
@@ -75,7 +75,7 @@ class AddOrganizationMember implements AddsTeamMembers
                    Role::Employee->value,
                ]),
            ],
-        ]);
+        ];
    }

    /**
--- a/app/Console/Commands/Auth/AuthSendReminderForExpiringApiTokensCommand.php
+++ b/app/Console/Commands/Auth/AuthSendReminderForExpiringApiTokensCommand.php
@@ -0,0 +1,108 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Console\Commands\Auth;
+
+use App\Mail\AuthApiTokenExpirationReminderMail;
+use App\Mail\AuthApiTokenExpiredMail;
+use App\Models\Passport\Token;
+use App\Models\User;
+use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Mail;
+
+class AuthSendReminderForExpiringApiTokensCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'auth:send-mails-expiring-api-tokens '.
+        ' { --dry-run : Do not actually send emails or save anything to the database, just output what would happen }';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Sends emails about expiring API tokens, one week before and when they expired.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $dryRun = (bool) $this->option('dry-run');
+        if ($dryRun) {
+            $this->comment('Running in dry-run mode. No emails will be sent and nothing will be saved to the database.');
+        }
+
+        $this->comment('Sending reminder emails about expiring API tokens...');
+        $sentMails = 0;
+        Token::query()
+            ->where('expires_at', '<=', Carbon::now()->addDays(7))
+            ->whereNull('reminder_sent_at')
+            ->with([
+                'client',
+                'user',
+            ])
+            ->whereHas('user', function (Builder $query): void {
+                /** @var Builder<User> $query */
+                $query->where('is_placeholder', '=', false);
+            })
+            ->isApiToken(true)
+            ->orderBy('created_at', 'asc')
+            ->chunk(500, function (Collection $tokens) use ($dryRun, &$sentMails): void {
+                /** @var Collection<int, Token> $tokens */
+                foreach ($tokens as $token) {
+                    $user = $token->user;
+                    $this->info('Start sending email to user "'.$user->email.'" ('.$user->getKey().') reminding about API token '.$token->getKey());
+                    $sentMails++;
+                    if (! $dryRun) {
+                        Mail::to($user->email)
+                            ->queue(new AuthApiTokenExpirationReminderMail($token, $user));
+                        $token->reminder_sent_at = Carbon::now();
+                        $token->save();
+                    }
+                }
+            });
+        $this->comment('Finished sending '.$sentMails.' expiring API token emails...');
+
+        $this->comment('Sent emails about expired API tokens');
+        $sentMails = 0;
+        Token::query()
+            ->where('expires_at', '<=', Carbon::now())
+            ->whereNull('expired_info_sent_at')
+            ->with([
+                'client',
+                'user',
+            ])
+            ->whereHas('user', function (Builder $query): void {
+                /** @var Builder<User> $query */
+                $query->where('is_placeholder', '=', false);
+            })
+            ->isApiToken(true)
+            ->orderBy('created_at', 'asc')
+            ->chunk(500, function (Collection $tokens) use ($dryRun, &$sentMails): void {
+                /** @var Collection<int, Token> $tokens */
+                foreach ($tokens as $token) {
+                    $user = $token->user;
+                    $this->info('Start sending email to user "'.$user->email.'" ('.$user->getKey().') about expired API token '.$token->getKey());
+                    $sentMails++;
+                    if (! $dryRun) {
+                        Mail::to($user->email)
+                            ->queue(new AuthApiTokenExpiredMail($token, $user));
+                        $token->expired_info_sent_at = Carbon::now();
+                        $token->save();
+                    }
+                }
+            });
+        $this->comment('Finished sending '.$sentMails.' expired API token emails...');
+
+        return self::SUCCESS;
+    }
+}
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -18,17 +18,35 @@ class Kernel extends ConsoleKernel
            ->when(fn (): bool => config('scheduling.tasks.time_entry_send_still_running_mails'))
            ->everyTenMinutes();

-        $schedule->command('self-host:check-for-update')
-            ->when(fn (): bool => config('scheduling.tasks.self_hosting_check_for_update'))
-            ->twiceDaily();
+        $schedule->command('auth:send-mails-expiring-api-tokens')
+            ->when(fn (): bool => config('scheduling.tasks.auth_send_mails_expiring_api_tokens'))
+            ->everyTenMinutes();

-        $schedule->command('self-host:telemetry')
-            ->when(fn (): bool => config('scheduling.tasks.self_hosting_telemetry'))
-            ->twiceDaily();
+        if (config('app.key') && (config('scheduling.tasks.self_hosting_check_for_update') || config('scheduling.tasks.self_hosting_telemetry'))) {
+            // Convert string to a stable integer for seeding
+            /** @var int $seed Take the first 8 hex chars → 32-bit int */
+            $seed = hexdec(substr(hash('md5', config('app.key')), 0, 8));
+            $seed = abs($seed); // Ensure it's positive
+            mt_srand($seed);
+            $firstHour = mt_rand(0, 23);
+            $secondHour = ($firstHour + 12) % 24;
+            $minuteOffset = mt_rand(0, 59);
+            mt_srand(null); // Reset the random number generator
+
+            if (config('scheduling.tasks.self_hosting_check_for_update')) {
+                $schedule->command('self-host:check-for-update')
+                    ->twiceDailyAt($firstHour, $secondHour, $minuteOffset);
+            }
+
+            if (config('scheduling.tasks.self_hosting_telemetry')) {
+                $schedule->command('self-host:telemetry')
+                    ->twiceDailyAt($firstHour, $secondHour, $minuteOffset);
+            }
+        }

        $schedule->command('self-host:database-consistency')
            ->when(fn (): bool => config('scheduling.tasks.self_hosting_database_consistency'))
-            ->twiceDaily();
+            ->everySixHours();
    }

    /**
--- a/app/Enums/TimeEntryAggregationType.php
+++ b/app/Enums/TimeEntryAggregationType.php
@@ -20,6 +20,7 @@ enum TimeEntryAggregationType: string
    case Client = 'client';
    case Billable = 'billable';
    case Description = 'description';
+    case Tag = 'tag';

    public static function fromInterval(TimeEntryAggregationTypeInterval $timeEntryAggregationTypeInterval): TimeEntryAggregationType
    {
--- a/app/Enums/TimeEntryRoundingType.php
+++ b/app/Enums/TimeEntryRoundingType.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enums;
+
+use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
+
+enum TimeEntryRoundingType: string
+{
+    use LaravelEnumHelper;
+
+    case Up = 'up';
+    case Down = 'down';
+    case Nearest = 'nearest';
+}
--- a/app/Exceptions/Api/InvitationForTheEmailAlreadyExistsApiException.php
+++ b/app/Exceptions/Api/InvitationForTheEmailAlreadyExistsApiException.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions\Api;
+
+class InvitationForTheEmailAlreadyExistsApiException extends ApiException
+{
+    public const string KEY = 'invitation_for_the_email_already_exists';
+}
--- a/app/Exceptions/Api/OverlappingTimeEntryApiException.php
+++ b/app/Exceptions/Api/OverlappingTimeEntryApiException.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions\Api;
+
+class OverlappingTimeEntryApiException extends ApiException
+{
+    public const string KEY = 'overlapping_time_entry';
+}
--- a/app/Extensions/Scramble/PaginatedResourceCollectionTypeToSchema.php
+++ b/app/Extensions/Scramble/PaginatedResourceCollectionTypeToSchema.php
@@ -41,9 +41,7 @@ class PaginatedResourceCollectionTypeToSchema extends TypeToSchemaExtension
            return null;
        }

-        if (! ($collectingType = $this->openApiTransformer->transform($collectingClassType))) {
-            return null;
-        }
+        $collectingType = $this->openApiTransformer->transform($collectingClassType);

        $newType = new OpenApiObjectType;
        $newType->addProperty('data', (new ArrayType)->setItems($collectingType));
--- a/app/Filament/Resources/FailedJobResource.php
+++ b/app/Filament/Resources/FailedJobResource.php
@@ -15,6 +15,7 @@ use Filament\Resources\Resource;
 use Filament\Tables\Actions\Action;
 use Filament\Tables\Actions\BulkAction;
 use Filament\Tables\Actions\DeleteAction;
+use Filament\Tables\Actions\DeleteBulkAction;
 use Filament\Tables\Actions\ViewAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
@@ -75,7 +76,8 @@ class FailedJobResource extends Resource
            ->filters([])
            ->bulkActions([
                BulkAction::make('retry')
-                    ->label('Retry')
+                    ->icon('heroicon-o-arrow-path')
+                    ->label('Retry selected')
                    ->requiresConfirmation()
                    ->action(function (Collection $records): void {
                        /** @var FailedJob $record */
@@ -87,11 +89,13 @@ class FailedJobResource extends Resource
                            ->success()
                            ->send();
                    }),
+                DeleteBulkAction::make(),
            ])
            ->actions([
-                DeleteAction::make('Delete'),
-                ViewAction::make('View'),
+                DeleteAction::make(),
+                ViewAction::make(),
                Action::make('retry')
+                    ->icon('heroicon-o-arrow-path')
                    ->label('Retry')
                    ->requiresConfirmation()
                    ->action(function (FailedJob $record): void {
@@ -109,7 +113,6 @@ class FailedJobResource extends Resource
        return [
            'index' => ListFailedJobs::route('/'),
            'view' => ViewFailedJobs::route('/{record}'),
-
        ];
    }
 }
--- a/app/Filament/Resources/FailedJobResource/Pages/ListFailedJobs.php
+++ b/app/Filament/Resources/FailedJobResource/Pages/ListFailedJobs.php
@@ -6,8 +6,8 @@ namespace App\Filament\Resources\FailedJobResource\Pages;

 use App\Filament\Resources\FailedJobResource;
 use App\Models\FailedJob;
+use Filament\Actions\Action;
 use Filament\Notifications\Notification;
-use Filament\Pages\Actions\Action;
 use Filament\Resources\Pages\ListRecords;
 use Illuminate\Support\Facades\Artisan;

@@ -19,7 +19,8 @@ class ListFailedJobs extends ListRecords
    {
        return [
            Action::make('retry_all')
-                ->label('Retry all failed Jobs')
+                ->icon('heroicon-o-arrow-path')
+                ->label('Retry all')
                ->requiresConfirmation()
                ->action(function (): void {
                    Artisan::call('queue:retry all');
@@ -30,7 +31,8 @@ class ListFailedJobs extends ListRecords
                }),

            Action::make('delete_all')
-                ->label('Delete all failed Jobs')
+                ->icon('heroicon-o-trash')
+                ->label('Delete all')
                ->requiresConfirmation()
                ->color('danger')
                ->action(function (): void {
--- a/app/Filament/Resources/TokenResource.php
+++ b/app/Filament/Resources/TokenResource.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Filament\Resources;

 use App\Filament\Resources\TokenResource\Pages;
-use App\Models\Passport\Client;
 use App\Models\Passport\Token;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -40,7 +39,7 @@ class TokenResource extends Resource
                    ->label('Name')
                    ->required()
                    ->maxLength(255),
-                Forms\Components\Select::make('user_id')
+                Forms\Components\Select::make('owner_id')
                    ->label('User')
                    ->relationship(name: 'user', titleAttribute: 'name')
                    ->searchable(['name'])
@@ -79,10 +78,12 @@ class TokenResource extends Resource
                Tables\Columns\TextColumn::make('client.name')
                    ->searchable()
                    ->sortable(),
-                Tables\Columns\IconColumn::make('client.personal_access_client')
+                Tables\Columns\IconColumn::make('personal_access_client')
+                    ->state(function (Token $token): bool {
+                        return in_array('personal_access', $token->client->grant_types ?? [], true);
+                    })
                    ->boolean()
-                    ->label('API token?')
-                    ->sortable(),
+                    ->label('API token?'),
                Tables\Columns\IconColumn::make('revoked')
                    ->boolean()
                    ->label('Revoked?')
@@ -104,17 +105,11 @@ class TokenResource extends Resource
                    ->queries(
                        true: function (Builder $query) {
                            /** @var Builder<Token> $query */
-                            return $query->whereHas('client', function (Builder $query) {
-                                /** @var Builder<Client> $query */
-                                return $query->where('personal_access_client', true);
-                            });
+                            return $query->isApiToken();
                        },
                        false: function (Builder $query) {
                            /** @var Builder<Token> $query */
-                            return $query->whereHas('client', function (Builder $query) {
-                                /** @var Builder<Client> $query */
-                                return $query->where('personal_access_client', false);
-                            });
+                            return $query->isApiToken(false);
                        },
                        blank: function (Builder $query) {
                            /** @var Builder<Token> $query */
--- a/app/Http/Controllers/Api/V1/ApiTokenController.php
+++ b/app/Http/Controllers/Api/V1/ApiTokenController.php
@@ -8,9 +8,12 @@ use App\Exceptions\Api\PersonalAccessClientIsNotConfiguredException;
 use App\Http\Requests\V1\ApiToken\ApiTokenStoreRequest;
 use App\Http\Resources\V1\ApiToken\ApiTokenCollection;
 use App\Http\Resources\V1\ApiToken\ApiTokenWithAccessTokenResource;
+use App\Models\Passport\Client;
 use App\Models\Passport\Token;
 use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Str;

 class ApiTokenController extends Controller
 {
@@ -28,7 +31,10 @@ class ApiTokenController extends Controller
        $user = $this->user();

        $tokens = $user->tokens()
-            ->where('client_id', '=', config('passport.personal_access_client.id'))
+            ->whereHas('client', function (Builder $query): void {
+                /** @var Builder<Client> $query */
+                $query->whereJsonContains('grant_types', 'personal_access');
+            })
            ->get();

        return new ApiTokenCollection($tokens);
@@ -48,15 +54,21 @@ class ApiTokenController extends Controller
    {
        $user = $this->user();

-        if (config('passport.personal_access_client.id') === null || config('passport.personal_access_client.secret') === null) {
-            throw new PersonalAccessClientIsNotConfiguredException;
+        try {
+            $token = $user->createToken($request->getName(), ['*']);
+
+            /** @var Token $tokenModel */
+            $tokenModel = $token->getToken();
+
+            return new ApiTokenWithAccessTokenResource($tokenModel, $token->accessToken);
+        } catch (\RuntimeException $exception) {
+            report($exception);
+            if (Str::contains($exception->getMessage(), ['Personal access client not found'])) {
+                throw new PersonalAccessClientIsNotConfiguredException;
+            }
+
+            throw $exception;
        }
-
-        $token = $user->createToken($request->getName(), ['*']);
-        /** @var Token $tokenModel */
-        $tokenModel = $token->token;
-
-        return new ApiTokenWithAccessTokenResource($tokenModel, $token->accessToken);
    }

    /**
@@ -71,13 +83,10 @@ class ApiTokenController extends Controller
    {
        $user = $this->user();

-        if (config('passport.personal_access_client.id') === null || config('passport.personal_access_client.secret') === null) {
-            throw new PersonalAccessClientIsNotConfiguredException;
-        }
        if ($apiToken->user_id !== $user->getKey()) {
            throw new AuthorizationException('API token does not belong to user');
        }
-        if ($apiToken->client_id !== config('passport.personal_access_client.id')) {
+        if (! ($apiToken->client?->hasGrantType('personal_access') ?? false)) {
            throw new AuthorizationException('API token is not a personal access token');
        }

@@ -97,13 +106,10 @@ class ApiTokenController extends Controller
    {
        $user = $this->user();

-        if (config('passport.personal_access_client.id') === null || config('passport.personal_access_client.secret') === null) {
-            throw new PersonalAccessClientIsNotConfiguredException;
-        }
        if ($apiToken->user_id !== $user->getKey()) {
            throw new AuthorizationException('API token does not belong to user');
        }
-        if ($apiToken->client_id !== config('passport.personal_access_client.id')) {
+        if (! ($apiToken->client?->hasGrantType('personal_access') ?? false)) {
            throw new AuthorizationException('API token is not a personal access token');
        }

--- a/app/Http/Controllers/Api/V1/ChartController.php
+++ b/app/Http/Controllers/Api/V1/ChartController.php
@@ -14,6 +14,8 @@ use Illuminate\Http\JsonResponse;
 class ChartController extends Controller
 {
    /**
+     * Get chart data for the weekly project overview.
+     *
     * @throws AuthorizationException
     *
     * @operationId weeklyProjectOverview
@@ -31,6 +33,8 @@ class ChartController extends Controller
    }

    /**
+     * Get chart data for the latest tasks.
+     *
     * @throws AuthorizationException
     *
     * @operationId latestTasks
@@ -48,6 +52,8 @@ class ChartController extends Controller
    }

    /**
+     * Get chart data for the last seven days.
+     *
     * @throws AuthorizationException
     *
     * @operationId lastSevenDays
@@ -65,6 +71,8 @@ class ChartController extends Controller
    }

    /**
+     * Get chart data for the latest team activity.
+     *
     * @throws AuthorizationException
     *
     * @operationId latestTeamActivity
@@ -81,6 +89,8 @@ class ChartController extends Controller
    }

    /**
+     * Get chart data for daily tracked hours.
+     *
     * @throws AuthorizationException
     *
     * @operationId dailyTrackedHours
@@ -98,6 +108,8 @@ class ChartController extends Controller
    }

    /**
+     * Get chart data for total weekly time.
+     *
     * @throws AuthorizationException
     *
     * @operationId totalWeeklyTime
@@ -115,6 +127,8 @@ class ChartController extends Controller
    }

    /**
+     * Get chart data for total weekly billable time.
+     *
     * @throws AuthorizationException
     *
     * @operationId totalWeeklyBillableTime
@@ -132,6 +146,8 @@ class ChartController extends Controller
    }

    /**
+     * Get chart data for total weekly billable amount.
+     *
     * @throws AuthorizationException
     *
     * @operationId totalWeeklyBillableAmount
@@ -154,6 +170,8 @@ class ChartController extends Controller
    }

    /**
+     * Get chart data for weekly history.
+     *
     * @throws AuthorizationException
     *
     * @operationId weeklyHistory
--- a/app/Http/Controllers/Api/V1/ClientController.php
+++ b/app/Http/Controllers/Api/V1/ClientController.php
@@ -38,11 +38,17 @@ class ClientController extends Controller
    public function index(Organization $organization, ClientIndexRequest $request): ClientCollection
    {
        $this->checkPermission($organization, 'clients:view');
+        $canViewAllClients = $this->hasPermission($organization, 'clients:view:all');
+        $user = $this->user();

        $clientsQuery = Client::query()
            ->whereBelongsTo($organization, 'organization')
            ->orderBy('created_at', 'desc');

+        if (! $canViewAllClients) {
+            $clientsQuery->visibleByEmployee($user);
+        }
+
        $filterArchived = $request->getFilterArchived();
        if ($filterArchived === 'true') {
            $clientsQuery->whereNotNull('archived_at');
--- a/app/Http/Controllers/Api/V1/InvitationController.php
+++ b/app/Http/Controllers/Api/V1/InvitationController.php
@@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace App\Http\Controllers\Api\V1;

+use App\Exceptions\Api\InvitationForTheEmailAlreadyExistsApiException;
 use App\Exceptions\Api\UserIsAlreadyMemberOfOrganizationApiException;
 use App\Http\Requests\V1\Invitation\InvitationIndexRequest;
 use App\Http\Requests\V1\Invitation\InvitationStoreRequest;
@@ -50,6 +51,7 @@ class InvitationController extends Controller
     *
     * @throws AuthorizationException
     * @throws UserIsAlreadyMemberOfOrganizationApiException
+     * @throws InvitationForTheEmailAlreadyExistsApiException
     *
     * @operationId invite
     */
--- a/app/Http/Controllers/Api/V1/MemberController.php
+++ b/app/Http/Controllers/Api/V1/MemberController.php
@@ -10,12 +10,14 @@ use App\Exceptions\Api\CanNotRemoveOwnerFromOrganization;
 use App\Exceptions\Api\ChangingRoleOfPlaceholderIsNotAllowed;
 use App\Exceptions\Api\ChangingRoleToPlaceholderIsNotAllowed;
 use App\Exceptions\Api\EntityStillInUseApiException;
+use App\Exceptions\Api\InvitationForTheEmailAlreadyExistsApiException;
 use App\Exceptions\Api\OnlyOwnerCanChangeOwnership;
 use App\Exceptions\Api\OnlyPlaceholdersCanBeMergedIntoAnotherMember;
 use App\Exceptions\Api\OrganizationNeedsAtLeastOneOwner;
 use App\Exceptions\Api\ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException;
 use App\Exceptions\Api\UserIsAlreadyMemberOfOrganizationApiException;
 use App\Exceptions\Api\UserNotPlaceholderApiException;
+use App\Http\Requests\V1\Member\MemberDestroyRequest;
 use App\Http\Requests\V1\Member\MemberIndexRequest;
 use App\Http\Requests\V1\Member\MemberMergeIntoRequest;
 use App\Http\Requests\V1\Member\MemberUpdateRequest;
@@ -100,11 +102,13 @@ class MemberController extends Controller
     *
     * @operationId removeMember
     */
-    public function destroy(Organization $organization, Member $member, MemberService $memberService): JsonResponse
+    public function destroy(MemberDestroyRequest $request, Organization $organization, Member $member, MemberService $memberService): JsonResponse
    {
        $this->checkPermission($organization, 'members:delete', $member);

-        $memberService->removeMember($member, $organization);
+        $deleteRelated = $request->getDeleteRelated();
+
+        $memberService->removeMember($member, $organization, $deleteRelated);

        return response()
            ->json(null, 204);
@@ -170,6 +174,7 @@ class MemberController extends Controller
     * @throws UserNotPlaceholderApiException
     * @throws UserIsAlreadyMemberOfOrganizationApiException
     * @throws ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException
+     * @throws InvitationForTheEmailAlreadyExistsApiException
     *
     * @operationId invitePlaceholder
     */
--- a/app/Http/Controllers/Api/V1/OrganizationController.php
+++ b/app/Http/Controllers/Api/V1/OrganizationController.php
@@ -46,6 +46,9 @@ class OrganizationController extends Controller
        if ($request->getEmployeesCanSeeBillableRates() !== null) {
            $organization->employees_can_see_billable_rates = $request->getEmployeesCanSeeBillableRates();
        }
+        if ($request->getEmployeesCanManageTasks() !== null) {
+            $organization->employees_can_manage_tasks = $request->getEmployeesCanManageTasks();
+        }
        if ($request->getNumberFormat() !== null) {
            $organization->number_format = $request->getNumberFormat();
        }
@@ -61,6 +64,9 @@ class OrganizationController extends Controller
        if ($request->getTimeFormat() !== null) {
            $organization->time_format = $request->getTimeFormat();
        }
+        if ($request->getPreventOverlappingTimeEntries() !== null) {
+            $organization->prevent_overlapping_time_entries = $request->getPreventOverlappingTimeEntries();
+        }
        $hasBillableRate = $request->has('billable_rate');
        if ($hasBillableRate) {
            $oldBillableRate = $organization->billable_rate;
--- a/app/Http/Controllers/Api/V1/Public/ReportController.php
+++ b/app/Http/Controllers/Api/V1/Public/ReportController.php
@@ -73,7 +73,9 @@ class ReportController extends Controller
            false,
            $report->properties->start,
            $report->properties->end,
-            true
+            true,
+            $report->properties->roundingType,
+            $report->properties->roundingMinutes,
        );
        $historyData = $timeEntryAggregationService->getAggregatedTimeEntriesWithDescriptions(
            $timeEntriesQuery->clone(),
@@ -84,7 +86,9 @@ class ReportController extends Controller
            true,
            $report->properties->start,
            $report->properties->end,
-            true
+            true,
+            $report->properties->roundingType,
+            $report->properties->roundingMinutes,
        );

        return new DetailedWithDataReportResource($report, $data, $historyData);
--- a/app/Http/Controllers/Api/V1/ReportController.php
+++ b/app/Http/Controllers/Api/V1/ReportController.php
@@ -107,6 +107,8 @@ class ReportController extends Controller
            }
        }
        $properties->timezone = $timezone;
+        $properties->roundingType = $request->getPropertyRoundingType();
+        $properties->roundingMinutes = $request->getPropertyRoundingMinutes();
        $report->properties = $properties;
        if ($isPublic) {
            $report->share_secret = $reportService->generateSecret();
--- a/app/Http/Controllers/Api/V1/TaskController.php
+++ b/app/Http/Controllers/Api/V1/TaskController.php
@@ -11,6 +11,7 @@ use App\Http\Requests\V1\Task\TaskUpdateRequest;
 use App\Http\Resources\V1\Task\TaskCollection;
 use App\Http\Resources\V1\Task\TaskResource;
 use App\Models\Organization;
+use App\Models\Project;
 use App\Models\Task;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
@@ -27,6 +28,26 @@ class TaskController extends Controller
        }
    }

+    /**
+     * Check scoped permission and verify user has access to the project
+     *
+     * @throws AuthorizationException
+     */
+    private function checkScopedPermissionForProject(Organization $organization, Project $project, string $permission): void
+    {
+        $this->checkPermission($organization, $permission);
+
+        $user = $this->user();
+        $hasAccess = Project::query()
+            ->where('id', $project->id)
+            ->visibleByEmployee($user)
+            ->exists();
+
+        if (! $hasAccess) {
+            throw new AuthorizationException('You do not have permission to '.$permission.' in this project.');
+        }
+    }
+
    /**
     * Get tasks
     *
@@ -75,7 +96,15 @@ class TaskController extends Controller
     */
    public function store(Organization $organization, TaskStoreRequest $request): JsonResource
    {
-        $this->checkPermission($organization, 'tasks:create');
+        /** @var Project $project */
+        $project = Project::query()->findOrFail($request->input('project_id'));
+
+        if ($this->hasPermission($organization, 'tasks:create:all')) {
+            $this->checkPermission($organization, 'tasks:create:all');
+        } else {
+            $this->checkScopedPermissionForProject($organization, $project, 'tasks:create');
+        }
+
        $task = new Task;
        $task->name = $request->input('name');
        $task->project_id = $request->input('project_id');
@@ -97,7 +126,17 @@ class TaskController extends Controller
     */
    public function update(Organization $organization, Task $task, TaskUpdateRequest $request): JsonResource
    {
-        $this->checkPermission($organization, 'tasks:update', $task);
+        // Check task belongs to organization
+        if ($task->organization_id !== $organization->id) {
+            throw new AuthorizationException('Task does not belong to organization');
+        }
+
+        if ($this->hasPermission($organization, 'tasks:update:all')) {
+            $this->checkPermission($organization, 'tasks:update:all');
+        } else {
+            $this->checkScopedPermissionForProject($organization, $task->project, 'tasks:update');
+        }
+
        $task->name = $request->input('name');
        if ($this->canAccessPremiumFeatures($organization) && $request->has('estimated_time')) {
            $task->estimated_time = $request->getEstimatedTime();
@@ -119,7 +158,16 @@ class TaskController extends Controller
     */
    public function destroy(Organization $organization, Task $task): JsonResponse
    {
-        $this->checkPermission($organization, 'tasks:delete', $task);
+        // Check task belongs to organization
+        if ($task->organization_id !== $organization->id) {
+            throw new AuthorizationException('Task does not belong to organization');
+        }
+
+        if ($this->hasPermission($organization, 'tasks:delete:all')) {
+            $this->checkPermission($organization, 'tasks:delete:all');
+        } else {
+            $this->checkScopedPermissionForProject($organization, $task->project, 'tasks:delete');
+        }

        if ($task->timeEntries()->exists()) {
            throw new EntityStillInUseApiException('task', 'time_entry');
--- a/app/Http/Controllers/Api/V1/TimeEntryController.php
+++ b/app/Http/Controllers/Api/V1/TimeEntryController.php
@@ -7,6 +7,7 @@ namespace App\Http\Controllers\Api\V1;
 use App\Enums\ExportFormat;
 use App\Enums\Role;
 use App\Exceptions\Api\FeatureIsNotAvailableInFreePlanApiException;
+use App\Exceptions\Api\OverlappingTimeEntryApiException;
 use App\Exceptions\Api\PdfRendererIsNotConfiguredException;
 use App\Exceptions\Api\TimeEntryCanNotBeRestartedApiException;
 use App\Exceptions\Api\TimeEntryStillRunningApiException;
@@ -33,6 +34,7 @@ use App\Service\ReportExport\TimeEntriesDetailedExport;
 use App\Service\ReportExport\TimeEntriesReportExport;
 use App\Service\TimeEntryAggregationService;
 use App\Service\TimeEntryFilter;
+use App\Service\TimeEntryService;
 use App\Service\TimezoneService;
 use Gotenberg\Exceptions\GotenbergApiErrored;
 use Gotenberg\Exceptions\NoOutputFileInResponse;
@@ -44,9 +46,11 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\File;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Maatwebsite\Excel\Facades\Excel;
@@ -54,6 +58,43 @@ use Spatie\TemporaryDirectory\TemporaryDirectory;

 class TimeEntryController extends Controller
 {
+    private function assertNoOverlap(Organization $organization, Member $member, \Illuminate\Support\Carbon $start, ?\Illuminate\Support\Carbon $end, ?TimeEntry $exclude = null): void
+    {
+        if (! $organization->prevent_overlapping_time_entries) {
+            return;
+        }
+
+        $query = TimeEntry::query()
+            ->where('organization_id', $organization->getKey())
+            ->where('user_id', $member->user_id)
+            ->when($exclude !== null, function (Builder $q) use ($exclude): void {
+                $q->where('id', '!=', $exclude->getKey());
+            })
+            ->where(function (Builder $q) use ($start, $end): void {
+                $q->where(function (Builder $q2) use ($start): void {
+                    $q2->where('end', '>', $start)
+                        ->where('start', '<', $start);
+                });
+
+                if ($end !== null) {
+                    $q->orWhere(function (Builder $q4) use ($end): void {
+                        $q4->where('start', '<', $end)
+                            ->where('end', '>', $end);
+                    });
+                    // Check if the new entry completely surrounds an existing entry
+                    $q->orWhere(function (Builder $q6) use ($start, $end): void {
+                        $q6->where('start', '>=', $start)
+                            ->where('end', '<=', $end);
+                    });
+                }
+
+            });
+
+        if ($query->exists()) {
+            throw new OverlappingTimeEntryApiException;
+        }
+    }
+
    protected function checkPermission(Organization $organization, string $permission, ?TimeEntry $timeEntry = null): void
    {
        parent::checkPermission($organization, $permission);
@@ -84,7 +125,8 @@ class TimeEntryController extends Controller
            $this->checkPermission($organization, 'time-entries:view:all');
        }

-        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $member);
+        $canAccessPremiumFeatures = $this->canAccessPremiumFeatures($organization);
+        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $member, $canAccessPremiumFeatures);

        $totalCount = $timeEntriesQuery->count();

@@ -138,10 +180,19 @@ class TimeEntryController extends Controller
    /**
     * @return Builder<TimeEntry>
     */
-    private function getTimeEntriesQuery(Organization $organization, TimeEntryIndexRequest|TimeEntryIndexExportRequest $request, ?Member $member): Builder
+    private function getTimeEntriesQuery(Organization $organization, TimeEntryIndexRequest|TimeEntryIndexExportRequest $request, ?Member $member, bool $canAccessPremiumFeatures): Builder
    {
+        $select = TimeEntry::SELECT_COLUMNS;
+        $roundingType = $canAccessPremiumFeatures ? $request->getRoundingType() : null;
+        $roundingMinutes = $canAccessPremiumFeatures ? $request->getRoundingMinutes() : null;
+        if ($roundingType !== null && $roundingMinutes !== null) {
+            $select = array_diff($select, ['start', 'end']);
+            $select[] = DB::raw(app(TimeEntryService::class)->getStartSelectRawForRounding($roundingType, $roundingMinutes).' as start');
+            $select[] = DB::raw(app(TimeEntryService::class)->getEndSelectRawForRounding($roundingType, $roundingMinutes).' as end');
+        }
        $timeEntriesQuery = TimeEntry::query()
            ->whereBelongsTo($organization, 'organization')
+            ->select($select)
            ->orderBy('start', 'desc');

        $filter = new TimeEntryFilter($timeEntriesQuery);
@@ -175,16 +226,19 @@ class TimeEntryController extends Controller
        } else {
            $this->checkPermission($organization, 'time-entries:view:all');
        }
+        $canAccessPremiumFeatures = $this->canAccessPremiumFeatures($organization);
        $debug = $request->getDebug();
        $format = $request->getFormatValue();
-        if ($format === ExportFormat::PDF && ! $this->canAccessPremiumFeatures($organization)) {
+        if ($format === ExportFormat::PDF && ! $canAccessPremiumFeatures) {
            throw new FeatureIsNotAvailableInFreePlanApiException;
        }
        $user = $this->user();
        $timezone = $user->timezone;
        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
+        $roundingType = $canAccessPremiumFeatures ? $request->getRoundingType() : null;
+        $roundingMinutes = $canAccessPremiumFeatures ? $request->getRoundingMinutes() : null;

-        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $member);
+        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $member, $canAccessPremiumFeatures);
        $timeEntriesQuery->with([
            'task',
            'client',
@@ -207,8 +261,9 @@ class TimeEntryController extends Controller
            if ($viewFile === false) {
                throw new \LogicException('View file not found');
            }
+            $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $member);
            $aggregatedData = $timeEntryAggregationService->getAggregatedTimeEntries(
-                $timeEntriesQuery->clone()->reorder()->withOnly([]),
+                $timeEntriesAggregateQuery,
                null,
                null,
                $user->timezone,
@@ -216,7 +271,9 @@ class TimeEntryController extends Controller
                false,
                null,
                null,
-                $showBillableRate
+                $showBillableRate,
+                $roundingType,
+                $roundingMinutes,
            );
            $html = Blade::render($viewFile, [
                'timeEntries' => $timeEntriesQuery->get(),
@@ -318,12 +375,15 @@ class TimeEntryController extends Controller
        } else {
            $this->checkPermission($organization, 'time-entries:view:all');
        }
+        $canAccessPremiumFeatures = $this->canAccessPremiumFeatures($organization);
        $user = $this->user();
        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;

        $group1Type = $request->getGroup();
        $group2Type = $request->getSubGroup();
        $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $member);
+        $roundingType = $canAccessPremiumFeatures ? $request->getRoundingType() : null;
+        $roundingMinutes = $canAccessPremiumFeatures ? $request->getRoundingMinutes() : null;

        $aggregatedData = $timeEntryAggregationService->getAggregatedTimeEntries(
            $timeEntriesAggregateQuery,
@@ -334,7 +394,9 @@ class TimeEntryController extends Controller
            $request->getFillGapsInTimeGroups(),
            $request->getStart(),
            $request->getEnd(),
-            $showBillableRate
+            $showBillableRate,
+            $roundingType,
+            $roundingMinutes
        );

        return [
@@ -362,6 +424,7 @@ class TimeEntryController extends Controller
        } else {
            $this->checkPermission($organization, 'time-entries:view:all');
        }
+        $canAccessPremiumFeatures = $this->canAccessPremiumFeatures($organization);
        $format = $request->getFormatValue();
        if ($format === ExportFormat::PDF && ! $this->canAccessPremiumFeatures($organization)) {
            throw new FeatureIsNotAvailableInFreePlanApiException;
@@ -373,6 +436,8 @@ class TimeEntryController extends Controller
        $group = $request->getGroup();
        $subGroup = $request->getSubGroup();
        $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $member);
+        $roundingType = $canAccessPremiumFeatures ? $request->getRoundingType() : null;
+        $roundingMinutes = $canAccessPremiumFeatures ? $request->getRoundingMinutes() : null;

        $aggregatedData = $timeEntryAggregationService->getAggregatedTimeEntriesWithDescriptions(
            $timeEntriesAggregateQuery->clone(),
@@ -383,7 +448,9 @@ class TimeEntryController extends Controller
            false,
            $request->getStart(),
            $request->getEnd(),
-            $showBillableRate
+            $showBillableRate,
+            $roundingType,
+            $roundingMinutes
        );
        $dataHistoryChart = $timeEntryAggregationService->getAggregatedTimeEntries(
            $timeEntriesAggregateQuery->clone(),
@@ -394,7 +461,9 @@ class TimeEntryController extends Controller
            true,
            $request->getStart(),
            $request->getEnd(),
-            $showBillableRate
+            $showBillableRate,
+            $roundingType,
+            $roundingMinutes
        );
        $currency = $organization->currency;
        $timezone = app(TimezoneService::class)->getTimezoneFromUser($this->user());
@@ -477,7 +546,7 @@ class TimeEntryController extends Controller
    /**
     * @return Builder<TimeEntry>
     */
-    private function getTimeEntriesAggregateQuery(Organization $organization, TimeEntryAggregateRequest|TimeEntryAggregateExportRequest $request, ?Member $member): Builder
+    private function getTimeEntriesAggregateQuery(Organization $organization, TimeEntryAggregateRequest|TimeEntryAggregateExportRequest|TimeEntryIndexExportRequest $request, ?Member $member): Builder
    {
        $timeEntriesQuery = TimeEntry::query()
            ->whereBelongsTo($organization, 'organization');
@@ -519,17 +588,15 @@ class TimeEntryController extends Controller
            throw new TimeEntryStillRunningApiException;
        }

+        // Overlap check for create
+        $start = Carbon::parse($request->input('start'));
+        $end = $request->input('end') !== null ? Carbon::parse($request->input('end')) : null;
+        $this->assertNoOverlap($organization, $member, $start, $end);
+
        $project = $request->input('project_id') !== null ? Project::findOrFail((string) $request->input('project_id')) : null;
        $client = $project?->client;
        $task = $request->input('task_id') !== null ? $project->tasks()->findOrFail((string) $request->input('task_id')) : null;

-        if ($project !== null) {
-            RecalculateSpentTimeForProject::dispatch($project);
-        }
-        if ($task !== null) {
-            RecalculateSpentTimeForTask::dispatch($task);
-        }
-
        $timeEntry = new TimeEntry;
        $timeEntry->fill($request->validated());
        $timeEntry->client()->associate($client);
@@ -539,6 +606,13 @@ class TimeEntryController extends Controller
        $timeEntry->setComputedAttributeValue('billable_rate');
        $timeEntry->save();

+        if ($project !== null) {
+            RecalculateSpentTimeForProject::dispatch($project);
+        }
+        if ($task !== null) {
+            RecalculateSpentTimeForTask::dispatch($task);
+        }
+
        return new TimeEntryResource($timeEntry);
    }

@@ -563,6 +637,13 @@ class TimeEntryController extends Controller
            throw new TimeEntryCanNotBeRestartedApiException;
        }

+        // Overlap check for update (exclude current)
+        /** @var Member $effectiveMember */
+        $effectiveMember = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : $timeEntry->member;
+        $effectiveStart = $request->has('start') ? Carbon::parse($request->input('start')) : $timeEntry->start;
+        $effectiveEnd = $request->has('end') ? ($request->input('end') !== null ? Carbon::parse($request->input('end')) : null) : $timeEntry->end;
+        $this->assertNoOverlap($organization, $effectiveMember, $effectiveStart, $effectiveEnd, $timeEntry);
+
        $oldProject = $timeEntry->project;
        $oldTask = $timeEntry->task;

--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -43,7 +43,10 @@ class Controller extends BaseController
        /** @var Member|null $member */
        $member = Member::query()->whereBelongsTo($organization, 'organization')->whereBelongsTo($user, 'user')->first();
        if ($member === null) {
-            Log::error('This function should only be called in authenticated context after checking the user is a member of the organization');
+            Log::error('This function should only be called in authenticated context after checking the user is a member of the organization', [
+                'user' => $user->getKey(),
+                'organization' => $organization->getKey(),
+            ]);
            throw new AuthorizationException;
        }

--- a/app/Http/Middleware/EnsureEmailIsVerified.php
+++ b/app/Http/Middleware/EnsureEmailIsVerified.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Http\Middleware;

 use Closure;
-use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\URL;
@@ -20,8 +19,7 @@ class EnsureEmailIsVerified
    {
        if (! app()->isLocal()) {
            if ($request->user() === null ||
-                ($request->user() instanceof MustVerifyEmail &&
-                    ! $request->user()->hasVerifiedEmail())) {
+                (! $request->user()->hasVerifiedEmail())) {
                return $request->expectsJson()
                    ? abort(403, 'Your email address is not verified.')
                    : Redirect::guest(URL::route($redirectToRoute ?: 'verification.notice'));
--- a/app/Http/Middleware/HandleInertiaRequests.php
+++ b/app/Http/Middleware/HandleInertiaRequests.php
@@ -41,6 +41,7 @@ class HandleInertiaRequests extends Middleware
    {
        $hasBilling = Module::has('Billing') && Module::isEnabled('Billing');
        $hasInvoicing = Module::has('Invoicing') && Module::isEnabled('Invoicing');
+        $hasServices = Module::has('Services') && Module::isEnabled('Services');

        /** @var BillingContract $billing */
        $billing = app(BillingContract::class);
@@ -50,7 +51,8 @@ class HandleInertiaRequests extends Middleware
        return array_merge(parent::share($request), [
            'has_billing_extension' => $hasBilling,
            'has_invoicing_extension' => $hasInvoicing,
-            'billing' => $billing !== null && $currentOrganization !== null ? [
+            'has_services_extension' => $hasServices,
+            'billing' => $currentOrganization !== null ? [
                'has_subscription' => $billing->hasSubscription($currentOrganization),
                'has_trial' => $billing->hasTrial($currentOrganization),
                'trial_until' => $billing->getTrialUntil($currentOrganization)?->toIso8601ZuluString(),
--- a/app/Http/Middleware/ShareInertiaData.php
+++ b/app/Http/Middleware/ShareInertiaData.php
@@ -26,7 +26,7 @@ class ShareInertiaData
    {
        /** @var PermissionStore $permissions */
        $permissions = app(PermissionStore::class);
-        Inertia::share(array_filter([
+        Inertia::share([
            'jetstream' => function () use ($request) {
                /** @var User|null $user */
                $user = $request->user();
@@ -101,7 +101,7 @@ class ShareInertiaData
                    return [$key => $bag->messages()];
                })->all();
            },
-        ]));
+        ]);

        return $next($request);
    }
--- a/app/Http/Requests/V1/Invitation/InvitationStoreRequest.php
+++ b/app/Http/Requests/V1/Invitation/InvitationStoreRequest.php
@@ -7,11 +7,8 @@ namespace App\Http\Requests\V1\Invitation;
 use App\Enums\Role;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
-use App\Models\OrganizationInvitation;
 use Illuminate\Contracts\Validation\ValidationRule;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Validation\Rule;
-use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;

 /**
 * @property Organization $organization
@@ -29,10 +26,6 @@ class InvitationStoreRequest extends BaseFormRequest
            'email' => [
                'required',
                'email',
-                UniqueEloquent::make(OrganizationInvitation::class, 'email', function (Builder $builder): Builder {
-                    /** @var Builder<OrganizationInvitation> $builder */
-                    return $builder->whereBelongsTo($this->organization, 'organization');
-                })->withCustomTranslation('validation.invitation_already_exists'),
            ],
            'role' => [
                'required',
--- a/app/Http/Requests/V1/Member/MemberDestroyRequest.php
+++ b/app/Http/Requests/V1/Member/MemberDestroyRequest.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\V1\Member;
+
+use App\Http\Requests\V1\BaseFormRequest;
+use App\Models\Organization;
+use Illuminate\Contracts\Validation\ValidationRule;
+
+/**
+ * @property Organization $organization
+ */
+class MemberDestroyRequest extends BaseFormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<string|ValidationRule>>
+     */
+    public function rules(): array
+    {
+        return [
+            'delete_related' => [
+                'string',
+                'in:true,false',
+            ],
+        ];
+    }
+
+    public function getDeleteRelated(): bool
+    {
+        return $this->input('delete_related', 'false') === 'true';
+    }
+}
--- a/app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php
+++ b/app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php
@@ -39,6 +39,12 @@ class OrganizationUpdateRequest extends BaseFormRequest
            'employees_can_see_billable_rates' => [
                'boolean',
            ],
+            'employees_can_manage_tasks' => [
+                'boolean',
+            ],
+            'prevent_overlapping_time_entries' => [
+                'boolean',
+            ],
            'number_format' => [
                Rule::enum(NumberFormat::class),
            ],
@@ -98,4 +104,14 @@ class OrganizationUpdateRequest extends BaseFormRequest
    {
        return $this->has('employees_can_see_billable_rates') ? $this->boolean('employees_can_see_billable_rates') : null;
    }
+
+    public function getEmployeesCanManageTasks(): ?bool
+    {
+        return $this->has('employees_can_manage_tasks') ? $this->boolean('employees_can_manage_tasks') : null;
+    }
+
+    public function getPreventOverlappingTimeEntries(): ?bool
+    {
+        return $this->has('prevent_overlapping_time_entries') ? $this->boolean('prevent_overlapping_time_entries') : null;
+    }
 }
--- a/app/Http/Requests/V1/Report/ReportStoreRequest.php
+++ b/app/Http/Requests/V1/Report/ReportStoreRequest.php
@@ -6,6 +6,7 @@ namespace App\Http\Requests\V1\Report;

 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryAggregationTypeInterval;
+use App\Enums\TimeEntryRoundingType;
 use App\Enums\Weekday;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
@@ -128,6 +129,18 @@ class ReportStoreRequest extends BaseFormRequest
                'nullable',
                'timezone:all',
            ],
+            // Rounding type defined where the end of each time entry should be rounded to. For example: nearest rounds the end to the nearest x minutes group. Rounding per time entry is activated if `rounding_type` and `rounding_minutes` is not null.
+            'properties.rounding_type' => [
+                'nullable',
+                'string',
+                Rule::enum(TimeEntryRoundingType::class),
+            ],
+            // Defines the length of the interval that the time entry rounding rounds to.
+            'properties.rounding_minutes' => [
+                'nullable',
+                'numeric',
+                'integer',
+            ],
        ];
    }

@@ -205,4 +218,22 @@ class ReportStoreRequest extends BaseFormRequest
    {
        return TimeEntryAggregationTypeInterval::from($this->input('properties.history_group'));
    }
+
+    public function getPropertyRoundingType(): ?TimeEntryRoundingType
+    {
+        if (! $this->has('properties.rounding_type') || $this->input('properties.rounding_type') === null) {
+            return null;
+        }
+
+        return TimeEntryRoundingType::from($this->input('properties.rounding_type'));
+    }
+
+    public function getPropertyRoundingMinutes(): ?int
+    {
+        if (! $this->has('properties.rounding_minutes') || $this->input('properties.rounding_minutes') === null) {
+            return null;
+        }
+
+        return (int) $this->input('properties.rounding_minutes');
+    }
 }
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateExportRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateExportRequest.php
@@ -7,6 +7,7 @@ namespace App\Http\Requests\V1\TimeEntry;
 use App\Enums\ExportFormat;
 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryAggregationTypeInterval;
+use App\Enums\TimeEntryRoundingType;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Client;
 use App\Models\Member;
@@ -164,6 +165,18 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
                'string',
                'in:true,false',
            ],
+            // Rounding type defined where the end of each time entry should be rounded to. For example: nearest rounds the end to the nearest x minutes group. Rounding per time entry is activated if `rounding_type` and `rounding_minutes` is not null.
+            'rounding_type' => [
+                'nullable',
+                'string',
+                Rule::enum(TimeEntryRoundingType::class),
+            ],
+            // Defines the length of the interval that the time entry rounding rounds to.
+            'rounding_minutes' => [
+                'nullable',
+                'numeric',
+                'integer',
+            ],
        ];
    }

@@ -211,4 +224,22 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
    {
        return ExportFormat::from($this->validated('format'));
    }
+
+    public function getRoundingType(): ?TimeEntryRoundingType
+    {
+        if (! $this->has('rounding_type') || $this->validated('rounding_type') === null) {
+            return null;
+        }
+
+        return TimeEntryRoundingType::from($this->validated('rounding_type'));
+    }
+
+    public function getRoundingMinutes(): ?int
+    {
+        if (! $this->has('rounding_minutes') || $this->validated('rounding_minutes') === null) {
+            return null;
+        }
+
+        return (int) $this->validated('rounding_minutes');
+    }
 }
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryAggregateRequest.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Http\Requests\V1\TimeEntry;

 use App\Enums\TimeEntryAggregationType;
+use App\Enums\TimeEntryRoundingType;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Client;
 use App\Models\Member;
@@ -146,6 +147,18 @@ class TimeEntryAggregateRequest extends BaseFormRequest
                'string',
                'in:true,false',
            ],
+            // Rounding type defined where the end of each time entry should be rounded to. For example: nearest rounds the end to the nearest x minutes group. Rounding per time entry is activated if `rounding_type` and `rounding_minutes` is not null.
+            'rounding_type' => [
+                'nullable',
+                'string',
+                Rule::enum(TimeEntryRoundingType::class),
+            ],
+            // Defines the length of the interval that the time entry rounding rounds to.
+            'rounding_minutes' => [
+                'nullable',
+                'numeric',
+                'integer',
+            ],
        ];
    }

@@ -173,4 +186,22 @@ class TimeEntryAggregateRequest extends BaseFormRequest
    {
        return $this->input('end') !== null ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('end'), 'UTC') : null;
    }
+
+    public function getRoundingType(): ?TimeEntryRoundingType
+    {
+        if (! $this->has('rounding_type') || $this->validated('rounding_type') === null) {
+            return null;
+        }
+
+        return TimeEntryRoundingType::from($this->validated('rounding_type'));
+    }
+
+    public function getRoundingMinutes(): ?int
+    {
+        if (! $this->has('rounding_minutes') || $this->validated('rounding_minutes') === null) {
+            return null;
+        }
+
+        return (int) $this->validated('rounding_minutes');
+    }
 }
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexExportRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexExportRequest.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Http\Requests\V1\TimeEntry;

 use App\Enums\ExportFormat;
+use App\Enums\TimeEntryRoundingType;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
@@ -133,6 +134,18 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
                'string',
                'in:true,false',
            ],
+            // Rounding type defined where the end of each time entry should be rounded to. For example: nearest rounds the end to the nearest x minutes group. Rounding per time entry is activated if `rounding_type` and `rounding_minutes` is not null.
+            'rounding_type' => [
+                'nullable',
+                'string',
+                Rule::enum(TimeEntryRoundingType::class),
+            ],
+            // Defines the length of the interval that the time entry rounding rounds to.
+            'rounding_minutes' => [
+                'nullable',
+                'numeric',
+                'integer',
+            ],
        ];
    }

@@ -170,4 +183,22 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
    {
        return ExportFormat::from($this->validated('format'));
    }
+
+    public function getRoundingType(): ?TimeEntryRoundingType
+    {
+        if (! $this->has('rounding_type') || $this->validated('rounding_type') === null) {
+            return null;
+        }
+
+        return TimeEntryRoundingType::from($this->validated('rounding_type'));
+    }
+
+    public function getRoundingMinutes(): ?int
+    {
+        if (! $this->has('rounding_minutes') || $this->validated('rounding_minutes') === null) {
+            return null;
+        }
+
+        return (int) $this->validated('rounding_minutes');
+    }
 }
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php
@@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace App\Http\Requests\V1\TimeEntry;

+use App\Enums\TimeEntryRoundingType;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Client;
 use App\Models\Member;
@@ -11,8 +12,10 @@ use App\Models\Organization;
 use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
+use Illuminate\Contracts\Validation\Rule as RuleContract;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Validation\Rule;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;

 /**
@@ -23,7 +26,7 @@ class TimeEntryIndexRequest extends BaseFormRequest
    /**
     * Get the validation rules that apply to the request.
     *
-     * @return array<string, array<string|ValidationRule>>
+     * @return array<string, array<string|ValidationRule|RuleContract>>
     */
    public function rules(): array
    {
@@ -136,6 +139,18 @@ class TimeEntryIndexRequest extends BaseFormRequest
                'string',
                'in:true,false',
            ],
+            // Rounding type defined where the end of each time entry should be rounded to. For example: nearest rounds the end to the nearest x minutes group. Rounding per time entry is activated if `rounding_type` and `rounding_minutes` is not null.
+            'rounding_type' => [
+                'nullable',
+                'string',
+                Rule::enum(TimeEntryRoundingType::class),
+            ],
+            // Defines the length of the interval that the time entry rounding rounds to.
+            'rounding_minutes' => [
+                'nullable',
+                'numeric',
+                'integer',
+            ],
        ];
    }

@@ -153,4 +168,22 @@ class TimeEntryIndexRequest extends BaseFormRequest
    {
        return $this->has('offset') ? (int) $this->validated('offset', 0) : 0;
    }
+
+    public function getRoundingType(): ?TimeEntryRoundingType
+    {
+        if (! $this->has('rounding_type') || $this->validated('rounding_type') === null) {
+            return null;
+        }
+
+        return TimeEntryRoundingType::from($this->validated('rounding_type'));
+    }
+
+    public function getRoundingMinutes(): ?int
+    {
+        if (! $this->has('rounding_minutes') || $this->validated('rounding_minutes') === null) {
+            return null;
+        }
+
+        return (int) $this->validated('rounding_minutes');
+    }
 }
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php
@@ -79,7 +79,7 @@ class TimeEntryStoreRequest extends BaseFormRequest
            'description' => [
                'nullable',
                'string',
-                'max:500',
+                'max:5000',
            ],
            // List of tag IDs
            'tags' => [
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateMultipleRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateMultipleRequest.php
@@ -79,7 +79,7 @@ class TimeEntryUpdateMultipleRequest extends BaseFormRequest
            'changes.description' => [
                'nullable',
                'string',
-                'max:500',
+                'max:5000',
            ],
            // List of tag IDs
            'changes.tags' => [
--- a/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php
+++ b/app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php
@@ -77,7 +77,7 @@ class TimeEntryUpdateRequest extends BaseFormRequest
            'description' => [
                'nullable',
                'string',
-                'max:500',
+                'max:5000',
            ],
            // List of tag IDs
            'tags' => [
--- a/app/Http/Resources/V1/Organization/OrganizationResource.php
+++ b/app/Http/Resources/V1/Organization/OrganizationResource.php
@@ -53,6 +53,10 @@ class OrganizationResource extends BaseResource
            'billable_rate' => $this->showBillableRate ? $this->resource->billable_rate : null,
            /** @var bool $employees_can_see_billable_rates Can members of the organization with role "employee" see the billable rates */
            'employees_can_see_billable_rates' => $this->resource->employees_can_see_billable_rates,
+            /** @var bool $employees_can_manage_tasks Can members of the organization with role "employee" manage tasks in public projects and projects they are assigned to */
+            'employees_can_manage_tasks' => $this->resource->employees_can_manage_tasks,
+            /** @var bool $prevent_overlapping_time_entries Prevent creating overlapping time entries (only new entries) */
+            'prevent_overlapping_time_entries' => $this->resource->prevent_overlapping_time_entries,
            /** @var string $currency Currency code (ISO 4217) */
            'currency' => $this->resource->currency,
            /** @var string $currency_symbol Currency symbol */
--- a/app/Http/Resources/V1/Project/ProjectCollection.php
+++ b/app/Http/Resources/V1/Project/ProjectCollection.php
@@ -8,15 +8,11 @@ use App\Http\Resources\PaginatedResourceCollection;
 use App\Models\Project;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
-use Illuminate\Pagination\LengthAwarePaginator;

 class ProjectCollection extends ResourceCollection implements PaginatedResourceCollection
 {
    private bool $showBillableRates;

-    /**
-     * @param  LengthAwarePaginator<Project>  $resource
-     */
    public function __construct($resource, bool $showBillableRates)
    {
        parent::__construct($resource);
--- a/app/Http/Resources/V1/Report/DetailedReportResource.php
+++ b/app/Http/Resources/V1/Report/DetailedReportResource.php
@@ -58,6 +58,10 @@ class DetailedReportResource extends BaseResource
                'tag_ids' => $this->resource->properties->tagIds?->toArray(),
                /** @var array<string>|null $task_ids Filter by task IDs, task IDs are OR combined */
                'task_ids' => $this->resource->properties->taskIds?->toArray(),
+                /** @var string|null $rounding_type Rounding type for time entries */
+                'rounding_type' => $this->resource->properties->roundingType?->value,
+                /** @var int|null $rounding_minutes Rounding minutes for time entries */
+                'rounding_minutes' => $this->resource->properties->roundingMinutes,
            ],
            /** @var string $created_at Date when the report was created */
            'created_at' => $this->formatDateTime($this->resource->created_at),
--- a/app/Mail/AuthApiTokenExpirationReminderMail.php
+++ b/app/Mail/AuthApiTokenExpirationReminderMail.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Mail;
+
+use App\Models\Passport\Token;
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\URL;
+
+class AuthApiTokenExpirationReminderMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public Token $token;
+
+    public User $user;
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct(Token $token, User $user)
+    {
+        $this->token = $token;
+        $this->user = $user;
+    }
+
+    /**
+     * Build the message.
+     */
+    public function build(): self
+    {
+        return $this->markdown('emails.auth-api-expiration-reminder', [
+            'profileUrl' => URL::to('user/profile'),
+            'tokenName' => $this->token->name,
+        ])
+            ->subject(__('Your API token will expire in 7 days!'));
+    }
+}
--- a/app/Mail/AuthApiTokenExpiredMail.php
+++ b/app/Mail/AuthApiTokenExpiredMail.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Mail;
+
+use App\Models\Passport\Token;
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\URL;
+
+class AuthApiTokenExpiredMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public Token $token;
+
+    public User $user;
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct(Token $token, User $user)
+    {
+        $this->token = $token;
+        $this->user = $user;
+    }
+
+    /**
+     * Build the message.
+     */
+    public function build(): self
+    {
+        return $this->markdown('emails.auth-api-token-expired', [
+            'profileUrl' => URL::to('user/profile'),
+            'tokenName' => $this->token->name,
+        ])
+            ->subject(__('Your API token has expired!'));
+    }
+}
--- a/app/Models/Audit.php
+++ b/app/Models/Audit.php
@@ -16,8 +16,8 @@ use OwenIt\Auditing\Models\Audit as PackageAuditModel;
 * @property string $event
 * @property string $auditable_type
 * @property string $auditable_id
- * @property array|null $old_values
- * @property array|null $new_values
+ * @property array<string, mixed>|null $old_values
+ * @property array<string, mixed>|null $new_values
 * @property string|null $url
 * @property string|null $ip_address
 * @property string|null $user_agent
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -7,6 +7,7 @@ namespace App\Models;
 use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\ClientFactory;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -47,7 +48,7 @@ class Client extends Model implements AuditableContract
    ];

    /**
-     * @return BelongsTo<Organization, Client>
+     * @return BelongsTo<Organization, $this>
     */
    public function organization(): BelongsTo
    {
@@ -55,13 +56,25 @@ class Client extends Model implements AuditableContract
    }

    /**
-     * @return HasMany<Project>
+     * @return HasMany<Project, $this>
     */
    public function projects(): HasMany
    {
        return $this->hasMany(Project::class, 'client_id');
    }

+    /**
+     * @param  Builder<Client>  $builder
+     * @return Builder<Client>
+     */
+    public function scopeVisibleByEmployee(Builder $builder, User $user): Builder
+    {
+        return $builder->whereHas('projects', function (Builder $builder) use ($user): Builder {
+            /** @var Builder<Project> $builder */
+            return $builder->visibleByEmployee($user);
+        });
+    }
+
    /**
     * @return Attribute<bool, never>
     */
--- a/app/Models/Member.php
+++ b/app/Models/Member.php
@@ -25,8 +25,8 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 * @property Carbon|null $updated_at
 * @property-read Organization $organization
 * @property-read User $user
- * @property-read Collection<ProjectMember> $projectMembers
- * @property-read Collection<TimeEntry> $timeEntries
+ * @property-read Collection<int, ProjectMember> $projectMembers
+ * @property-read Collection<int, TimeEntry> $timeEntries
 *
 * @method static MemberFactory factory()
 */
@@ -47,7 +47,7 @@ class Member extends JetstreamMembership implements AuditableContract
    protected $table = 'members';

    /**
-     * @return BelongsTo<User, Member>
+     * @return BelongsTo<User, $this>
     */
    public function user(): BelongsTo
    {
@@ -55,7 +55,7 @@ class Member extends JetstreamMembership implements AuditableContract
    }

    /**
-     * @return BelongsTo<Organization, Member>
+     * @return BelongsTo<Organization, $this>
     */
    public function organization(): BelongsTo
    {
@@ -63,7 +63,7 @@ class Member extends JetstreamMembership implements AuditableContract
    }

    /**
-     * @return HasMany<TimeEntry>
+     * @return HasMany<TimeEntry, $this>
     */
    public function timeEntries(): HasMany
    {
@@ -71,7 +71,7 @@ class Member extends JetstreamMembership implements AuditableContract
    }

    /**
-     * @return HasMany<ProjectMember>
+     * @return HasMany<ProjectMember, $this>
     */
    public function projectMembers(): HasMany
    {
--- a/app/Models/Organization.php
+++ b/app/Models/Organization.php
@@ -18,6 +18,7 @@ use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 use Laravel\Jetstream\Events\TeamCreated;
@@ -34,6 +35,7 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 * @property int|null $billable_rate
 * @property string $user_id
 * @property bool $employees_can_see_billable_rates
+ * @property bool $employees_can_manage_tasks
 * @property User $owner
 * @property Carbon|null $created_at
 * @property Carbon|null $updated_at
@@ -47,7 +49,7 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 * @property IntervalFormat $interval_format
 * @property TimeFormat $time_format
 *
- * @method HasMany<OrganizationInvitation> teamInvitations()
+ * @method HasMany<OrganizationInvitation, $this> teamInvitations()
 * @method static OrganizationFactory factory()
 */
 class Organization extends JetstreamTeam implements AuditableContract
@@ -69,6 +71,8 @@ class Organization extends JetstreamTeam implements AuditableContract
        'personal_team' => 'boolean',
        'currency' => 'string',
        'employees_can_see_billable_rates' => 'boolean',
+        'employees_can_manage_tasks' => 'boolean',
+        'prevent_overlapping_time_entries' => 'boolean',
        'number_format' => NumberFormat::class,
        'currency_format' => CurrencyFormat::class,
        'date_format' => DateFormat::class,
@@ -79,7 +83,7 @@ class Organization extends JetstreamTeam implements AuditableContract
    /**
     * The attributes that are mass assignable.
     *
-     * @var array<int, string>
+     * @var list<string>
     */
    protected $fillable = [
        'name',
@@ -125,7 +129,7 @@ class Organization extends JetstreamTeam implements AuditableContract
    /**
     * Get all the users that belong to the team.
     *
-     * @return BelongsToMany<User>
+     * @return BelongsToMany<User, $this, Pivot, 'membership'>
     */
    public function users(): BelongsToMany
    {
@@ -142,7 +146,7 @@ class Organization extends JetstreamTeam implements AuditableContract
    /**
     * Get the owner of the team.
     *
-     * @return BelongsTo<User, Organization>
+     * @return BelongsTo<User, $this>
     */
    public function owner(): BelongsTo
    {
@@ -150,7 +154,7 @@ class Organization extends JetstreamTeam implements AuditableContract
    }

    /**
-     * @return HasMany<Member>
+     * @return HasMany<Member, $this>
     */
    public function members(): HasMany
    {
@@ -158,7 +162,7 @@ class Organization extends JetstreamTeam implements AuditableContract
    }

    /**
-     * @return BelongsToMany<User>
+     * @return BelongsToMany<User, $this, Pivot, 'membership'>
     */
    public function realUsers(): BelongsToMany
    {
--- a/app/Models/OrganizationInvitation.php
+++ b/app/Models/OrganizationInvitation.php
@@ -53,7 +53,7 @@ class OrganizationInvitation extends JetstreamTeamInvitation implements Auditabl
    /**
     * Get the organization that the invitation belongs to.
     *
-     * @return BelongsTo<Organization, OrganizationInvitation>
+     * @return BelongsTo<Organization, $this>
     */
    public function organization(): BelongsTo
    {
@@ -63,7 +63,7 @@ class OrganizationInvitation extends JetstreamTeamInvitation implements Auditabl
    /**
     * Get the organization that the invitation belongs to.
     *
-     * @return BelongsTo<Organization, OrganizationInvitation>
+     * @return BelongsTo<Organization, $this>
     */
    public function team(): BelongsTo
    {
--- a/app/Models/Passport/AuthCode.php
+++ b/app/Models/Passport/AuthCode.php
@@ -4,6 +4,26 @@ declare(strict_types=1);

 namespace App\Models\Passport;

+use App\Models\User;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Support\Carbon;
 use Laravel\Passport\AuthCode as PassportAuthCode;

-class AuthCode extends PassportAuthCode {}
+/**
+ * @property string $id
+ * @property string $user_id
+ * @property string $client_id
+ * @property string|null $scopes
+ * @property bool $revoked
+ * @property Carbon $expires_at
+ */
+class AuthCode extends PassportAuthCode
+{
+    /**
+     * @return BelongsTo<User, $this>
+     */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+}
--- a/app/Models/Passport/Client.php
+++ b/app/Models/Passport/Client.php
@@ -5,22 +5,36 @@ declare(strict_types=1);
 namespace App\Models\Passport;

 use Database\Factories\Passport\ClientFactory;
+use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Carbon;
 use Laravel\Passport\Client as PassportClient;

 /**
 * @property string $id
- * @property string|null $user_id
+ * @property string|null $owner_id
+ * @property string|null $owner_type
 * @property string $name
 * @property string|null $secret
 * @property string|null $provider
- * @property string $redirect
- * @property bool $personal_access_client
- * @property bool $password_client
+ * @property array<string> $grant_types
+ * @property array<string> $redirect_uris
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
 * @property bool $revoked
 */
 class Client extends PassportClient
 {
    /** @use HasFactory<ClientFactory> */
    use HasFactory;
+
+    /**
+     * Create a new factory instance for the model.
+     *
+     * @return ClientFactory
+     */
+    protected static function newFactory(): Factory
+    {
+        return ClientFactory::new();
+    }
 }
--- a/app/Models/Passport/PersonalAccessClient.php
+++ b/app/Models/Passport/PersonalAccessClient.php
@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Models\Passport;
-
-use Laravel\Passport\PersonalAccessClient as PassportPersonalAccessClient;
-
-class PersonalAccessClient extends PassportPersonalAccessClient {}
--- a/app/Models/Passport/Token.php
+++ b/app/Models/Passport/Token.php
@@ -4,7 +4,9 @@ declare(strict_types=1);

 namespace App\Models\Passport;

+use App\Models\User;
 use Database\Factories\Passport\TokenFactory;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Carbon;
@@ -17,9 +19,15 @@ use Laravel\Passport\Token as PassportToken;
 * @property null|string $name
 * @property array<string> $scopes
 * @property bool $revoked
+ * @property Carbon|null $reminder_sent_at
+ * @property Carbon|null $expired_info_sent_at
 * @property Carbon|null $created_at
 * @property Carbon|null $updated_at
 * @property Carbon|null $expires_at
+ * @property-read Client|null $client
+ * @property-read User|null $user
+ *
+ * @method Builder<Token> isApiToken(bool $isApiToken = true)
 */
 class Token extends PassportToken
 {
@@ -29,10 +37,60 @@ class Token extends PassportToken
    /**
     * Get the client that the token belongs to.
     *
-     * @return BelongsTo<Client, Token>
+     * @return BelongsTo<Client, $this>
     */
+    // @phpstan-ignore method.childReturnType
    public function client(): BelongsTo
    {
        return $this->belongsTo(Client::class, 'client_id', 'id');
    }
+
+    /**
+     * Get the user that the token belongs to.
+     *
+     * @deprecated Will be removed in a future Laravel version.
+     *
+     * @return BelongsTo<User, $this>
+     */
+    // @phpstan-ignore method.childReturnType
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+
+    /**
+     * Get the attributes that should be cast.
+     *
+     * @return array<string, string>
+     */
+    protected function casts(): array
+    {
+        return [
+            'scopes' => 'array',
+            'revoked' => 'bool',
+            'expires_at' => 'datetime',
+            'reminder_sent_at' => 'datetime',
+            'expired_info_sent_at' => 'datetime',
+        ];
+    }
+
+    /**
+     * @param  Builder<static>  $query
+     * @return Builder<static>
+     */
+    public function scopeIsApiToken(Builder $query, bool $isApiToken = true): Builder
+    {
+        if ($isApiToken) {
+            return $query->whereHas('client', function (Builder $query): void {
+                /** @var Builder<Client> $query */
+                $query->whereJsonContains('grant_types', 'personal_access');
+            });
+        } else {
+            return $query->whereHas('client', function (Builder $query): void {
+                /** @var Builder<Client> $query */
+                $query->whereJsonDoesntContain('grant_types', 'personal_access');
+            });
+        }
+
+    }
 }
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -137,7 +137,7 @@ class Project extends Model implements AuditableContract
    }

    /**
-     * @return BelongsTo<Organization, Project>
+     * @return BelongsTo<Organization, $this>
     */
    public function organization(): BelongsTo
    {
@@ -145,7 +145,7 @@ class Project extends Model implements AuditableContract
    }

    /**
-     * @return BelongsTo<Client, Project>
+     * @return BelongsTo<Client, $this>
     */
    public function client(): BelongsTo
    {
@@ -153,7 +153,7 @@ class Project extends Model implements AuditableContract
    }

    /**
-     * @return HasMany<ProjectMember>
+     * @return HasMany<ProjectMember, $this>
     */
    public function members(): HasMany
    {
@@ -161,7 +161,7 @@ class Project extends Model implements AuditableContract
    }

    /**
-     * @return HasMany<Task>
+     * @return HasMany<Task, $this>
     */
    public function tasks(): HasMany
    {
@@ -169,7 +169,7 @@ class Project extends Model implements AuditableContract
    }

    /**
-     * @return HasMany<TimeEntry>
+     * @return HasMany<TimeEntry, $this>
     */
    public function timeEntries(): HasMany
    {
--- a/app/Models/ProjectMember.php
+++ b/app/Models/ProjectMember.php
@@ -48,7 +48,7 @@ class ProjectMember extends Model implements AuditableContract
    ];

    /**
-     * @return BelongsTo<Project, ProjectMember>
+     * @return BelongsTo<Project, $this>
     */
    public function project(): BelongsTo
    {
@@ -58,7 +58,7 @@ class ProjectMember extends Model implements AuditableContract
    /**
     * @deprecated Use member relationship instead
     *
-     * @return BelongsTo<User, ProjectMember>
+     * @return BelongsTo<User, $this>
     */
    public function user(): BelongsTo
    {
@@ -66,7 +66,7 @@ class ProjectMember extends Model implements AuditableContract
    }

    /**
-     * @return BelongsTo<Member, ProjectMember>
+     * @return BelongsTo<Member, $this>
     */
    public function member(): BelongsTo
    {
--- a/app/Models/Report.php
+++ b/app/Models/Report.php
@@ -55,7 +55,7 @@ class Report extends Model
    }

    /**
-     * @return BelongsTo<Organization, Report>
+     * @return BelongsTo<Organization, $this>
     */
    public function organization(): BelongsTo
    {
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -22,7 +22,7 @@ use Staudenmeir\EloquentJsonRelations\Relations\HasManyJson;
 * @property string $organization_id
 * @property Carbon|null $created_at
 * @property Carbon|null $updated_at
- * @property-read Collection<TimeEntry> $timeEntries
+ * @property-read Collection<int, TimeEntry> $timeEntries
 * @property-read Organization $organization
 *
 * @method static TagFactory factory()
@@ -47,7 +47,7 @@ class Tag extends Model implements AuditableContract
    ];

    /**
-     * @return BelongsTo<Organization, Tag>
+     * @return BelongsTo<Organization, $this>
     */
    public function organization(): BelongsTo
    {
--- a/app/Models/Task.php
+++ b/app/Models/Task.php
@@ -120,7 +120,7 @@ class Task extends Model implements AuditableContract
    }

    /**
-     * @return BelongsTo<Project, Task>
+     * @return BelongsTo<Project, $this>
     */
    public function project(): BelongsTo
    {
@@ -128,7 +128,7 @@ class Task extends Model implements AuditableContract
    }

    /**
-     * @return BelongsTo<Organization, Task>
+     * @return BelongsTo<Organization, $this>
     */
    public function organization(): BelongsTo
    {
@@ -136,7 +136,7 @@ class Task extends Model implements AuditableContract
    }

    /**
-     * @return HasMany<TimeEntry>
+     * @return HasMany<TimeEntry, $this>
     */
    public function timeEntries(): HasMany
    {
--- a/app/Models/TimeEntry.php
+++ b/app/Models/TimeEntry.php
@@ -28,7 +28,7 @@ use Staudenmeir\EloquentJsonRelations\Relations\BelongsToJson;
 * @property Carbon|null $end
 * @property int|null $billable_rate Billable rate per hour in cents
 * @property bool $billable
- * @property array $tags
+ * @property array<string> $tags
 * @property string $user_id
 * @property string $member_id
 * @property bool $is_imported
@@ -45,7 +45,7 @@ use Staudenmeir\EloquentJsonRelations\Relations\BelongsToJson;
 * @property-read Client|null $client
 * @property string|null $task_id
 * @property-read Task|null $task
- * @property-read Collection<Tag> $tagsRelation
+ * @property-read Collection<int, Tag> $tagsRelation
 *
 * @method Builder<TimeEntry> hasTag(Tag $tag)
 * @method static TimeEntryFactory factory()
@@ -77,6 +77,26 @@ class TimeEntry extends Model implements AuditableContract
        'still_active_email_sent_at' => 'datetime',
    ];

+    public const array SELECT_COLUMNS = [
+        'id',
+        'description',
+        'start',
+        'end',
+        'billable_rate',
+        'billable',
+        'user_id',
+        'organization_id',
+        'project_id',
+        'task_id',
+        'tags',
+        'created_at',
+        'updated_at',
+        'member_id',
+        'client_id',
+        'is_imported',
+        'still_active_email_sent_at',
+    ];
+
    /**
     * The attributes that are computed. (f.e. for performance reasons)
     * These attributes can be regenerated at any time.
@@ -154,7 +174,7 @@ class TimeEntry extends Model implements AuditableContract
    }

    /**
-     * @return BelongsTo<User, TimeEntry>
+     * @return BelongsTo<User, $this>
     */
    public function user(): BelongsTo
    {
@@ -162,7 +182,7 @@ class TimeEntry extends Model implements AuditableContract
    }

    /**
-     * @return BelongsTo<Member, TimeEntry>
+     * @return BelongsTo<Member, $this>
     */
    public function member(): BelongsTo
    {
@@ -170,7 +190,7 @@ class TimeEntry extends Model implements AuditableContract
    }

    /**
-     * @return BelongsTo<Organization, TimeEntry>
+     * @return BelongsTo<Organization, $this>
     */
    public function organization(): BelongsTo
    {
@@ -178,7 +198,7 @@ class TimeEntry extends Model implements AuditableContract
    }

    /**
-     * @return BelongsTo<Project, TimeEntry>
+     * @return BelongsTo<Project, $this>
     */
    public function project(): BelongsTo
    {
@@ -186,7 +206,7 @@ class TimeEntry extends Model implements AuditableContract
    }

    /**
-     * @return BelongsTo<Task, TimeEntry>
+     * @return BelongsTo<Task, $this>
     */
    public function task(): BelongsTo
    {
@@ -196,7 +216,7 @@ class TimeEntry extends Model implements AuditableContract
    /**
     * This relation can be reconstructed via the task relation. It is only here for performance reasons.
     *
-     * @return BelongsTo<Client, TimeEntry>
+     * @return BelongsTo<Client, $this>
     */
    public function client(): BelongsTo
    {
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -19,6 +19,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Carbon;
@@ -27,6 +28,7 @@ use Laravel\Fortify\TwoFactorAuthenticatable;
 use Laravel\Jetstream\HasProfilePhoto;
 use Laravel\Jetstream\HasTeams;
 use Laravel\Passport\AuthCode;
+use Laravel\Passport\Contracts\OAuthenticatable;
 use Laravel\Passport\HasApiTokens;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;

@@ -52,13 +54,13 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 * @property Collection<int, TimeEntry> $timeEntries
 * @property Member $membership
 *
- * @method HasMany<Organization> ownedTeams()
+ * @method HasMany<Organization, $this> ownedTeams()
 * @method static UserFactory factory()
 * @method static Builder<User> query()
 * @method Builder<User> belongsToOrganization(Organization $organization)
 * @method Builder<User> active()
 */
-class User extends Authenticatable implements AuditableContract, FilamentUser, MustVerifyEmail
+class User extends Authenticatable implements AuditableContract, FilamentUser, MustVerifyEmail, OAuthenticatable
 {
    use CustomAuditable;
    use HasApiTokens;
@@ -75,7 +77,7 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
    /**
     * The attributes that are mass assignable.
     *
-     * @var array<int, string>
+     * @var list<string>
     */
    protected $fillable = [
        'name',
@@ -86,7 +88,7 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
    /**
     * The attributes that should be hidden for serialization.
     *
-     * @var array<int, string>
+     * @var list<string>
     */
    protected $hidden = [
        'password',
@@ -143,7 +145,7 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
    }

    /**
-     * @return BelongsToMany<Organization>
+     * @return BelongsToMany<Organization, $this, Pivot, 'membership'>
     */
    public function organizations(): BelongsToMany
    {
@@ -158,7 +160,7 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
    }

    /**
-     * @return HasMany<TimeEntry>
+     * @return HasMany<TimeEntry, $this>
     */
    public function timeEntries(): HasMany
    {
@@ -166,7 +168,7 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
    }

    /**
-     * @return BelongsTo<Organization, User>
+     * @return BelongsTo<Organization, $this>
     */
    public function currentOrganization(): BelongsTo
    {
@@ -174,7 +176,7 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
    }

    /**
-     * @return HasMany<ProjectMember>
+     * @return HasMany<ProjectMember, $this>
     */
    public function projectMembers(): HasMany
    {
@@ -182,7 +184,7 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
    }

    /**
-     * @return HasMany<Token>
+     * @return HasMany<Token, $this>
     */
    public function accessTokens(): HasMany
    {
@@ -190,24 +192,13 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
    }

    /**
-     * @return HasMany<AuthCode>
+     * @return HasMany<AuthCode, $this>
     */
    public function authCodes(): HasMany
    {
        return $this->hasMany(AuthCode::class);
    }

-    /**
-     * Get the access tokens for the user.
-     *
-     * @return HasMany<Token>
-     */
-    public function tokens(): HasMany
-    {
-        return $this->hasMany(Token::class, 'user_id')
-            ->orderBy('created_at', 'desc');
-    }
-
    /**
     * @param  Builder<User>  $builder
     */
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -7,7 +7,6 @@ namespace App\Providers;
 use App\Models\Organization;
 use App\Models\Passport\AuthCode;
 use App\Models\Passport\Client;
-use App\Models\Passport\PersonalAccessClient;
 use App\Models\Passport\RefreshToken;
 use App\Models\Passport\Token;
 use App\Policies\OrganizationPolicy;
@@ -51,7 +50,8 @@ class AuthServiceProvider extends ServiceProvider
        Passport::useRefreshTokenModel(RefreshToken::class);
        Passport::useAuthCodeModel(AuthCode::class);
        Passport::useClientModel(Client::class);
-        Passport::usePersonalAccessClientModel(PersonalAccessClient::class);
+
+        Passport::authorizationView('auth.oauth.authorize');

        // Passport::tokensExpireIn(now()->addDays(15));
        // Passport::refreshTokensExpireIn(now()->addDays(30));
--- a/app/Providers/JetstreamServiceProvider.php
+++ b/app/Providers/JetstreamServiceProvider.php
@@ -94,8 +94,11 @@ class JetstreamServiceProvider extends ServiceProvider
            'tasks:view',
            'tasks:view:all',
            'tasks:create',
+            'tasks:create:all',
            'tasks:update',
+            'tasks:update:all',
            'tasks:delete',
+            'tasks:delete:all',
            'time-entries:view:all',
            'time-entries:create:all',
            'time-entries:update:all',
@@ -109,6 +112,7 @@ class JetstreamServiceProvider extends ServiceProvider
            'tags:update',
            'tags:delete',
            'clients:view',
+            'clients:view:all',
            'clients:create',
            'clients:update',
            'clients:delete',
@@ -157,8 +161,11 @@ class JetstreamServiceProvider extends ServiceProvider
            'tasks:view',
            'tasks:view:all',
            'tasks:create',
+            'tasks:create:all',
            'tasks:update',
+            'tasks:update:all',
            'tasks:delete',
+            'tasks:delete:all',
            'time-entries:view:all',
            'time-entries:create:all',
            'time-entries:update:all',
@@ -172,6 +179,7 @@ class JetstreamServiceProvider extends ServiceProvider
            'tags:update',
            'tags:delete',
            'clients:view',
+            'clients:view:all',
            'clients:create',
            'clients:update',
            'clients:delete',
@@ -187,6 +195,7 @@ class JetstreamServiceProvider extends ServiceProvider
            'members:invite-placeholder',
            'members:make-placeholder',
            'members:merge-into',
+            'members:delete',
            'members:update',
            'reports:view',
            'reports:create',
@@ -216,8 +225,11 @@ class JetstreamServiceProvider extends ServiceProvider
            'tasks:view',
            'tasks:view:all',
            'tasks:create',
+            'tasks:create:all',
            'tasks:update',
+            'tasks:update:all',
            'tasks:delete',
+            'tasks:delete:all',
            'time-entries:view:all',
            'time-entries:create:all',
            'time-entries:update:all',
@@ -231,6 +243,7 @@ class JetstreamServiceProvider extends ServiceProvider
            'tags:update',
            'tags:delete',
            'clients:view',
+            'clients:view:all',
            'clients:create',
            'clients:update',
            'clients:delete',
@@ -255,12 +268,13 @@ class JetstreamServiceProvider extends ServiceProvider
            'projects:view',
            'tags:view',
            'tasks:view',
+            'clients:view',
            'time-entries:view:own',
            'time-entries:create:own',
            'time-entries:update:own',
            'time-entries:delete:own',
            'organizations:view',
-        ])->description('Employees have the ability to read, create, and update their own time entries and they can see the projects that they are members of.');
+        ])->description('Employees have the ability to read, create, and update their own time entries, they can see the projects that they are members of and the clients they are assigned to.');

        Jetstream::role(Role::Placeholder->value, 'Placeholder', [
        ])->description('Placeholders are used for importing data. They cannot log in and have no permissions.');
--- a/app/Service/CurrencyService.php
+++ b/app/Service/CurrencyService.php
@@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace App\Service;

+use Brick\Money\ISOCurrencyProvider;
 use Brick\Money\Money;

 class CurrencyService
@@ -374,4 +375,12 @@ class CurrencyService

        return $currencyCode;
    }
+
+    public function getRandomCurrencyCode(): string
+    {
+        $currencies = ISOCurrencyProvider::getInstance()->getAvailableCurrencies();
+        $currencyCodes = array_keys($currencies);
+
+        return $currencyCodes[array_rand($currencyCodes)];
+    }
 }
--- a/app/Service/DashboardService.php
+++ b/app/Service/DashboardService.php
@@ -266,7 +266,8 @@ class DashboardService
               ) as aggregate'))
            ->where('billable', '=', true)
            ->whereNotNull('billable_rate')
-            ->where('user_id', '=', $user->id);
+            ->where('user_id', '=', $user->getKey())
+            ->where('organization_id', '=', $organization->getKey());

        $query = $this->constrainDateByPossibleDates($query, $possibleDays, $timezone);
        /** @var Collection<int, object{aggregate: int}> $resultDb */
--- a/app/Service/Dto/ReportPropertiesDto.php
+++ b/app/Service/Dto/ReportPropertiesDto.php
@@ -6,6 +6,7 @@ namespace App\Service\Dto;

 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryAggregationTypeInterval;
+use App\Enums\TimeEntryRoundingType;
 use App\Enums\Weekday;
 use Illuminate\Contracts\Database\Eloquent\Castable;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
@@ -59,6 +60,10 @@ class ReportPropertiesDto implements Castable
     */
    public ?Collection $taskIds = null;

+    public ?TimeEntryRoundingType $roundingType = null;
+
+    public ?int $roundingMinutes = null;
+
    /**
     * Get the caster class to use when casting from / to this cast target.
     *
@@ -115,13 +120,14 @@ class ReportPropertiesDto implements Castable
                $dto->historyGroup = TimeEntryAggregationTypeInterval::from($data->historyGroup);
                $dto->weekStart = Weekday::from($data->weekStart);
                $dto->timezone = $data->timezone;
+                // Note: roundingType was added later so it is possible that the value is missing in persisted reports in the DB
+                $dto->roundingType = isset($data->roundingType) ? TimeEntryRoundingType::from($data->roundingType) : null;
+                // Note: roundingMinutes was added later so it is possible that the value is missing in persisted reports in the DB
+                $dto->roundingMinutes = isset($data->roundingMinutes) ? (int) $data->roundingMinutes : null;

                return $dto;
            }

-            /**
-             * @param  ReportPropertiesDto  $value
-             */
            public function set(Model $model, string $key, mixed $value, array $attributes): string
            {
                if (! ($value instanceof ReportPropertiesDto)) {
@@ -143,6 +149,8 @@ class ReportPropertiesDto implements Castable
                    'historyGroup' => $value->historyGroup->value,
                    'weekStart' => $value->weekStart->value,
                    'timezone' => $value->timezone,
+                    'roundingType' => $value->roundingType?->value,
+                    'roundingMinutes' => $value->roundingMinutes,
                ];

                $jsonString = json_encode($data);
--- a/app/Service/Export/ExportService.php
+++ b/app/Service/Export/ExportService.php
@@ -167,7 +167,7 @@ class ExportService
                            $client->id,
                            $client->name,
                            $client->organization_id,
-                            $client->archived_at ?? '',
+                            $client->archived_at?->toIso8601ZuluString() ?? '',
                            $client->created_at?->toIso8601ZuluString() ?? '',
                            $client->updated_at?->toIso8601ZuluString() ?? '',
                        ]);
--- a/app/Service/Import/Importers/ClockifyTimeEntriesImporter.php
+++ b/app/Service/Import/Importers/ClockifyTimeEntriesImporter.php
@@ -112,7 +112,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                $timeEntry->project_id = $projectId;
                $timeEntry->client_id = $clientId;
                $timeEntry->organization_id = $this->organization->id;
-                if (strlen($record['Description']) > 500) {
+                if (strlen($record['Description']) > 5000) {
                    throw new ImportException('Time entry description is too long');
                }
                $timeEntry->description = $record['Description'];
--- a/app/Service/Import/Importers/HarvestTimeEntriesImporter.php
+++ b/app/Service/Import/Importers/HarvestTimeEntriesImporter.php
@@ -107,7 +107,7 @@ class HarvestTimeEntriesImporter extends DefaultImporter
                $timeEntry->project_id = $projectId;
                $timeEntry->client_id = $clientId;
                $timeEntry->organization_id = $this->organization->id;
-                if (strlen($record['Notes']) > 500) {
+                if (strlen($record['Notes']) > 5000) {
                    throw new ImportException('Time entry note is too long');
                }
                $timeEntry->description = $record['Notes'];
--- a/app/Service/Import/Importers/SolidtimeImporter.php
+++ b/app/Service/Import/Importers/SolidtimeImporter.php
@@ -247,7 +247,7 @@ class SolidtimeImporter extends DefaultImporter
                $timeEntry->project_id = $projectId;
                $timeEntry->client_id = $clientId;
                $timeEntry->organization_id = $this->organization->id;
-                if (strlen($timeEntryRow['description']) > 500) {
+                if (strlen($timeEntryRow['description']) > 5000) {
                    throw new ImportException('Time entry description is too long');
                }
                $timeEntry->description = $timeEntryRow['description'];
--- a/app/Service/InvitationService.php
+++ b/app/Service/InvitationService.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Service;

 use App\Enums\Role;
+use App\Exceptions\Api\InvitationForTheEmailAlreadyExistsApiException;
 use App\Exceptions\Api\UserIsAlreadyMemberOfOrganizationApiException;
 use App\Mail\OrganizationInvitationMail;
 use App\Models\Member;
@@ -16,7 +17,7 @@ use Laravel\Jetstream\Events\InvitingTeamMember;
 class InvitationService
 {
    /**
-     * @throws UserIsAlreadyMemberOfOrganizationApiException
+     * @throws UserIsAlreadyMemberOfOrganizationApiException|InvitationForTheEmailAlreadyExistsApiException
     */
    public function inviteUser(Organization $organization, string $email, Role $role): OrganizationInvitation
    {
@@ -28,6 +29,13 @@ class InvitationService
            throw new UserIsAlreadyMemberOfOrganizationApiException;
        }

+        if (OrganizationInvitation::query()
+            ->where('email', $email)
+            ->whereBelongsTo($organization, 'organization')
+            ->exists()) {
+            throw new InvitationForTheEmailAlreadyExistsApiException;
+        }
+
        InvitingTeamMember::dispatch($organization, $email, $role->value);

        $invitation = new OrganizationInvitation;
--- a/app/Service/MemberService.php
+++ b/app/Service/MemberService.php
@@ -45,6 +45,9 @@ class MemberService
            $member->organization()->associate($organization);
            $member->role = $role->value;
            $member->save();
+
+            $user->currentOrganization()->associate($organization);
+            $user->save();
        });

        if (! $asSuperAdmin) {
@@ -58,19 +61,41 @@ class MemberService
     * @throws CanNotRemoveOwnerFromOrganization
     * @throws EntityStillInUseApiException
     */
-    public function removeMember(Member $member, Organization $organization): void
+    public function removeMember(Member $member, Organization $organization, bool $withRelations = false): void
    {
-        if (TimeEntry::query()->where('user_id', $member->user_id)->whereBelongsTo($organization, 'organization')->exists()) {
-            throw new EntityStillInUseApiException('member', 'time_entry');
-        }
-        if (ProjectMember::query()->whereBelongsToOrganization($organization)->where('user_id', $member->user_id)->exists()) {
-            throw new EntityStillInUseApiException('member', 'project_member');
-        }
        if ($member->role === Role::Owner->value) {
            throw new CanNotRemoveOwnerFromOrganization;
        }

+        $user = $member->user;
+        $isPlaceholder = $user->is_placeholder;
+
+        if (! $isPlaceholder && $user->current_team_id === $member->organization_id) {
+            $user->currentTeam()->disassociate();
+            $user->save();
+        }
+
+        if ($withRelations) {
+            TimeEntry::query()->where('user_id', $member->user_id)->whereBelongsTo($organization, 'organization')->delete();
+            ProjectMember::query()->whereBelongsToOrganization($organization)->where('user_id', $member->user_id)->delete();
+        } else {
+            if (TimeEntry::query()->where('user_id', $member->user_id)->whereBelongsTo($organization, 'organization')->exists()) {
+                throw new EntityStillInUseApiException('member', 'time_entry');
+            }
+            if (ProjectMember::query()->whereBelongsToOrganization($organization)->where('user_id', $member->user_id)->exists()) {
+                throw new EntityStillInUseApiException('member', 'project_member');
+            }
+        }
+
        $member->delete();
+
+        if ($isPlaceholder) {
+            $user->delete();
+        } else {
+            $this->userService->makeSureUserHasAtLeastOneOrganization($user);
+            $this->userService->makeSureUserHasCurrentOrganization($user);
+        }
+
        MemberRemoved::dispatch($member, $organization);
    }

--- a/app/Service/PermissionStore.php
+++ b/app/Service/PermissionStore.php
@@ -71,7 +71,19 @@ class PermissionStore
        /** @var Role|null $roleObj */
        $roleObj = Jetstream::findRole($role);

-        return $roleObj?->permissions ?? [];
+        $permissions = $roleObj->permissions ?? [];
+
+        // If the organization allows employees to manage tasks and the user is an employee,
+        // add the task management permissions for accessible projects
+        if ($role === \App\Enums\Role::Employee->value && $organization->employees_can_manage_tasks) {
+            $permissions = array_merge($permissions, [
+                'tasks:create',
+                'tasks:update',
+                'tasks:delete',
+            ]);
+        }
+
+        return $permissions;
    }

    /**
--- a/app/Service/TimeEntryAggregationService.php
+++ b/app/Service/TimeEntryAggregationService.php
@@ -6,9 +6,11 @@ namespace App\Service;

 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryAggregationTypeInterval;
+use App\Enums\TimeEntryRoundingType;
 use App\Enums\Weekday;
 use App\Models\Client;
 use App\Models\Project;
+use App\Models\Tag;
 use App\Models\Task;
 use App\Models\TimeEntry;
 use App\Models\User;
@@ -16,6 +18,7 @@ use Carbon\CarbonTimeZone;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;

 class TimeEntryAggregationService
@@ -41,12 +44,24 @@ class TimeEntryAggregationService
     *       cost: int|null
     * }
     */
-    public function getAggregatedTimeEntries(Builder $timeEntriesQuery, ?TimeEntryAggregationType $group1Type, ?TimeEntryAggregationType $group2Type, string $timezone, Weekday $startOfWeek, bool $fillGapsInTimeGroups, ?Carbon $start, ?Carbon $end, bool $showBillableRate): array
+    public function getAggregatedTimeEntries(Builder $timeEntriesQuery, ?TimeEntryAggregationType $group1Type, ?TimeEntryAggregationType $group2Type, string $timezone, Weekday $startOfWeek, bool $fillGapsInTimeGroups, ?Carbon $start, ?Carbon $end, bool $showBillableRate, ?TimeEntryRoundingType $roundingType, ?int $roundingMinutes): array
    {
        $fillGapsInTimeGroupsIsPossible = $fillGapsInTimeGroups && $start !== null && $end !== null;
+        /** @var Builder<TimeEntry> $baseTotalsQuery */
+        $baseTotalsQuery = $timeEntriesQuery->clone();
        $group1Select = null;
        $group2Select = null;
        $groupBy = null;
+        // If any grouping is by tag, expand rows per tag and ensure a NULL row for entries without tags
+        if (($group1Type === TimeEntryAggregationType::Tag) || ($group2Type === TimeEntryAggregationType::Tag)) {
+            $timeEntriesQuery->crossJoin(DB::raw(
+                "LATERAL (\n".
+                "  SELECT jsonb_array_elements_text(coalesce(tags, '[]'::jsonb)) AS tag\n".
+                "  UNION ALL\n".
+                "  SELECT ''::text AS tag WHERE coalesce(jsonb_array_length(tags), 0) = 0\n".
+                ') AS tag(tag)'
+            ));
+        }
        if ($group1Type !== null) {
            $group1Select = $this->getGroupByQuery($group1Type, $timezone, $startOfWeek);
            $groupBy = ['group_1'];
@@ -56,15 +71,14 @@ class TimeEntryAggregationService
            }
        }

+        $startRawSelect = app(TimeEntryService::class)->getStartSelectRawForRounding($roundingType, $roundingMinutes);
+        $endRawSelect = app(TimeEntryService::class)->getEndSelectRawForRounding($roundingType, $roundingMinutes);
+
        $timeEntriesQuery->selectRaw(
            ($group1Select !== null ? $group1Select.' as group_1,' : '').
            ($group2Select !== null ? $group2Select.' as group_2,' : '').
-            ' round(sum(extract(epoch from (coalesce("end", now()) - start)))) as aggregate,'.
-            ' round(
-                  sum(
-                      extract(epoch from (coalesce("end", now()) - start)) * (coalesce(billable_rate, 0)::float/60/60)
-                  )
-              ) as cost'
+            ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')))) as aggregate,'.
+            ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')) * (coalesce(billable_rate, 0)::float/60/60))) as cost'
        );
        if ($groupBy !== null) {
            $timeEntriesQuery->groupBy($groupBy);
@@ -84,6 +98,26 @@ class TimeEntryAggregationService
            $group1Response = [];
            $group1ResponseSum = 0;
            $group1ResponseCost = 0;
+            // If Tag is subgroup, prepare base totals per primary group without tag expansion
+            $baseTotalsPerGroup1Map = [];
+            if ($group2Type === TimeEntryAggregationType::Tag) {
+                $baseTotalsPerGroup1Query = $baseTotalsQuery->clone();
+                $baseTotalsPerGroup1 = $baseTotalsPerGroup1Query
+                    ->selectRaw(
+                        $group1Select.' as group_1,'.
+                        ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')))) as aggregate,'.
+                        ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')) * (coalesce(billable_rate, 0)::float/60/60))) as cost'
+                    )
+                    ->groupBy('group_1')
+                    ->get();
+                foreach ($baseTotalsPerGroup1 as $row) {
+                    /** @var object{group_1: mixed, aggregate: int|null, cost: int|null} $row */
+                    $baseTotalsPerGroup1Map[(string) ($row->group_1 ?? '')] = [
+                        'aggregate' => (int) ($row->aggregate ?? 0),
+                        'cost' => (int) ($row->cost ?? 0),
+                    ];
+                }
+            }
            foreach ($groupedAggregates as $group1 => $group1Aggregates) {
                /** @var string|int $group1 */
                $group2Response = [];
@@ -103,6 +137,14 @@ class TimeEntryAggregationService
                        $group2ResponseSum += (int) $aggregate->get(0)->aggregate;
                        $group2ResponseCost += (int) $aggregate->get(0)->cost;
                    }
+                    // Override primary group totals when Tag is subgroup to avoid double counting
+                    if ($group2Type === TimeEntryAggregationType::Tag) {
+                        $keyForMap = (string) $group1;
+                        if (array_key_exists($keyForMap, $baseTotalsPerGroup1Map)) {
+                            $group2ResponseSum = $baseTotalsPerGroup1Map[$keyForMap]['aggregate'];
+                            $group2ResponseCost = $baseTotalsPerGroup1Map[$keyForMap]['cost'];
+                        }
+                    }
                } else {
                    /** @var Collection<int, object{aggregate: int, cost: int}> $group1Aggregates */
                    $group2ResponseSum = (int) $group1Aggregates->get(0)->aggregate;
@@ -121,6 +163,23 @@ class TimeEntryAggregationService
                $group1ResponseCost += $group2ResponseCost;
            }

+            // If Tag is selected in any grouping, compute overall totals from base (non-tag-expanded) query to avoid double counting
+            $hasTagGrouping = ($group1Type === TimeEntryAggregationType::Tag) || ($group2Type === TimeEntryAggregationType::Tag);
+            if ($hasTagGrouping) {
+                // Reset selects and ordering on the cloned base query
+                $baseTotals = $baseTotalsQuery
+                    ->selectRaw(
+                        ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')))) as aggregate,'.
+                        ' round(sum(extract(epoch from ('.$endRawSelect.' - '.$startRawSelect.')) * (coalesce(billable_rate, 0)::float/60/60))) as cost'
+                    )
+                    ->first();
+                if ($baseTotals !== null) {
+                    /** @var object{aggregate: int|null, cost: int|null} $baseTotals */
+                    $group1ResponseSum = (int) ($baseTotals->aggregate ?? 0);
+                    $group1ResponseCost = (int) ($baseTotals->cost ?? 0);
+                }
+            }
+
            if ($fillGapsInTimeGroupsIsPossible) {
                $group1Response = $this->fillGapsInTimeGroups($group1Response, $group1Type, $group2Type, $timezone, $startOfWeek, $start, $end);
            }
@@ -164,9 +223,9 @@ class TimeEntryAggregationService
     *       cost: int|null
     * }
     */
-    public function getAggregatedTimeEntriesWithDescriptions(Builder $timeEntriesQuery, ?TimeEntryAggregationType $group1Type, ?TimeEntryAggregationType $group2Type, string $timezone, Weekday $startOfWeek, bool $fillGapsInTimeGroups, ?Carbon $start, ?Carbon $end, bool $showBillableRate): array
+    public function getAggregatedTimeEntriesWithDescriptions(Builder $timeEntriesQuery, ?TimeEntryAggregationType $group1Type, ?TimeEntryAggregationType $group2Type, string $timezone, Weekday $startOfWeek, bool $fillGapsInTimeGroups, ?Carbon $start, ?Carbon $end, bool $showBillableRate, ?TimeEntryRoundingType $roundingType, ?int $roundingMinutes): array
    {
-        $aggregatedTimeEntries = $this->getAggregatedTimeEntries($timeEntriesQuery, $group1Type, $group2Type, $timezone, $startOfWeek, $fillGapsInTimeGroups, $start, $end, $showBillableRate);
+        $aggregatedTimeEntries = $this->getAggregatedTimeEntries($timeEntriesQuery, $group1Type, $group2Type, $timezone, $startOfWeek, $fillGapsInTimeGroups, $start, $end, $showBillableRate, $roundingType, $roundingMinutes);

        $keysGroup1 = [];
        $keysGroup2 = [];
@@ -294,6 +353,17 @@ class TimeEntryAggregationService
                    'color' => null,
                ];
            }
+        } elseif ($type === TimeEntryAggregationType::Tag) {
+            $tags = Tag::query()
+                ->whereIn('id', $keys)
+                ->select('id', 'name')
+                ->get();
+            foreach ($tags as $tag) {
+                $descriptorMap[$tag->id] = [
+                    'description' => $tag->name,
+                    'color' => null,
+                ];
+            }
        }

        return $descriptorMap;
@@ -436,6 +506,8 @@ class TimeEntryAggregationService
            return 'billable';
        } elseif ($group === TimeEntryAggregationType::Description) {
            return 'description';
+        } elseif ($group === TimeEntryAggregationType::Tag) {
+            return 'tag';
        }
    }

--- a/app/Service/TimeEntryService.php
+++ b/app/Service/TimeEntryService.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+use App\Enums\TimeEntryRoundingType;
+use Illuminate\Support\Carbon;
+use LogicException;
+
+class TimeEntryService
+{
+    public function getStartSelectRawForRounding(?TimeEntryRoundingType $roundingType, ?int $roundingMinutes): string
+    {
+        if ($roundingType === null || $roundingMinutes === null) {
+            return 'start';
+        }
+        if ($roundingMinutes < 1) {
+            throw new LogicException('Rounding minutes must be greater than 0');
+        }
+
+        return 'date_bin(\'1 minutes\', start, TIMESTAMP \'1970-01-01\')';
+    }
+
+    public function getEndSelectRawForRounding(?TimeEntryRoundingType $roundingType, ?int $roundingMinutes): string
+    {
+        if ($roundingType === null || $roundingMinutes === null) {
+            return 'coalesce("end", \''.Carbon::now()->toDateTimeString().'\')';
+        }
+        if ($roundingMinutes < 1) {
+            throw new LogicException('Rounding minutes must be greater than 0');
+        }
+        $end = 'coalesce("end", \''.Carbon::now()->toDateTimeString().'\')';
+        if ($roundingType === TimeEntryRoundingType::Down) {
+            return 'date_bin(\''.$roundingMinutes.' minutes\', '.$end.', '.$this->getStartSelectRawForRounding($roundingType, $roundingMinutes).')';
+        } elseif ($roundingType === TimeEntryRoundingType::Up) {
+            return 'date_bin(\''.$roundingMinutes.' minutes\', '.$end.' + interval \''.$roundingMinutes.' minutes\', '.$this->getStartSelectRawForRounding($roundingType, $roundingMinutes).')';
+        } elseif ($roundingType === TimeEntryRoundingType::Nearest) {
+            return 'date_bin(\''.$roundingMinutes.' minutes\', '.$end.' + interval \''.($roundingMinutes / 2).' minutes\', '.$this->getStartSelectRawForRounding($roundingType, $roundingMinutes).')';
+        }
+    }
+}
--- a/composer.json
+++ b/composer.json
@@ -11,31 +11,31 @@
        "datomatic/laravel-enum-helper": "^2.0.0",
        "dedoc/scramble": "^0.12.2",
        "filament/filament": "^3.2",
-        "flowframe/laravel-trend": "^0.3.0",
+        "flowframe/laravel-trend": "^0.4.0",
        "gotenberg/gotenberg-php": "^2.8",
        "guzzlehttp/guzzle": "^7.2",
-        "inertiajs/inertia-laravel": "^1.0",
+        "inertiajs/inertia-laravel": "^2.0.3",
        "korridor/laravel-computed-attributes": "^3.1",
        "korridor/laravel-has-many-sync": "^3.1",
        "korridor/laravel-model-validation-rules": "^3.0",
-        "laravel/framework": "^11.16.0",
+        "laravel/framework": "^12.19.3",
        "laravel/jetstream": "^5.0",
        "laravel/octane": "^2.3",
-        "laravel/passport": "^12.0",
+        "laravel/passport": "^13.0.5",
        "laravel/tinker": "^2.8",
        "league/csv": "^9.16.0",
        "league/flysystem-aws-s3-v3": "^3.0",
        "league/iso3166": "^4.3",
        "maatwebsite/excel": "^3.1",
        "novadaemon/filament-pretty-json": "^2.2",
-        "nwidart/laravel-modules": "^11.0.11",
-        "owen-it/laravel-auditing": "^13.6",
-        "pxlrbt/filament-environment-indicator": "^2.0",
+        "nwidart/laravel-modules": "^12.0.4",
+        "owen-it/laravel-auditing": "^14.0.0",
+        "pxlrbt/filament-environment-indicator": "^2.1.0",
        "spatie/temporary-directory": "^2.2",
        "staudenmeir/eloquent-json-relations": "^1.1",
        "stechstudio/filament-impersonate": "^3.8",
        "tightenco/ziggy": "^2.1.0",
-        "tpetry/laravel-postgresql-enhanced": "^2.0.0",
+        "tpetry/laravel-postgresql-enhanced": "^3.0.0",
        "wikimedia/composer-merge-plugin": "^2.1.0"
    },
    "require-dev": {
@@ -43,14 +43,13 @@
        "brianium/paratest": "^7.3",
        "fakerphp/faker": "^1.9.1",
        "fumeapp/modeltyper": "^3.0",
-        "phpstan/phpstan": "1.12.0",
-        "larastan/larastan": "^2.0",
+        "larastan/larastan": "^3.5.0",
        "laravel/pint": "^1.0",
        "laravel/sail": "^1.18",
        "laravel/telescope": "^5.0",
        "mockery/mockery": "^1.4.4",
        "nunomaduro/collision": "^8.1",
-        "phpunit/phpunit": "^11",
+        "phpunit/phpunit": "^12",
        "spatie/laravel-ignition": "^2.0",
        "timacdonald/log-fake": "^2.1"
    },
@@ -119,7 +118,8 @@
    "extra": {
        "laravel": {
            "dont-discover": [
-                "laravel/telescope"
+                "laravel/telescope",
+                "nwidart/laravel-modules"
            ]
        }
    },
--- a/composer.lock
+++ b/composer.lock
--- a/config/app.php
+++ b/config/app.php
@@ -9,6 +9,7 @@ use App\Enums\NumberFormat;
 use App\Enums\TimeFormat;
 use Illuminate\Support\Facades\Facade;
 use Illuminate\Support\ServiceProvider;
+use Nwidart\Modules\LaravelModulesServiceProvider;

 return [

@@ -197,6 +198,7 @@ return [
        App\Providers\FortifyServiceProvider::class,
        App\Providers\JetstreamServiceProvider::class,
        // Warning: Do not add TelescopeServiceProvider here since it is already conditionally registered in AppServiceProvider
+        LaravelModulesServiceProvider::class,
    ])->toArray(),

    /*
--- a/config/passport.php
+++ b/config/passport.php
@@ -34,31 +34,15 @@ return [

    /*
    |--------------------------------------------------------------------------
-    | Client UUIDs
+    | Passport Database Connection
    |--------------------------------------------------------------------------
    |
-    | By default, Passport uses auto-incrementing primary keys when assigning
-    | IDs to clients. However, if Passport is installed using the provided
-    | --uuids switch, this will be set to "true" and UUIDs will be used.
+    | By default, Passport's models will utilize your application's default
+    | database connection. If you wish to use a different connection you
+    | may specify the configured name of the database connection here.
    |
    */

-    'client_uuids' => true,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Personal Access Client
-    |--------------------------------------------------------------------------
-    |
-    | If you enable client hashing, you should set the personal access client
-    | ID and unhashed secret within your environment file. The values will
-    | get used while issuing fresh personal access tokens to your users.
-    |
-    */
-
-    'personal_access_client' => [
-        'id' => env('PASSPORT_PERSONAL_ACCESS_CLIENT_ID'),
-        'secret' => env('PASSPORT_PERSONAL_ACCESS_CLIENT_SECRET'),
-    ],
+    'connection' => env('PASSPORT_CONNECTION'),

 ];
--- a/config/scheduling.php
+++ b/config/scheduling.php
@@ -6,6 +6,7 @@ return [

    'tasks' => [
        'time_entry_send_still_running_mails' => (bool) env('SCHEDULING_TASK_TIME_ENTRY_SEND_STILL_RUNNING_MAILS', true),
+        'auth_send_mails_expiring_api_tokens' => (bool) env('SCHEDULING_TASK_AUTH_SEND_MAILS_EXPIRING_API_TOKENS', true),
        'self_hosting_check_for_update' => (bool) env('SCHEDULING_TASK_SELF_HOSTING_CHECK_FOR_UPDATE', true),
        'self_hosting_telemetry' => (bool) env('SCHEDULING_TASK_SELF_HOSTING_TELEMETRY', true),
        'self_hosting_database_consistency' => (bool) env('SCHEDULING_TASK_SELF_HOSTING_DATABASE_CONSISTENCY', false),
--- a/database/factories/OrganizationFactory.php
+++ b/database/factories/OrganizationFactory.php
@@ -11,6 +11,7 @@ use App\Enums\NumberFormat;
 use App\Enums\TimeFormat;
 use App\Models\Organization;
 use App\Models\User;
+use App\Service\CurrencyService;
 use Illuminate\Database\Eloquent\Factories\Factory;

 /**
@@ -27,7 +28,7 @@ class OrganizationFactory extends Factory
    {
        return [
            'name' => $this->faker->unique()->company(),
-            'currency' => $this->faker->currencyCode(),
+            'currency' => app(CurrencyService::class)->getRandomCurrencyCode(),
            'billable_rate' => null,
            'user_id' => User::factory(),
            'personal_team' => true,
--- a/database/factories/Passport/ClientFactory.php
+++ b/database/factories/Passport/ClientFactory.php
@@ -7,11 +7,12 @@ namespace Database\Factories\Passport;
 use App\Models\Passport\Client;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Laravel\Passport\Database\Factories\ClientFactory as BaseClientFactory;

 /**
 * @extends Factory<Client>
 */
-class ClientFactory extends Factory
+class ClientFactory extends BaseClientFactory
 {
    /**
     * Define the model's default state.
@@ -22,24 +23,40 @@ class ClientFactory extends Factory
    {
        return [
            'id' => $this->faker->uuid,
-            'user_id' => null,
+            'owner_id' => null,
+            'owner_type' => null,
            'name' => $this->faker->company(),
            'secret' => $this->faker->regexify('[A-Za-z]{40}'),
            'provider' => 'users',
-            'redirect' => $this->faker->url(),
-            'personal_access_client' => false,
-            'password_client' => false,
+            'redirect_uris' => [$this->faker->url()],
+            'grant_types' => [],
            'revoked' => false,
            'created_at' => $this->faker->dateTime(),
            'updated_at' => $this->faker->dateTime(),
        ];
    }

+    public function desktopClient(): self
+    {
+        return $this->state(fn (array $attributes) => [
+            'name' => 'Desktop',
+            'grant_types' => ['urn:ietf:params:oauth:grant-type:device_code', 'refresh_token', 'authorization_code', 'implicit'],
+        ]);
+    }
+
+    public function apiClient(): self
+    {
+        return $this->state(fn (array $attributes) => [
+            'name' => 'API',
+            'grant_types' => ['urn:ietf:params:oauth:grant-type:device_code', 'refresh_token', 'client_credentials', 'personal_access'],
+        ]);
+    }
+
    public function personalAccessClient(): self
    {
        return $this->state(function (array $attributes) {
            return [
-                'personal_access_client' => true,
+                'grant_types' => ['personal_access'],
            ];
        });
    }
@@ -48,7 +65,8 @@ class ClientFactory extends Factory
    {
        return $this->state(function (array $attributes) use ($user): array {
            return [
-                'user_id' => $user->getKey(),
+                'owner_id' => $user->getKey(),
+                'owner_type' => (new User)->getMorphClass(),
            ];
        });
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gregor Vostrak	888c21369a	add tailwind theme and css variables to files export, bump ui package version	2025-12-09 14:30:39 +01:00
Gregor Vostrak	89aff45cfb	add direct axios dependency to package, bump package versions	2025-12-09 14:16:13 +01:00
Gregor Vostrak	569d94b240	move TimezonMismatchModal to ui package	2025-12-04 17:26:07 +01:00
Gregor Vostrak	ca94021d99	add support for window activities in the calendar view plugin	2025-12-03 18:08:00 +01:00
Gregor Vostrak	b730cc21dd	move rangecalendar, popover and daterangepicker to ui package	2025-12-02 17:52:40 +01:00
Gregor Vostrak	7a51fca2f9	only show Weekly Billable Amount of current organization on dashboard, fixes #977	2025-12-02 13:30:08 +01:00
Gregor Vostrak	280032ee02	allow employee manage task setting to organization	2025-11-25 15:39:20 +01:00
Gregor Vostrak	b1bb7245b0	use default api limit for fetching time entries	2025-11-20 17:30:13 +01:00
Gregor Vostrak	6f37ad500a	limit initially loaded time entries on time page	2025-11-20 16:58:53 +01:00
Gregor Vostrak	500ccd5719	fix container queries for time entry rows	2025-11-20 16:52:08 +01:00
Gregor Vostrak	bacd6f4222	include the currently running time entry in the calendar header	2025-11-20 13:17:48 +01:00
Gregor Vostrak	022caf59ee	bump solidtime ui package version to 0.0.13	2025-11-19 17:34:21 +01:00
Gregor Vostrak	f955ab3135	fix display problems caused by minimum height of calendar events	2025-11-19 17:34:21 +01:00
Gregor Vostrak	5b491b0da2	add support for currently running time entry	2025-11-19 17:34:21 +01:00
Gregor Vostrak	249ab67ac8	improve idle indicator colors, fix typescript issues	2025-11-19 17:34:21 +01:00
Gregor Vostrak	1bd2c28b37	add tooltips to idlestatus indicators	2025-11-19 17:34:21 +01:00
Gregor Vostrak	33ac994cc0	add activity status plugin to calendar	2025-11-19 17:34:21 +01:00
Gregor Vostrak	8d3ee58bed	improve initial mount performance for groupedtimeentrytable by streaming in the rows mounting the rows mounts lots of nested components which results in a delay on the initial mount.	2025-11-19 17:34:21 +01:00
Gregor Vostrak	8a2c260533	use container queries for time entry table	2025-11-19 17:34:21 +01:00
Gregor Vostrak	95ab1699c4	make sure that CreateTimeEntry modal always starts with times that have 0 seconds	2025-11-19 17:34:21 +01:00
Gregor Vostrak	306a081a3d	prevent seconds update on timepicker when nothing else changes	2025-11-19 17:34:21 +01:00
Gregor Vostrak	878ac4ab81	add tooltip component	2025-11-19 17:34:21 +01:00
Gregor Vostrak	947550d639	move css variables and tailwind theme config into ui package	2025-11-19 17:34:21 +01:00
Gregor Vostrak	09fb5aa48e	make sure that timepicker and calendar set seconds to 0 on update, fixes #968	2025-11-19 17:34:21 +01:00
Gregor Vostrak	9b9371e5a5	move button component to ui package	2025-11-19 17:34:21 +01:00
Gregor Vostrak	0648437478	design fixes, improve component encapsulation	2025-11-19 17:34:21 +01:00
Gregor Vostrak	8ba04eca0c	move currency and cancreateproject permission to props to decouple TimeEntryCreateModal from web	2025-11-19 17:34:21 +01:00
Gregor Vostrak	8a2f35de0c	fix package build error dependencies	2025-11-19 17:34:21 +01:00
Gregor Vostrak	b7dafb0892	bump api and ui package versions	2025-11-19 17:34:21 +01:00
Gregor Vostrak	6eca0c2c76	fix archived_at timestamp of client in exporter	2025-11-11 12:55:33 +01:00
Gregor Vostrak	3417b60585	only run self-hosting update and telemetry scheduler when app_key is set	2025-11-04 13:35:12 +01:00
Constantin Graf	0f21fabd37	Spread self-hosting update and telemetry requests over the day	2025-11-03 20:24:52 +01:00
Gregor Vostrak	df00200464	load current member time entries in calendar, to be consistent with time view	2025-10-22 14:36:21 +02:00
Gregor Vostrak	3b41de7135	remove project default listener in timeentry edit modal	2025-10-22 13:55:06 +02:00
Gregor Vostrak	9fe0ea5a0f	add support for HH:mm:ss format for input time fields	2025-10-22 13:54:14 +02:00
Gregor Vostrak	f8f708a664	add set end time functionality to timetracker component	2025-10-21 17:24:46 +02:00
Gregor Vostrak	c359259e45	fix TimeRangeSelector dropdown behaviour when clicking after other input was focused before	2025-10-21 13:50:30 +02:00
Gregor Vostrak	55d12aaae1	add discard option for running timer	2025-10-21 12:49:49 +02:00
Alexander Groß	9a1dd4861c	Extend description to 5000 chars, closes #914	2025-10-21 12:36:32 +02:00
Gregor Vostrak	1e985b71ec	move Client visibleByEmployee logic from controller to model	2025-10-21 12:22:17 +02:00
Alexander Groß	93d6a86f74	Show clients that are assigned to the employee, closes #893	2025-10-21 12:20:28 +02:00
Gregor Vostrak	19a206d57c	add prevent_overlapping_time_entries setting to organization when enabled users are blocked from creating or editing new time entries that are overlapping with other time entries	2025-10-13 14:23:41 +02:00
Gregor Vostrak	c0788c270b	fix typescript openapi mapping types	2025-10-07 17:42:44 +02:00
Gregor Vostrak	7765056074	add tag grouping	2025-10-07 17:15:20 +02:00
Kaspar Rosin	639f5332e4	feat: add duplicate time entry fields	2025-10-07 17:10:22 +02:00
Gregor Vostrak	4a50145329	fix calendar header timezone issue	2025-10-06 19:30:58 +02:00
Gregor Vostrak	8aabffd1e7	fix race condition in UserTimezoneMismatchModal	2025-10-06 18:33:57 +02:00
Gregor Vostrak	b373427dc7	add feedback button in sidebar	2025-10-01 13:20:23 +02:00
Gregor Vostrak	d2a4d60441	clarify UserSettingsIcon Dropdown Profile Settings Item Description	2025-10-01 13:20:23 +02:00
Gregor Vostrak	c3305b3df6	remove bottom padding for toast container This became redundant due to the floating feedback bubble removal	2025-10-01 13:20:23 +02:00
Gregor Vostrak	7584e59d0b	improve focus states and keyboard navigation for organization switcher and user settings dropdown	2025-10-01 13:20:23 +02:00
Gregor Vostrak	d2f75cca6e	update organization switcher to use shadcn dropdownmenu	2025-10-01 13:20:23 +02:00
Gregor Vostrak	250379d4bd	change profile dropdown to shadcn, add feedback entry	2025-10-01 13:20:23 +02:00
Gregor Vostrak	7f89fd8ea1	fix overflow issues in short calendar events	2025-09-29 12:19:27 +02:00
Gregor Vostrak	0b45f3b473	change create bucket script to work with new minio client versions	2025-09-29 12:09:15 +02:00
Gregor Vostrak	9827a74ae2	lock caddy version to 2.10 to fix docker buiilds	2025-09-08 13:49:43 +02:00
Gregor Vostrak	3425847a44	make time entry create in calendar use minimal interval instead of 1h duration	2025-09-08 13:28:36 +02:00
Gregor Vostrak	47b778fab9	make sure that 0 duration entries are shown correctly in calendar	2025-09-08 13:28:36 +02:00
Gregor Vostrak	85d69f1f16	fix scroll overflow issue in calendar with banner	2025-09-08 13:28:36 +02:00
Gregor Vostrak	fca55fe0e1	improve calendar fetching behaviour to always include prev/next period	2025-09-08 13:28:36 +02:00
Gregor Vostrak	f19abb9db6	make calendar fetch time ranges respect user timezone	2025-09-08 13:28:36 +02:00
Gregor Vostrak	e3bd50ed6b	improve contrast of calendar events	2025-09-08 13:28:36 +02:00
Gregor Vostrak	c582530899	add edit time entry dropdown option to timeentryrow	2025-09-08 13:28:36 +02:00
Gregor Vostrak	fb5185a32f	fix card background active color contrast in light mode	2025-09-08 13:28:36 +02:00
Gregor Vostrak	0a0854f771	fix recently tracked time entries card placeholders	2025-09-08 13:28:36 +02:00
Gregor Vostrak	4e635cde83	add support for week_start and time_format in calendar also rename them so that they do not conflict with the datepicker calendar component	2025-09-08 13:28:36 +02:00
Gregor Vostrak	9fa9522237	add calendar view	2025-09-08 13:28:36 +02:00
Gregor Vostrak	04c44097d0	fix duplicated borders in time and detailed reporting view	2025-09-08 13:28:36 +02:00
Gregor Vostrak	3d5a0cb974	add timezone mismatch modal	2025-09-08 13:28:36 +02:00
Constantin Graf	da98e0571c	Add on premise build	2025-08-12 16:59:52 +02:00
Constantin Graf	f68f05d1aa	Updated the PR template	2025-07-31 14:01:17 +02:00
Gregor Vostrak	8fdc4c1219	add contributing notice that you need to run the format command	2025-07-31 14:01:17 +02:00
Gregor Vostrak	93148299a9	add CONTRIBUTING.md	2025-07-31 14:01:17 +02:00
Constantin Graf	78d2ea1a25	Add API doc description for chart endpoints	2025-07-31 13:43:00 +02:00
Constantin Graf	14f559c4c2	Removed FORWARD_WEB_PORT from local setup	2025-07-31 13:42:37 +02:00
Gregor Vostrak	61fd2b1187	update font-face file names for font loading	2025-07-31 12:08:51 +02:00
Gregor Vostrak	9ea3c5dc29	fix font embeds #864	2025-07-31 11:53:32 +02:00
Gregor Vostrak	cb30487a21	add format check, update prettier rules, apply rules consistently	2025-07-31 11:53:00 +02:00
Constantin Graf	b11672732b	Fixed modules service providers	2025-07-23 16:11:34 +02:00
Gregor Vostrak	97dcadc795	add frontend blocking for rounding for non-premium users	2025-07-23 16:09:36 +02:00
Constantin Graf	e7fa414c06	Restrict rounding to premium users	2025-07-23 16:09:36 +02:00
Gregor Vostrak	43073b5be2	fix design inconsistency in timeentryaggregaterow	2025-07-18 16:38:09 +02:00
Gregor Vostrak	9589c9106d	e2e: make sure reporting tests do not check the dropdown values when verifying table results	2025-07-17 18:41:48 +02:00
Gregor Vostrak	8a0d2235a8	fix flakyness in e2e tests for reporting	2025-07-17 18:38:21 +02:00
Gregor Vostrak	38f38790d5	change font to inter, scale down fonts, improve rounding/filter elements	2025-07-17 18:38:21 +02:00
Gregor Vostrak	e3cfc155b8	add rounding frontend to reports, and support for shared reports	2025-07-17 18:38:21 +02:00
Constantin Graf	4b726635b2	Add rounding feature	2025-07-17 18:38:21 +02:00
Constantin Graf	e1185af281	Fixed failing tests because of legacy currency codes	2025-07-17 18:16:25 +02:00
Constantin Graf	f9c0d64f82	Add email notifications for expiring api tokens	2025-07-17 18:16:25 +02:00
Constantin Graf	3d58f570bd	Fixed Laravel passport migrations	2025-07-17 11:47:34 +02:00
Constantin Graf	400bc434b9	Updated docker image	2025-07-17 11:47:34 +02:00
Constantin Graf	2ab28001be	Updated dependencies; Major update laravel passport	2025-07-17 11:47:34 +02:00
Gregor Vostrak	62d2f4bf4e	fix broken light mode on oauth page #842	2025-07-15 15:52:55 +02:00
Gregor Vostrak	3d4b20f7c8	make sure time entry information remains visible on mobile views	2025-07-08 18:22:18 +02:00
Gregor Vostrak	155ed62fcc	add clearable option to calendardateinput, fix format, add paid_date	2025-07-08 18:22:18 +02:00
Gregor Vostrak	5daa6f2a25	fix last 7 days statistic labels	2025-07-08 18:22:18 +02:00
Constantin Graf	47aa65d959	Add checks for placeholder invitation; Fixed bug in member deletion	2025-07-08 16:49:05 +02:00
Gregor Vostrak	b0e638c28b	fix daterange presets, fix e2e test	2025-06-30 12:54:22 +02:00
Gregor Vostrak	24b62d4643	add information about placeholders in delete modal	2025-06-30 12:54:22 +02:00
Gregor Vostrak	dd928508fd	add delete modal for member delete with relations allow admins to delete members fix Dialog cloes on click outside of content	2025-06-30 12:54:22 +02:00
Constantin Graf	ead9cf2185	Add option to delete members with relations	2025-06-30 12:54:22 +02:00
Gregor Vostrak	7578beb271	fix css variables not updating correctly when system theme changes	2025-06-24 15:43:49 +02:00
Constantin Graf	dc21ac8352	Switch organization after accepting invitation	2025-06-10 11:23:53 +02:00
Constantin Graf	4de7868851	Add postgres version matrix to phpunit tests	2025-06-04 21:43:35 +02:00
dependabot[bot]	ffc016a1ec	Bump codecov/codecov-action from 5.4.2 to 5.4.3 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 5.4.2 to 5.4.3. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v5.4.2...v5.4.3) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-version: 5.4.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-05-22 18:32:13 +02:00
Constantin Graf	be69626970	Add permissions to all GitHub actions	2025-05-22 11:04:37 +02:00
Gregor Vostrak	f1dce88dab	fix time zone issue in daterangepicker	2025-05-21 12:34:02 -07:00