diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml index de25124d..f2115214 100644 --- a/.github/workflows/testing.yaml +++ b/.github/workflows/testing.yaml @@ -39,6 +39,9 @@ jobs: env: fail-fast: true + - name: Determine software versions + run: mysql --version && php --version + - name: Determine composer cache directory id: composer-cache run: echo "composer_cache_directory=$(composer config cache-dir)" >> $GITHUB_ENV @@ -79,14 +82,24 @@ jobs: - name: Run quick unit-tests run: composer tests-unit env: - DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?serverVersion=5.7 - APP_ENV: dev + DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?charset=utf8mb4&serverVersion=8.0.35 + APP_ENV: test MAILER_URL: null://localhost + - name: Full test-suite + if: matrix.php != '8.2' + run: vendor/bin/phpunit tests/ + env: + DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?charset=utf8mb4&serverVersion=8.0.35 + APP_ENV: test + MAILER_URL: null://localhost + TEST_WITH_BUNDLES: 1 + - name: Full test-suite with coverage + if: matrix.php == '8.2' run: vendor/bin/phpunit tests/ --coverage-clover=coverage.xml env: - DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?serverVersion=5.7 + DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?charset=utf8mb4&serverVersion=8.0.35 APP_ENV: dev MAILER_URL: null://localhost TEST_WITH_BUNDLES: 1 @@ -106,7 +119,7 @@ jobs: bin/console doctrine:migrations:migrate -n bin/console doctrine:migrations:migrate first -n env: - DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?serverVersion=5.7 + DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?charset=utf8mb4&serverVersion=8.0.35 APP_ENV: dev MAILER_URL: null://localhost diff --git a/assets/app-rtl.js b/assets/app-rtl.js new file mode 100644 index 00000000..79c0ca2a --- /dev/null +++ b/assets/app-rtl.js @@ -0,0 +1 @@ +require('./sass/_app-rtl.scss'); diff --git a/assets/js/forms/KimaiFormSelect.js b/assets/js/forms/KimaiFormSelect.js index 3eea37b2..52a5304b 100644 --- a/assets/js/forms/KimaiFormSelect.js +++ b/assets/js/forms/KimaiFormSelect.js @@ -83,6 +83,7 @@ export default class KimaiFormSelect extends KimaiFormPlugin { // if there are more than X entries, the other ones are hidden and can only be found // by typing some characters to trigger the internal option search maxOptions: 500, + sortField:[{field: '$order'}, {field: '$score'}], }; let render = { diff --git a/assets/js/plugins/KimaiAlert.js b/assets/js/plugins/KimaiAlert.js index 0962a8c1..60ac342a 100644 --- a/assets/js/plugins/KimaiAlert.js +++ b/assets/js/plugins/KimaiAlert.js @@ -52,7 +52,7 @@ export default class KimaiAlert extends KimaiPlugin { } const html = ` -