prepare release 1.7 (#1388)

* added sortable js library
* activity in invoice is optional
* added javascript widget for paginated boxes
* fix activity dropdown for globals only
* added timesheet service to reduce code duplication
* use repository to query for teams in dropdowns
* added project validator
* validate project start and end against timesheet
* include begin and end in dynamic form requests for projects
* added timezone and language option to import flag, improve timesheet import speed
* deactivate cross-timezone filter
* add virtual fields to field order list
* composer update
* added param to ignore dates
* position loader icon fixed - fixes #1330
* permission problem when creating a new project - fixes #1340
* remove dev dependencies webserver and thanks bundle
* stop information leak (begin and end date) in duration mode - fixes #1307
* unify timesheet edit dialog for user and admins
* fix security issue, own rates exposed to unauthorized users in multi-update dialog

.editorconfig

@@ -3,7 +3,8 @@ root = true
 
 ; Unix-style newlines
 [*]
-end_of_line = LF
+end_of_line = lf
+charset = utf-8
 
 [*.php]
 indent_style = space

.github_changelog_generator

@@ -1,4 +1,5 @@
 unreleased=true
-future-release=1.0
+future-release=1.7
 exclude-labels=duplicate,question,invalid,wontfix,release
-enhancement_labels=>enhancement,Enhancement,feature request
+enhancement_labels=>enhancement,Enhancement,feature request,translation i18n,technical debt
+issues-wo-labels=false

.gitignore

@@ -1,11 +1,15 @@
 # ========== KIMAI ==========
-# IDE
 .idea/
+.DS_Store
 
 /bin/*
 !bin/console
 /config/packages/local.yaml
+/config/packages/*-local.yaml
 /config/packages/*/local.yaml
+/config/packages/*/*-local.yaml
+
+public/avatars/*.png
 
 templates/invoice/renderer/.~lock*
 
@@ -18,6 +22,8 @@ templates/invoice/renderer/.~lock*
 
 /var/invoices/*
 
+/var/packages/*
+!var/packages/.gitkeep
 /var/plugins/*
 !var/plugins/.gitkeep
 
@@ -34,10 +40,6 @@ templates/invoice/renderer/.~lock*
 /vendor/
 ###< symfony/framework-bundle ###
 
-###> symfony/web-server-bundle ###
-.web-server-pid
-###< symfony/web-server-bundle ###
-
 ###> phpunit/phpunit ###
 /phpunit.xml
 /.phpunit.result.cache

.scrutinizer.yml

@@ -1,40 +0,0 @@
-build:
-    environment:
-        node: v8.11.2
-        php:
-            version: 7.2
-            ini:
-                date.timezone: "UTC"
-    nodes:
-        analysis:
-            tests:
-                override:
-                    - js-scrutinizer-run
-                    - php-scrutinizer-run
-        tests:
-            tests:
-                override:
-                    -
-                        command: 'vendor/bin/phpunit --coverage-clover=clover.xml tests/'
-                        stop_on_failure: true
-                        coverage:
-                            file: 'clover.xml'
-                            format: 'clover'
-
-filter:
-    excluded_paths:
-        - '.github/'
-        - 'bin/'
-        - 'config/'
-        - 'public/'
-        - 'templates/'
-        - 'translations/'
-        - 'var/'
-    dependency_paths:
-        - 'node_modules/'
-        - 'vendor/'
-
-build_failure_conditions:
-    - 'project.metric("scrutinizer.quality", < 9.0)'
-    - 'project.metric("scrutinizer.test_coverage", < 0.9)'
-    - 'project.metric_change("scrutinizer.test_coverage", < -0.01)'

.travis.yml

@@ -1,29 +1,82 @@
+dist: xenial
 language: php
-sudo: false
 
 cache:
   directories:
     - $HOME/.composer/cache/files
 
-addons:
-  mariadb: '10.2'
-
-services:
-  - mysql
-
-env:
-  global:
-    - CODECOVERAGE=0
-
 matrix:
-  fast_finish: true
   include:
-    - php: 7.2
-    - php: 7.3
-      env: CODECOVERAGE=1
+    - stage: Code quality
+      env: CODECOVERAGE=0 DB=sqlite
+      php: '7.3'
+      script:
+          - composer validate --no-check-all --strict
+          - composer kimai:codestyle
+          - composer kimai:phpstan
+          - composer kimai:code-lint
+    - stage: Test
+      php: '7.2'
+      env: CODECOVERAGE=0 DB=mysql
+      sudo: required
+      services: 
+        - mysql
+    - stage: Test
+      php: '7.3'
+      env: CODECOVERAGE=0 DB=mysql
+      sudo: required
+      services: 
+        - mysql
+    - stage: Test
+      php: '7.4'
+      env: CODECOVERAGE=0 DB=mysql
+      sudo: required
+      services: 
+        - mysql
+    - stage: Test
+      php: '7.2'
+      env: CODECOVERAGE=0 DB=sqlite
+    - stage: Test
+      php: '7.3'
+      env: CODECOVERAGE=0 DB=sqlite
+    - stage: Test
+      php: '7.4'
+      env: CODECOVERAGE=0 DB=sqlite
+    - stage: Test
+      php: '7.2'
+      env: CODECOVERAGE=0 DB=mariadb
+      addons:
+        mariadb: '10.2'
+      services: 
+        - mysql
+      before_script:
+        - mysql -u root -e 'CREATE USER IF NOT EXISTS travis@localhost; GRANT ALL ON *.* TO travis@localhost;'
+    - stage: Test
+      php: '7.3'
+      env: CODECOVERAGE=0 DB=mariadb
+      addons:
+        mariadb: '10.2'
+      services: 
+        - mysql
+      before_script:
+        - mysql -u root -e 'CREATE USER IF NOT EXISTS travis@localhost; GRANT ALL ON *.* TO travis@localhost;'
+    - stage: Test
+      php: '7.4'
+      env: CODECOVERAGE=0 DB=mariadb
+      addons:
+        mariadb: '10.2'
+      services: 
+        - mysql
+      before_script:
+        - mysql -u root -e 'CREATE USER IF NOT EXISTS travis@localhost; GRANT ALL ON *.* TO travis@localhost;'
+    - stage: Code coverage
+      php: '7.3'
+      env: CODECOVERAGE=1 DB=sqlite
+      after_success:
+          - if [[ $CODECOVERAGE == 1 ]]; then bash <(curl -s https://codecov.io/bash); fi
 
 before_install:
-#  - phpenv config-rm xdebug.ini
+  - if [[ $CODECOVERAGE == 0 ]]; then phpenv config-rm xdebug.ini; fi;
   - composer self-update
   - php -i
   - php -m
@@ -33,18 +86,11 @@ install:
   - composer require zendframework/zend-ldap
 
 script:
-  - composer validate --no-check-all --strict
-  - composer kimai:codestyle
-  - composer kimai:phpstan
-  - if [[ $CODECOVERAGE == 1 ]]; then vendor/bin/phpunit tests/ --coverage-clover=coverage.xml; else vendor/bin/phpunit tests/; fi;
-  - cp tests/.env.dist.sqlite .env
-  - bin/console doctrine:database:create -n
-  - bin/console doctrine:migrations:migrate -n
-  - bin/console doctrine:migrations:migrate first -n
-  - cp tests/.env.dist.mysql .env
+  - if [[ $CODECOVERAGE == 1 ]]; then TEST_WITH_BUNDLES=1 vendor/bin/phpunit tests/ --coverage-clover=coverage.xml; fi;
+  - if [[ $CODECOVERAGE == 0 ]]; then vendor/bin/phpunit tests/; fi;
+  - if [[ $DB == 'sqlite' ]]; then cp tests/.env.dist.sqlite .env; fi;
+  - if [[ $DB == "mysql" || $DB == "mariadb" ]]; then cp tests/.env.dist.mysql .env; fi;
   - bin/console doctrine:database:create -n
   - bin/console doctrine:migrations:migrate -n
   - bin/console doctrine:migrations:migrate first -n
 
-after_success:
-  - if [[ $CODECOVERAGE == 1 ]]; then bash <(curl -s https://codecov.io/bash); fi

CHANGELOG.md

@@ -1,811 +1,120 @@
 # Change Log
 
+## [1.7](https://github.com/kevinpapst/kimai2/tree/1.7) (2020-01-19)
+[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.6.2...1.7)
+
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.7)
+
+## [1.6.2](https://github.com/kevinpapst/kimai2/tree/1.6.2) (2019-12-02)
+[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.6.1...1.6.2)
+
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.6.2)
+
+## [1.6.1](https://github.com/kevinpapst/kimai2/tree/1.6.1) (2019-11-26)
+[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.6...1.6.1)
+
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.6.1)
+
+## [1.6](https://github.com/kevinpapst/kimai2/tree/1.6) (2019-11-24)
+[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.5...1.6)
+
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.6)
+
+## [1.5](https://github.com/kevinpapst/kimai2/tree/1.5) (2019-11-03)
+[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.4.2...1.5)
+
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.5)
+
+## [1.4.2](https://github.com/kevinpapst/kimai2/tree/1.4) (2019-10-14)
+[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.4.1...1.4.2)
+
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.4.2)
+
+## [1.4.1](https://github.com/kevinpapst/kimai2/tree/1.4) (2019-10-07)
+[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.4...1.4.1)
+
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.4.1)
+
+## [1.4](https://github.com/kevinpapst/kimai2/tree/1.4) (2019-10-03)
+[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.3...1.4)
+
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.4)
+
+## [1.3](https://github.com/kevinpapst/kimai2/tree/1.3) (2019-09-11)
+[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.2...1.3)
+
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.3)
+
+## [1.2](https://github.com/kevinpapst/kimai2/tree/1.2) (2019-08-28)
+[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.1...1.2)
+
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.2)
+
+## [1.1](https://github.com/kevinpapst/kimai2/tree/1.1) (2019-07-24)
+[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.0.1...1.1)
+
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.1)
+
+## [1.0.1](https://github.com/kevinpapst/kimai2/tree/1.0.1) (2019-07-05)
+[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.0...1.0.1)
+
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.0.1)
+
 ## [1.0](https://github.com/kevinpapst/kimai2/tree/1.0) (2019-07-02)
 [Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.9...1.0)
 
-**Implemented enhancements:**
-
-- Admin Timesheets Toolbar: order users by username [\#876](https://github.com/kevinpapst/kimai2/issues/876)
-- import project "budget" field [\#841](https://github.com/kevinpapst/kimai2/issues/841)
-- Add tag data to exports [\#825](https://github.com/kevinpapst/kimai2/issues/825)
-- Additional status indicators for a field \(tag field\) more like lables which are globally assigable and appear for each task a user is working on or has started [\#769](https://github.com/kevinpapst/kimai2/issues/769)
-- Include option of tags field to link various timesheet entries together and use them for filtering data [\#768](https://github.com/kevinpapst/kimai2/issues/768)
-- Disable manual To date and duration entry option in timer [\#764](https://github.com/kevinpapst/kimai2/issues/764)
-- Custom data for external references [\#760](https://github.com/kevinpapst/kimai2/issues/760)
-- Refactor active entries dropdown [\#754](https://github.com/kevinpapst/kimai2/issues/754)
-- Stop entries without page reload [\#753](https://github.com/kevinpapst/kimai2/issues/753)
-- More actions on data records resp. table rows [\#748](https://github.com/kevinpapst/kimai2/issues/748)
-- Action menu instead of icons [\#747](https://github.com/kevinpapst/kimai2/issues/747)
-- Multiple Work Orders under Project for a Customer [\#720](https://github.com/kevinpapst/kimai2/issues/720)
-- Add custom fields in timesheet record [\#697](https://github.com/kevinpapst/kimai2/issues/697)
-- Lock exported objects [\#686](https://github.com/kevinpapst/kimai2/issues/686)
-- Option to allow Markdown in Project/Activity-comments [\#677](https://github.com/kevinpapst/kimai2/issues/677)
-- Recalculate rates on every change [\#673](https://github.com/kevinpapst/kimai2/issues/673)
-- Show on the title if there is an active recording [\#660](https://github.com/kevinpapst/kimai2/issues/660)
-- Allow edit Date From for saved time records [\#627](https://github.com/kevinpapst/kimai2/issues/627)
-- Restarting a entry- missing description [\#626](https://github.com/kevinpapst/kimai2/issues/626)
-- Calendar: Return to last view after creating a new time entry [\#622](https://github.com/kevinpapst/kimai2/issues/622)
-- Unable to select «projects» while filtering in timesheets [\#601](https://github.com/kevinpapst/kimai2/issues/601)
-- View cut off on 4:3 monitor [\#575](https://github.com/kevinpapst/kimai2/issues/575)
-- Calendar view: more space for business hours [\#530](https://github.com/kevinpapst/kimai2/issues/530)
-- maximale Anzahl Projektstunden als Vorgabe [\#467](https://github.com/kevinpapst/kimai2/issues/467)
-- don't allow start end dates, just punch in or out [\#448](https://github.com/kevinpapst/kimai2/issues/448)
-- Refresh of Duration time [\#420](https://github.com/kevinpapst/kimai2/issues/420)
-- Statistic of time-used vs. time-budget [\#416](https://github.com/kevinpapst/kimai2/issues/416)
-- Colors for customers / projects [\#374](https://github.com/kevinpapst/kimai2/issues/374)
-- allow to disable user preferences by permission [\#895](https://github.com/kevinpapst/kimai2/pull/895) ([kevinpapst](https://github.com/kevinpapst))
-- order users by username [\#880](https://github.com/kevinpapst/kimai2/pull/880) ([kevinpapst](https://github.com/kevinpapst))
-- use default\_begin in duration only mode [\#873](https://github.com/kevinpapst/kimai2/pull/873) ([kevinpapst](https://github.com/kevinpapst))
-- Custom fields for timesheets, customers, projects and activities [\#871](https://github.com/kevinpapst/kimai2/pull/871) ([kevinpapst](https://github.com/kevinpapst))
-- export tags in spreadsheets [\#860](https://github.com/kevinpapst/kimai2/pull/860) ([kevinpapst](https://github.com/kevinpapst))
-- add tracking mode \(duration + fixed start time\) [\#859](https://github.com/kevinpapst/kimai2/pull/859) ([kevinpapst](https://github.com/kevinpapst))
-- branding options [\#856](https://github.com/kevinpapst/kimai2/pull/856) ([kevinpapst](https://github.com/kevinpapst))
-- Widget refactoring [\#847](https://github.com/kevinpapst/kimai2/pull/847) ([kevinpapst](https://github.com/kevinpapst))
-- added hourly and money budgets to activity, project and customer [\#843](https://github.com/kevinpapst/kimai2/pull/843) ([kevinpapst](https://github.com/kevinpapst))
-- updated dockerfile [\#840](https://github.com/kevinpapst/kimai2/pull/840) ([kevinpapst](https://github.com/kevinpapst))
-- added installation command [\#838](https://github.com/kevinpapst/kimai2/pull/838) ([kevinpapst](https://github.com/kevinpapst))
-- add ldap support [\#815](https://github.com/kevinpapst/kimai2/pull/815) ([kevinpapst](https://github.com/kevinpapst))
-- added punch-in punch-out / time-clock mode [\#812](https://github.com/kevinpapst/kimai2/pull/812) ([kevinpapst](https://github.com/kevinpapst))
-- allow markdown for customer, project and activity comments [\#807](https://github.com/kevinpapst/kimai2/pull/807) ([kevinpapst](https://github.com/kevinpapst))
-- improved html export [\#802](https://github.com/kevinpapst/kimai2/pull/802) ([kevinpapst](https://github.com/kevinpapst))
--  use dropdown for entity actions on detail pages [\#801](https://github.com/kevinpapst/kimai2/pull/801) ([kevinpapst](https://github.com/kevinpapst))
-- lock exported timesheets [\#798](https://github.com/kevinpapst/kimai2/pull/798) ([kevinpapst](https://github.com/kevinpapst))
-- Calendar improvements [\#784](https://github.com/kevinpapst/kimai2/pull/784) ([kevinpapst](https://github.com/kevinpapst))
-- restart via API allows to copy description [\#782](https://github.com/kevinpapst/kimai2/pull/782) ([kevinpapst](https://github.com/kevinpapst))
-- delete timesheets via api [\#776](https://github.com/kevinpapst/kimai2/pull/776) ([kevinpapst](https://github.com/kevinpapst))
-- javascript and api to stop and display active records [\#772](https://github.com/kevinpapst/kimai2/pull/772) ([kevinpapst](https://github.com/kevinpapst))
-- recent activities via API [\#761](https://github.com/kevinpapst/kimai2/pull/761) ([kevinpapst](https://github.com/kevinpapst))
-- ES6 javascript conversion [\#733](https://github.com/kevinpapst/kimai2/pull/733) ([kevinpapst](https://github.com/kevinpapst))
-- Use tags for every timesheet entry [\#604](https://github.com/kevinpapst/kimai2/pull/604) ([infastra](https://github.com/infastra))
-
-**Fixed bugs:**
-
-- Invoice calculator that differs between fixed and hourly rates [\#884](https://github.com/kevinpapst/kimai2/issues/884)
-- Timesheets table empty after update [\#878](https://github.com/kevinpapst/kimai2/issues/878)
-- Ability to hide the revenue stats to users [\#853](https://github.com/kevinpapst/kimai2/issues/853)
-- Error on update database migration:  Syntax error or access violation: 1071 Specified key was too long; max key length is 767 bytes [\#788](https://github.com/kevinpapst/kimai2/issues/788)
-- adding a new timesheet entry is broken in current master [\#778](https://github.com/kevinpapst/kimai2/issues/778)
-- calendar week timesheet task with duration=true error 500 [\#704](https://github.com/kevinpapst/kimai2/issues/704)
-- Inter-month entries don't get exported in single month [\#652](https://github.com/kevinpapst/kimai2/issues/652)
-- fix selectbox is not resettable [\#901](https://github.com/kevinpapst/kimai2/pull/901) ([kevinpapst](https://github.com/kevinpapst))
-- fixed short invoice [\#891](https://github.com/kevinpapst/kimai2/pull/891) ([kevinpapst](https://github.com/kevinpapst))
-- fix sqlite migration [\#881](https://github.com/kevinpapst/kimai2/pull/881) ([kevinpapst](https://github.com/kevinpapst))
-- added LDAP config to set filter for finding user attributes [\#877](https://github.com/kevinpapst/kimai2/pull/877) ([kevinpapst](https://github.com/kevinpapst))
-- fix LDAP install for systems without ldap extension [\#846](https://github.com/kevinpapst/kimai2/pull/846) ([kevinpapst](https://github.com/kevinpapst))
-- fixed mpdf temp directory [\#845](https://github.com/kevinpapst/kimai2/pull/845) ([kevinpapst](https://github.com/kevinpapst))
-- enhance tag query to show all tags of an item [\#810](https://github.com/kevinpapst/kimai2/pull/810) ([kevinpapst](https://github.com/kevinpapst))
-- fix column and max key length [\#789](https://github.com/kevinpapst/kimai2/pull/789) ([kevinpapst](https://github.com/kevinpapst))
-- bugfix for API selects [\#780](https://github.com/kevinpapst/kimai2/pull/780) ([kevinpapst](https://github.com/kevinpapst))
-- translate date picker and charts [\#775](https://github.com/kevinpapst/kimai2/pull/775) ([kevinpapst](https://github.com/kevinpapst))
-- refactored javascript to ES6 classes [\#759](https://github.com/kevinpapst/kimai2/pull/759) ([kevinpapst](https://github.com/kevinpapst))
-
-**Closed issues:**
-
-- Update Hungarian translation [\#897](https://github.com/kevinpapst/kimai2/issues/897)
-- Authentication to Active Directory [\#875](https://github.com/kevinpapst/kimai2/issues/875)
-- LDAP Documentation Enhancement for Active Directory [\#867](https://github.com/kevinpapst/kimai2/issues/867)
-- Cannot find bundle in plugin tests [\#863](https://github.com/kevinpapst/kimai2/issues/863)
-- Allowed memory in reset-dev [\#857](https://github.com/kevinpapst/kimai2/issues/857)
-- 503 Error Service Unavailable [\#834](https://github.com/kevinpapst/kimai2/issues/834)
-- Documentation for native wrapper like nativefier [\#830](https://github.com/kevinpapst/kimai2/issues/830)
-- Create documentation for layman users to deploy the master code on their servers  [\#827](https://github.com/kevinpapst/kimai2/issues/827)
-- Allow export of data in timesheet view directly from the frontend [\#826](https://github.com/kevinpapst/kimai2/issues/826)
-- Adding a command as Plugin [\#797](https://github.com/kevinpapst/kimai2/issues/797)
-- connect kimai to ldap [\#795](https://github.com/kevinpapst/kimai2/issues/795)
-- Older Kimai2 version compatible with PHP 7.0? [\#790](https://github.com/kevinpapst/kimai2/issues/790)
-- POLL: Global vs. customer currency [\#781](https://github.com/kevinpapst/kimai2/issues/781)
-- Docker refactor [\#763](https://github.com/kevinpapst/kimai2/issues/763)
-- Finally got this installed! [\#743](https://github.com/kevinpapst/kimai2/issues/743)
-- Possible to translate login page [\#736](https://github.com/kevinpapst/kimai2/issues/736)
-- Grouping Users when Exporting [\#680](https://github.com/kevinpapst/kimai2/issues/680)
-
-**Merged pull requests:**
-
-- Update Hungarian translation [\#902](https://github.com/kevinpapst/kimai2/pull/902) ([infeeeee](https://github.com/infeeeee))
-- performance tuning on timesheets [\#874](https://github.com/kevinpapst/kimai2/pull/874) ([kevinpapst](https://github.com/kevinpapst))
-- Removed lines that skip plugins in test env [\#864](https://github.com/kevinpapst/kimai2/pull/864) ([tobybatch](https://github.com/tobybatch))
-- fix/LDAP multivalues Email Aliases [\#862](https://github.com/kevinpapst/kimai2/pull/862) ([jacoblanco](https://github.com/jacoblanco))
-- Spanish translate updated [\#852](https://github.com/kevinpapst/kimai2/pull/852) ([yayitazale](https://github.com/yayitazale))
-- Update of the French translation [\#850](https://github.com/kevinpapst/kimai2/pull/850) ([jeau](https://github.com/jeau))
-- improved fixture data for devs [\#848](https://github.com/kevinpapst/kimai2/pull/848) ([kevinpapst](https://github.com/kevinpapst))
-- Implement japanese translation 190601 [\#837](https://github.com/kevinpapst/kimai2/pull/837) ([nabbisen](https://github.com/nabbisen))
-- use codecov for coverage [\#833](https://github.com/kevinpapst/kimai2/pull/833) ([kevinpapst](https://github.com/kevinpapst))
-- code cleanup [\#811](https://github.com/kevinpapst/kimai2/pull/811) ([kevinpapst](https://github.com/kevinpapst))
-- refactored permissions for simpler customizations [\#808](https://github.com/kevinpapst/kimai2/pull/808) ([kevinpapst](https://github.com/kevinpapst))
-- added phpstan for code analyzes [\#806](https://github.com/kevinpapst/kimai2/pull/806) ([kevinpapst](https://github.com/kevinpapst))
-- added SECURITY.md [\#805](https://github.com/kevinpapst/kimai2/pull/805) ([kevinpapst](https://github.com/kevinpapst))
-- added funding yaml [\#804](https://github.com/kevinpapst/kimai2/pull/804) ([kevinpapst](https://github.com/kevinpapst))
-- timesheet controller refactoring [\#796](https://github.com/kevinpapst/kimai2/pull/796) ([kevinpapst](https://github.com/kevinpapst))
-- fix phpunit annotations [\#794](https://github.com/kevinpapst/kimai2/pull/794) ([kevinpapst](https://github.com/kevinpapst))
-- Modify Japanese translation [\#779](https://github.com/kevinpapst/kimai2/pull/779) ([nabbisen](https://github.com/nabbisen))
-- Add Japanese translation [\#774](https://github.com/kevinpapst/kimai2/pull/774) ([nabbisen](https://github.com/nabbisen))
-- fix toolbar requests for empty choice [\#758](https://github.com/kevinpapst/kimai2/pull/758) ([kevinpapst](https://github.com/kevinpapst))
-- added more entity actions [\#757](https://github.com/kevinpapst/kimai2/pull/757) ([bjoerne2](https://github.com/bjoerne2))
-- Database interoperability [\#756](https://github.com/kevinpapst/kimai2/pull/756) ([kevinpapst](https://github.com/kevinpapst))
-- dynamically update title and visible durations for running records [\#752](https://github.com/kevinpapst/kimai2/pull/752) ([kevinpapst](https://github.com/kevinpapst))
-- colors for visual grouping of customer, projects and activities [\#751](https://github.com/kevinpapst/kimai2/pull/751) ([kevinpapst](https://github.com/kevinpapst))
-- moved shared entity fields and functions to trait [\#750](https://github.com/kevinpapst/kimai2/pull/750) ([kevinpapst](https://github.com/kevinpapst))
-- Entity actions re-designed \(table buttons\) [\#746](https://github.com/kevinpapst/kimai2/pull/746) ([kevinpapst](https://github.com/kevinpapst))
-- navbar block cleanup [\#742](https://github.com/kevinpapst/kimai2/pull/742) ([kevinpapst](https://github.com/kevinpapst))
-- use bootstrap tooltips instead of own solution [\#741](https://github.com/kevinpapst/kimai2/pull/741) ([kevinpapst](https://github.com/kevinpapst))
-- always query timesheets by begin date [\#740](https://github.com/kevinpapst/kimai2/pull/740) ([kevinpapst](https://github.com/kevinpapst))
-- prevent jumping icons in navbar between collapsed and open state [\#739](https://github.com/kevinpapst/kimai2/pull/739) ([kevinpapst](https://github.com/kevinpapst))
-- translate time-tracking in login screen and browser title [\#738](https://github.com/kevinpapst/kimai2/pull/738) ([kevinpapst](https://github.com/kevinpapst))
-- theme update for swedish auth screens [\#737](https://github.com/kevinpapst/kimai2/pull/737) ([kevinpapst](https://github.com/kevinpapst))
-- Testing: Webpack upgrade [\#729](https://github.com/kevinpapst/kimai2/pull/729) ([kevinpapst](https://github.com/kevinpapst))
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.0)
 
 ## [0.9](https://github.com/kevinpapst/kimai2/tree/0.9) (2019-04-29)
 [Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.8.1...0.9)
 
-**Implemented enhancements:**
-
-- Translation to Swedish [\#731](https://github.com/kevinpapst/kimai2/issues/731)
-- Remove active flag in user preferences form for non admin user [\#694](https://github.com/kevinpapst/kimai2/issues/694)
-- Add floor and ceil rounding [\#692](https://github.com/kevinpapst/kimai2/issues/692)
-- POST/PUT API endpoints for projects and activities [\#683](https://github.com/kevinpapst/kimai2/issues/683)
-- API is not able to handle CORS [\#646](https://github.com/kevinpapst/kimai2/issues/646)
-- Recompile the frontend assets for usage in a sub-directory [\#635](https://github.com/kevinpapst/kimai2/issues/635)
-- Remove database table prefix [\#633](https://github.com/kevinpapst/kimai2/issues/633)
-- Autofocus on first entry of forms [\#620](https://github.com/kevinpapst/kimai2/issues/620)
-- Activity admin - filter for globals [\#598](https://github.com/kevinpapst/kimai2/issues/598)
-- Non visible customer/projects etc are shown in dropdowns [\#597](https://github.com/kevinpapst/kimai2/issues/597)
-- remove duplicate confirm dialog of deletion [\#591](https://github.com/kevinpapst/kimai2/issues/591)
-- remove mobile navbar header [\#588](https://github.com/kevinpapst/kimai2/issues/588)
-- Support 12h time format [\#578](https://github.com/kevinpapst/kimai2/issues/578)
-- add timerange filter to timesheet export api [\#577](https://github.com/kevinpapst/kimai2/issues/577)
-- Extend rounding options with "to closest" mode [\#576](https://github.com/kevinpapst/kimai2/issues/576)
-- Custom CSS [\#516](https://github.com/kevinpapst/kimai2/issues/516)
-- reduce config complexity by converting php format to js format [\#734](https://github.com/kevinpapst/kimai2/pull/734) ([kevinpapst](https://github.com/kevinpapst))
-- Updated authorization screens [\#727](https://github.com/kevinpapst/kimai2/pull/727) ([kevinpapst](https://github.com/kevinpapst))
-- added delete timesheet API endpoint [\#726](https://github.com/kevinpapst/kimai2/pull/726) ([kevinpapst](https://github.com/kevinpapst))
-- Design updates [\#723](https://github.com/kevinpapst/kimai2/pull/723) ([kevinpapst](https://github.com/kevinpapst))
-- API: changed date-format, camelCase instead of snake\_case, null values, update and create for customer and project [\#718](https://github.com/kevinpapst/kimai2/pull/718) ([kevinpapst](https://github.com/kevinpapst))
-- added api/activities POST and PATCH [\#717](https://github.com/kevinpapst/kimai2/pull/717) ([horlabs](https://github.com/horlabs))
-- allow to overwrite config via prepend [\#715](https://github.com/kevinpapst/kimai2/pull/715) ([kevinpapst](https://github.com/kevinpapst))
-- Load export type ids dynamically [\#703](https://github.com/kevinpapst/kimai2/pull/703) ([simone-gasparini](https://github.com/simone-gasparini))
-- fixing default env var for cors header [\#656](https://github.com/kevinpapst/kimai2/pull/656) ([kevinpapst](https://github.com/kevinpapst))
-- added cors bundle to allow external api access [\#655](https://github.com/kevinpapst/kimai2/pull/655) ([kevinpapst](https://github.com/kevinpapst))
-- added route to redirect locale to configured homepage [\#654](https://github.com/kevinpapst/kimai2/pull/654) ([kevinpapst](https://github.com/kevinpapst))
--  added database driven system configurations with admin screen [\#647](https://github.com/kevinpapst/kimai2/pull/647) ([kevinpapst](https://github.com/kevinpapst))
-- added new rounding mode: closest [\#611](https://github.com/kevinpapst/kimai2/pull/611) ([kevinpapst](https://github.com/kevinpapst))
-- order datatable items by name [\#594](https://github.com/kevinpapst/kimai2/pull/594) ([kevinpapst](https://github.com/kevinpapst))
-- UI improvements for datatables [\#593](https://github.com/kevinpapst/kimai2/pull/593) ([kevinpapst](https://github.com/kevinpapst))
-- Plugins support [\#592](https://github.com/kevinpapst/kimai2/pull/592) ([kevinpapst](https://github.com/kevinpapst))
-
-**Fixed bugs:**
-
-- Export date parsing does not care about timezone [\#707](https://github.com/kevinpapst/kimai2/issues/707)
-- Error on importing v1 timeSheets [\#645](https://github.com/kevinpapst/kimai2/issues/645)
-- 500 \(Internal Server Error\) create customer [\#711](https://github.com/kevinpapst/kimai2/issues/711)
-- API docs are wrong for GET entity \(ignores serialization group\) [\#701](https://github.com/kevinpapst/kimai2/issues/701)
-- API date and datetime format [\#700](https://github.com/kevinpapst/kimai2/issues/700)
-- totals do not match [\#691](https://github.com/kevinpapst/kimai2/issues/691)
-- Validate email when creating user via cmd-line [\#663](https://github.com/kevinpapst/kimai2/issues/663)
-- Datepicker "From" not working [\#651](https://github.com/kevinpapst/kimai2/issues/651)
-- Error export PDF [\#648](https://github.com/kevinpapst/kimai2/issues/648)
-- Time selection dropdown not working in Firefox [\#618](https://github.com/kevinpapst/kimai2/issues/618)
-- Revoke of start\_own\_timesheet permission doesn't prevent start active entry [\#606](https://github.com/kevinpapst/kimai2/issues/606)
-- resize mobile navbar buttons [\#582](https://github.com/kevinpapst/kimai2/issues/582)
-- fix tests that failed around midnight [\#735](https://github.com/kevinpapst/kimai2/pull/735) ([kevinpapst](https://github.com/kevinpapst))
-- remove invalid cache header [\#722](https://github.com/kevinpapst/kimai2/pull/722) ([kevinpapst](https://github.com/kevinpapst))
-- fix modal - autofocus problem, datepicker not shown on begin date [\#653](https://github.com/kevinpapst/kimai2/pull/653) ([kevinpapst](https://github.com/kevinpapst))
-- fix pdf export cache directory [\#650](https://github.com/kevinpapst/kimai2/pull/650) ([kevinpapst](https://github.com/kevinpapst))
-
-**Closed issues:**
-
-- 403 error after installation [\#725](https://github.com/kevinpapst/kimai2/issues/725)
-- AppExtension Error after bin/console cache:clear --env=prod on Line 43 [\#721](https://github.com/kevinpapst/kimai2/issues/721)
-- Kimai-v1 Import Failure [\#719](https://github.com/kevinpapst/kimai2/issues/719)
-- Review export lifecycle for plugin injection [\#702](https://github.com/kevinpapst/kimai2/issues/702)
-- Missing database-table kimai2\_configuration while trying to run import/migration script [\#698](https://github.com/kevinpapst/kimai2/issues/698)
-- Import from v1 fails if two users have the same email or blank email [\#688](https://github.com/kevinpapst/kimai2/issues/688)
-- mysql limit of max amount of activities ? [\#681](https://github.com/kevinpapst/kimai2/issues/681)
-- Filter by project broken [\#670](https://github.com/kevinpapst/kimai2/issues/670)
-- Group of user [\#669](https://github.com/kevinpapst/kimai2/issues/669)
-- Demo not loading [\#665](https://github.com/kevinpapst/kimai2/issues/665)
-- Admin Panel [\#662](https://github.com/kevinpapst/kimai2/issues/662)
-- Some activites don't show up in last activities [\#609](https://github.com/kevinpapst/kimai2/issues/609)
-- Wrong link in the CSS [\#605](https://github.com/kevinpapst/kimai2/issues/605)
-- Failed to import users: failed to validate user [\#600](https://github.com/kevinpapst/kimai2/issues/600)
-- Edit timesheet , delete user edit own timesheet [\#498](https://github.com/kevinpapst/kimai2/issues/498)
-- mixed date formats in the api for the timesheet [\#658](https://github.com/kevinpapst/kimai2/issues/658)
-- Add demo bundle [\#442](https://github.com/kevinpapst/kimai2/issues/442)
-
-**Merged pull requests:**
-
-- added svenska [\#732](https://github.com/kevinpapst/kimai2/pull/732) ([kevinpapst](https://github.com/kevinpapst))
-- apply users timezone to toolbar queries [\#716](https://github.com/kevinpapst/kimai2/pull/716) ([kevinpapst](https://github.com/kevinpapst))
-- remove unused role ROLE\_CUSTOMER [\#712](https://github.com/kevinpapst/kimai2/pull/712) ([kevinpapst](https://github.com/kevinpapst))
-- Update to Symfony 4.2 [\#710](https://github.com/kevinpapst/kimai2/pull/710) ([kevinpapst](https://github.com/kevinpapst))
-- fix validation for create user command [\#709](https://github.com/kevinpapst/kimai2/pull/709) ([kevinpapst](https://github.com/kevinpapst))
-- remove the total counter from all admin pages [\#708](https://github.com/kevinpapst/kimai2/pull/708) ([kevinpapst](https://github.com/kevinpapst))
-- removed active flag in user preferences form for non admin user. \(\#694\) [\#696](https://github.com/kevinpapst/kimai2/pull/696) ([simone-gasparini](https://github.com/simone-gasparini))
-- added floor and ceil rounding with tests \(\#692\) [\#695](https://github.com/kevinpapst/kimai2/pull/695) ([simone-gasparini](https://github.com/simone-gasparini))
-- fixed activity-project assignment for kimai v1 importer [\#679](https://github.com/kevinpapst/kimai2/pull/679) ([kevinpapst](https://github.com/kevinpapst))
-- added content-type to allowed headers for api [\#672](https://github.com/kevinpapst/kimai2/pull/672) ([hmr-it-jr](https://github.com/hmr-it-jr))
-- added plugin screen [\#671](https://github.com/kevinpapst/kimai2/pull/671) ([kevinpapst](https://github.com/kevinpapst))
-- Updated hungarian translation [\#661](https://github.com/kevinpapst/kimai2/pull/661) ([infeeeee](https://github.com/infeeeee))
-- remove mailer url from about debug info [\#657](https://github.com/kevinpapst/kimai2/pull/657) ([kevinpapst](https://github.com/kevinpapst))
-- delete directory with invalid case [\#643](https://github.com/kevinpapst/kimai2/pull/643) ([kevinpapst](https://github.com/kevinpapst))
-- added command to create release packages \(for FTP user\) [\#642](https://github.com/kevinpapst/kimai2/pull/642) ([kevinpapst](https://github.com/kevinpapst))
-- removed dynamic database prefix [\#641](https://github.com/kevinpapst/kimai2/pull/641) ([kevinpapst](https://github.com/kevinpapst))
-- set autofocus attribute on form fields for better keyboard support [\#640](https://github.com/kevinpapst/kimai2/pull/640) ([kevinpapst](https://github.com/kevinpapst))
-- API - added begin end and export filter for timesheets [\#639](https://github.com/kevinpapst/kimai2/pull/639) ([kevinpapst](https://github.com/kevinpapst))
-- replaced delete confirm dialog with modal [\#638](https://github.com/kevinpapst/kimai2/pull/638) ([kevinpapst](https://github.com/kevinpapst))
-- convert-timezone: add a default value 'y' to the asked question [\#637](https://github.com/kevinpapst/kimai2/pull/637) ([blueowl04](https://github.com/blueowl04))
-- support subdirectories and subdomains for assets [\#636](https://github.com/kevinpapst/kimai2/pull/636) ([kevinpapst](https://github.com/kevinpapst))
-- improved plugin support [\#634](https://github.com/kevinpapst/kimai2/pull/634) ([kevinpapst](https://github.com/kevinpapst))
-- fix random order in recent activities [\#631](https://github.com/kevinpapst/kimai2/pull/631) ([kevinpapst](https://github.com/kevinpapst))
-- fix for firefox datepicker focus problem in modals [\#630](https://github.com/kevinpapst/kimai2/pull/630) ([kevinpapst](https://github.com/kevinpapst))
-- remove invisible entities from toolbars [\#628](https://github.com/kevinpapst/kimai2/pull/628) ([kevinpapst](https://github.com/kevinpapst))
-- removed inline documentation [\#624](https://github.com/kevinpapst/kimai2/pull/624) ([kevinpapst](https://github.com/kevinpapst))
-- added support for Ante meridiem and Post meridiem format [\#615](https://github.com/kevinpapst/kimai2/pull/615) ([kevinpapst](https://github.com/kevinpapst))
-- added filter for global activities [\#614](https://github.com/kevinpapst/kimai2/pull/614) ([kevinpapst](https://github.com/kevinpapst))
-- Improve create and start permission handling [\#613](https://github.com/kevinpapst/kimai2/pull/613) ([kevinpapst](https://github.com/kevinpapst))
-- Edit and create timesheet records in modal [\#603](https://github.com/kevinpapst/kimai2/pull/603) ([kevinpapst](https://github.com/kevinpapst))
-- code cleanup [\#602](https://github.com/kevinpapst/kimai2/pull/602) ([kevinpapst](https://github.com/kevinpapst))
-- simplify theme settings in user profile [\#586](https://github.com/kevinpapst/kimai2/pull/586) ([kevinpapst](https://github.com/kevinpapst))
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.9)
 
 ## [0.8.1](https://github.com/kevinpapst/kimai2/tree/0.8.1) (2019-02-22)
 [Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.8...0.8.1)
 
-**Fixed bugs:**
-
-- deletion of customers leads to internal server error 500 [\#589](https://github.com/kevinpapst/kimai2/issues/589)
-- Entry editor label wrong \(from/to\) [\#587](https://github.com/kevinpapst/kimai2/issues/587)
-
-**Merged pull requests:**
-
-- Support foreign keys with SQLite [\#590](https://github.com/kevinpapst/kimai2/pull/590) ([kevinpapst](https://github.com/kevinpapst))
-- post release fixes [\#584](https://github.com/kevinpapst/kimai2/pull/584) ([kevinpapst](https://github.com/kevinpapst))
-- Mobile navbar size [\#583](https://github.com/kevinpapst/kimai2/pull/583) ([kevinpapst](https://github.com/kevinpapst))
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.8.1)
 
 ## [0.8](https://github.com/kevinpapst/kimai2/tree/0.8) (2019-02-19)
 [Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.7...0.8)
 
-**Implemented enhancements:**
-
-- Export other users' timesheets using the API [\#562](https://github.com/kevinpapst/kimai2/issues/562)
-- Some importer bugs/improvements [\#553](https://github.com/kevinpapst/kimai2/issues/553)
-- Export timesheet only exports entries on the current page [\#534](https://github.com/kevinpapst/kimai2/issues/534)
-- On the last activities dropdown show tha last ten DIFFERENT activities [\#533](https://github.com/kevinpapst/kimai2/issues/533)
-- Better user expierence on "My Times" [\#526](https://github.com/kevinpapst/kimai2/issues/526)
-- Highlight current day in datepickers and not only the selected day [\#522](https://github.com/kevinpapst/kimai2/issues/522)
-- Configuration of first page after login [\#501](https://github.com/kevinpapst/kimai2/issues/501)
-- Visual Grouping of entry from same day or same week with some stats of that group [\#495](https://github.com/kevinpapst/kimai2/issues/495)
-
-**Fixed bugs:**
-
-- Error 404 on 'My times' page 2+ if the time range is changed to something smaller [\#558](https://github.com/kevinpapst/kimai2/issues/558)
-- Timezone is not working correctly [\#554](https://github.com/kevinpapst/kimai2/issues/554)
-- New time picker not working on languages without updated translation [\#546](https://github.com/kevinpapst/kimai2/issues/546)
-- Export timesheet only exports entries on the current page [\#534](https://github.com/kevinpapst/kimai2/issues/534)
-- Kimai2 will not allow me to enter times in the future [\#531](https://github.com/kevinpapst/kimai2/issues/531)
-- No projects in filter section [\#525](https://github.com/kevinpapst/kimai2/issues/525)
-- This value should be greater than or equal to zero [\#511](https://github.com/kevinpapst/kimai2/issues/511)
-- Wrong time after migration kimai v1 data [\#507](https://github.com/kevinpapst/kimai2/issues/507)
-- SQL-Error for getRecentActivities\(\) caused by GROUP BY  [\#488](https://github.com/kevinpapst/kimai2/issues/488)
-- fix sql for only\_full\_group\_by [\#581](https://github.com/kevinpapst/kimai2/pull/581) ([kevinpapst](https://github.com/kevinpapst))
-
-**Closed issues:**
-
-- Feedback for improving installation setup [\#541](https://github.com/kevinpapst/kimai2/issues/541)
-- template entry.end\_time shows empty field [\#535](https://github.com/kevinpapst/kimai2/issues/535)
-
-**Merged pull requests:**
-
-- handle deleted user during import from v1 [\#569](https://github.com/kevinpapst/kimai2/pull/569) ([kevinpapst](https://github.com/kevinpapst))
-- fix pagination in combination with daterange picker [\#568](https://github.com/kevinpapst/kimai2/pull/568) ([kevinpapst](https://github.com/kevinpapst))
-- allow to query other users timesheets via api [\#563](https://github.com/kevinpapst/kimai2/pull/563) ([kevinpapst](https://github.com/kevinpapst))
-- Updated HTML invoice templates [\#560](https://github.com/kevinpapst/kimai2/pull/560) ([kevinpapst](https://github.com/kevinpapst))
-- updated composer packages [\#559](https://github.com/kevinpapst/kimai2/pull/559) ([kevinpapst](https://github.com/kevinpapst))
-- fix timezone problems in timesheet forms [\#555](https://github.com/kevinpapst/kimai2/pull/555) ([kevinpapst](https://github.com/kevinpapst))
-- Daily stats in timesheet [\#552](https://github.com/kevinpapst/kimai2/pull/552) ([kevinpapst](https://github.com/kevinpapst))
-- Added more php requirements to documentation [\#551](https://github.com/kevinpapst/kimai2/pull/551) ([infeeeee](https://github.com/infeeeee))
-- improve recent activities [\#550](https://github.com/kevinpapst/kimai2/pull/550) ([kevinpapst](https://github.com/kevinpapst))
-- scss fixes: year selector width, dropdown menu width, navbar refactoring [\#549](https://github.com/kevinpapst/kimai2/pull/549) ([infeeeee](https://github.com/infeeeee))
-- improved installation docs [\#548](https://github.com/kevinpapst/kimai2/pull/548) ([kevinpapst](https://github.com/kevinpapst))
-- fix daterange-picker for fr, hu and ar [\#547](https://github.com/kevinpapst/kimai2/pull/547) ([kevinpapst](https://github.com/kevinpapst))
-- do not limit users timesheet export page size [\#545](https://github.com/kevinpapst/kimai2/pull/545) ([kevinpapst](https://github.com/kevinpapst))
-- Use Symfony formatter for currency symbol placement [\#542](https://github.com/kevinpapst/kimai2/pull/542) ([sanjitlpatel](https://github.com/sanjitlpatel))
-- Localized date-inputs and daterange-picker [\#540](https://github.com/kevinpapst/kimai2/pull/540) ([kevinpapst](https://github.com/kevinpapst))
-- added export module [\#538](https://github.com/kevinpapst/kimai2/pull/538) ([kevinpapst](https://github.com/kevinpapst))
-- updated documentation [\#536](https://github.com/kevinpapst/kimai2/pull/536) ([kevinpapst](https://github.com/kevinpapst))
-- support remote data in beta-test selectpicker [\#529](https://github.com/kevinpapst/kimai2/pull/529) ([kevinpapst](https://github.com/kevinpapst))
-- Improve allowed running records [\#528](https://github.com/kevinpapst/kimai2/pull/528) ([kevinpapst](https://github.com/kevinpapst))
-- Improve daterangepicker [\#527](https://github.com/kevinpapst/kimai2/pull/527) ([kevinpapst](https://github.com/kevinpapst))
-- added configurable view after login [\#523](https://github.com/kevinpapst/kimai2/pull/523) ([kevinpapst](https://github.com/kevinpapst))
-- convert timesheets to UTC with support for user timezone [\#372](https://github.com/kevinpapst/kimai2/pull/372) ([kevinpapst](https://github.com/kevinpapst))
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.8)
 
 ## [0.7](https://github.com/kevinpapst/kimai2/tree/0.7) (2019-01-28)
 [Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.6.1...0.7)
 
-**Implemented enhancements:**
-
-- Editing from calendar view will return to my times table instead of calendar [\#515](https://github.com/kevinpapst/kimai2/issues/515)
-- Timesheet Export for Admins [\#503](https://github.com/kevinpapst/kimai2/issues/503)
-- Customer List Not Alphabetic [\#499](https://github.com/kevinpapst/kimai2/issues/499)
-- sorting of ${entry.X} values [\#487](https://github.com/kevinpapst/kimai2/issues/487)
-- ${entry.description} needed in Word-Docx [\#485](https://github.com/kevinpapst/kimai2/issues/485)
-- Automatic sort for activities, customers, etc. [\#477](https://github.com/kevinpapst/kimai2/issues/477)
-- User title in the timesheet invoice [\#461](https://github.com/kevinpapst/kimai2/issues/461)
-- global variables for reports/invoices [\#438](https://github.com/kevinpapst/kimai2/issues/438)
-- Configuration option: Only one active record for each user [\#427](https://github.com/kevinpapst/kimai2/issues/427)
-- User creating activity and projects [\#393](https://github.com/kevinpapst/kimai2/issues/393)
-- Configuration option to disable fixed rate and hourly rate from "edit timesheet" [\#330](https://github.com/kevinpapst/kimai2/issues/330)
-- Set other users hourly rate [\#303](https://github.com/kevinpapst/kimai2/issues/303)
-- Feature request - Make "Rate" hideable [\#217](https://github.com/kevinpapst/kimai2/issues/217)
--  fixed null project for advanced invoice calculator [\#462](https://github.com/kevinpapst/kimai2/pull/462) ([kevinpapst](https://github.com/kevinpapst))
-
-**Fixed bugs:**
-
-- Timesheet Export for Admins [\#503](https://github.com/kevinpapst/kimai2/issues/503)
-- admin activity: visibility "none" \(no filter\) causes sql-error [\#491](https://github.com/kevinpapst/kimai2/issues/491)
-- login-screen optimizations [\#483](https://github.com/kevinpapst/kimai2/issues/483)
-- Configuration of roles to add/edit customers, projects, activities... [\#479](https://github.com/kevinpapst/kimai2/issues/479)
-- Line breaks for address and payment information fields [\#464](https://github.com/kevinpapst/kimai2/issues/464)
-- Possible to use a decimal in hourly rate field? [\#458](https://github.com/kevinpapst/kimai2/issues/458)
-- Invoice Number Generator possibly not compatible  [\#454](https://github.com/kevinpapst/kimai2/issues/454)
-- users can change their role to system-admin [\#440](https://github.com/kevinpapst/kimai2/issues/440)
-- fix wrong include filename in user registration [\#520](https://github.com/kevinpapst/kimai2/pull/520) ([kevinpapst](https://github.com/kevinpapst))
-- fix segmentation fault - rollback composer dependencies [\#463](https://github.com/kevinpapst/kimai2/pull/463) ([kevinpapst](https://github.com/kevinpapst))
--  fixed null project for advanced invoice calculator [\#462](https://github.com/kevinpapst/kimai2/pull/462) ([kevinpapst](https://github.com/kevinpapst))
-- fix the restart timesheet button [\#436](https://github.com/kevinpapst/kimai2/pull/436) ([kevinpapst](https://github.com/kevinpapst))
-
-**Closed issues:**
-
-- Redirecting when using Kimai on a subdirectory + reverse proxy [\#492](https://github.com/kevinpapst/kimai2/issues/492)
-- Installation \(Cannot declare.... in use\) [\#455](https://github.com/kevinpapst/kimai2/issues/455)
-- New Number Generator not recognized [\#453](https://github.com/kevinpapst/kimai2/issues/453)
-- de/help/invoices returns 404 error [\#452](https://github.com/kevinpapst/kimai2/issues/452)
-- Can you Add Brazilian Portuguese Translation? I can help it.. [\#444](https://github.com/kevinpapst/kimai2/issues/444)
-- replace all selects with smart-selects and live-search [\#441](https://github.com/kevinpapst/kimai2/issues/441)
-- use parsedown-extra for rendering markdown [\#388](https://github.com/kevinpapst/kimai2/issues/388)
-- Think about a cooler name [\#133](https://github.com/kevinpapst/kimai2/issues/133)
-
-**Merged pull requests:**
-
-- pagination without reload while keeping filters applied [\#521](https://github.com/kevinpapst/kimai2/pull/521) ([kevinpapst](https://github.com/kevinpapst))
-- go back to calendar after editing and creation of time-records [\#519](https://github.com/kevinpapst/kimai2/pull/519) ([kevinpapst](https://github.com/kevinpapst))
--  fetch toolbar results without page reload [\#518](https://github.com/kevinpapst/kimai2/pull/518) ([kevinpapst](https://github.com/kevinpapst))
-- Form and theme improvements [\#513](https://github.com/kevinpapst/kimai2/pull/513) ([kevinpapst](https://github.com/kevinpapst))
-- validation for future and negative times [\#512](https://github.com/kevinpapst/kimai2/pull/512) ([kevinpapst](https://github.com/kevinpapst))
-- alphabetical order for selectboxes [\#510](https://github.com/kevinpapst/kimai2/pull/510) ([kevinpapst](https://github.com/kevinpapst))
-- Export team timesheets [\#508](https://github.com/kevinpapst/kimai2/pull/508) ([kevinpapst](https://github.com/kevinpapst))
-- fix broken sql in activity admin [\#506](https://github.com/kevinpapst/kimai2/pull/506) ([kevinpapst](https://github.com/kevinpapst))
-- display invoice entries in ascending order [\#505](https://github.com/kevinpapst/kimai2/pull/505) ([kevinpapst](https://github.com/kevinpapst))
-- Improve DOCX template row [\#504](https://github.com/kevinpapst/kimai2/pull/504) ([kevinpapst](https://github.com/kevinpapst))
-- do not display admin menu if it has no children [\#500](https://github.com/kevinpapst/kimai2/pull/500) ([kevinpapst](https://github.com/kevinpapst))
-- login-screen optimizations [\#493](https://github.com/kevinpapst/kimai2/pull/493) ([lduer](https://github.com/lduer))
-- preg\_replace for md-file-extensions when rendering correct link… [\#482](https://github.com/kevinpapst/kimai2/pull/482) ([lduer](https://github.com/lduer))
-- Better composer install in the docker [\#481](https://github.com/kevinpapst/kimai2/pull/481) ([tobybatch](https://github.com/tobybatch))
-- Update dockerfile for https in composer installer [\#478](https://github.com/kevinpapst/kimai2/pull/478) ([scolson](https://github.com/scolson))
-- support line breaks in docx [\#466](https://github.com/kevinpapst/kimai2/pull/466) ([kevinpapst](https://github.com/kevinpapst))
-- updated README and docu [\#465](https://github.com/kevinpapst/kimai2/pull/465) ([kevinpapst](https://github.com/kevinpapst))
-- allow decimals in users hourly rate [\#460](https://github.com/kevinpapst/kimai2/pull/460) ([kevinpapst](https://github.com/kevinpapst))
-- updated all composer packages [\#459](https://github.com/kevinpapst/kimai2/pull/459) ([kevinpapst](https://github.com/kevinpapst))
-- moved some packages to dev requirements [\#456](https://github.com/kevinpapst/kimai2/pull/456) ([kevinpapst](https://github.com/kevinpapst))
-- Added portuguese translations [\#446](https://github.com/kevinpapst/kimai2/pull/446) ([marquesmatheus](https://github.com/marquesmatheus))
-- Simplify timesheet edit form if only one customer is existing [\#443](https://github.com/kevinpapst/kimai2/pull/443) ([kevinpapst](https://github.com/kevinpapst))
-- added project variables for invoice templates [\#439](https://github.com/kevinpapst/kimai2/pull/439) ([kevinpapst](https://github.com/kevinpapst))
-- added configurable permission system [\#424](https://github.com/kevinpapst/kimai2/pull/424) ([kevinpapst](https://github.com/kevinpapst))
-- Only one running timesheet: automatically stop others [\#386](https://github.com/kevinpapst/kimai2/pull/386) ([lduer](https://github.com/lduer))
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.7)
 
 ## [0.6.1](https://github.com/kevinpapst/kimai2/tree/0.6.1) (2018-11-19)
 [Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.6...0.6.1)
 
-**Fixed bugs:**
-
-- Error importing v1 Database [\#428](https://github.com/kevinpapst/kimai2/issues/428)
-- Redo button missing? [\#426](https://github.com/kevinpapst/kimai2/issues/426)
-
-**Closed issues:**
-
--  Error importing v1 Database \(could not convert to string\) [\#431](https://github.com/kevinpapst/kimai2/issues/431)
-
-**Merged pull requests:**
-
-- fix migration for MySQL [\#430](https://github.com/kevinpapst/kimai2/pull/430) ([kevinpapst](https://github.com/kevinpapst))
-- fix importer for MySQL [\#429](https://github.com/kevinpapst/kimai2/pull/429) ([kevinpapst](https://github.com/kevinpapst))
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.6.1)
 
 ## [0.6](https://github.com/kevinpapst/kimai2/tree/0.6) (2018-11-18)
 [Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.5...0.6)
 
-**Implemented enhancements:**
-
-- Language setting does not work immediately [\#418](https://github.com/kevinpapst/kimai2/issues/418)
-- Merge projects and/or activities [\#406](https://github.com/kevinpapst/kimai2/issues/406)
-- Global activities support for Kimai 1 importer [\#400](https://github.com/kevinpapst/kimai2/issues/400)
-- Invoice Grouped by Activity [\#379](https://github.com/kevinpapst/kimai2/issues/379)
-- Set the order of columns \(in my times page\) [\#371](https://github.com/kevinpapst/kimai2/issues/371)
-- Columns on small/narrow displays \(mobile\) on „my times“ page [\#370](https://github.com/kevinpapst/kimai2/issues/370)
-- Make settings more accessible [\#365](https://github.com/kevinpapst/kimai2/issues/365)
-- Data validation for register page username field. [\#360](https://github.com/kevinpapst/kimai2/issues/360)
-- Option for setting default calendar view [\#359](https://github.com/kevinpapst/kimai2/issues/359)
-- Activities just Duration [\#334](https://github.com/kevinpapst/kimai2/issues/334)
-- API: Add filtering/sorting/limits [\#333](https://github.com/kevinpapst/kimai2/issues/333)
-- API: Timesheets [\#315](https://github.com/kevinpapst/kimai2/issues/315)
-- Feature request: Quick search box for activities when creating new timesheet [\#307](https://github.com/kevinpapst/kimai2/issues/307)
-- Separate Customer / Project / Activity input when logging time [\#250](https://github.com/kevinpapst/kimai2/issues/250)
-- Interactive help after fresh installation [\#94](https://github.com/kevinpapst/kimai2/issues/94)
-
-**Fixed bugs:**
-
-- Invoicing export - 500: Internal Server Error [\#390](https://github.com/kevinpapst/kimai2/issues/390)
-- invalid CSRF-Token [\#344](https://github.com/kevinpapst/kimai2/issues/344)
-- fix column visibility if unconfigured \(no cookie existing\) [\#423](https://github.com/kevinpapst/kimai2/pull/423) ([kevinpapst](https://github.com/kevinpapst))
-- fix duration and rate for html invoices [\#414](https://github.com/kevinpapst/kimai2/pull/414) ([kevinpapst](https://github.com/kevinpapst))
-- fixed broken toolbar form with empty date [\#391](https://github.com/kevinpapst/kimai2/pull/391) ([kevinpapst](https://github.com/kevinpapst))
-
-**Closed issues:**
-
-- After installation no graphic/background/icons shown [\#417](https://github.com/kevinpapst/kimai2/issues/417)
-- Form fields should be always visible [\#408](https://github.com/kevinpapst/kimai2/issues/408)
-- Active filter should stay open [\#405](https://github.com/kevinpapst/kimai2/issues/405)
-- Make project field optional [\#401](https://github.com/kevinpapst/kimai2/issues/401)
-- Unrecognized Options "renderer, number\_generator" under "kimai.invoice" [\#381](https://github.com/kevinpapst/kimai2/issues/381)
-- 500: Internal Server Error after login \(new install\) [\#342](https://github.com/kevinpapst/kimai2/issues/342)
-- Invoices export error [\#341](https://github.com/kevinpapst/kimai2/issues/341)
-- add the same activity for multiple projects [\#325](https://github.com/kevinpapst/kimai2/issues/325)
-- API: Endpoint for API docs needs session cookie [\#319](https://github.com/kevinpapst/kimai2/issues/319)
-- docker image for kimai2 [\#284](https://github.com/kevinpapst/kimai2/issues/284)
-
-**Merged pull requests:**
-
-- redirect to user language after profile update [\#421](https://github.com/kevinpapst/kimai2/pull/421) ([kevinpapst](https://github.com/kevinpapst))
-- added more timesheet related invoice fields [\#411](https://github.com/kevinpapst/kimai2/pull/411) ([kevinpapst](https://github.com/kevinpapst))
-- toolbar improvements [\#410](https://github.com/kevinpapst/kimai2/pull/410) ([kevinpapst](https://github.com/kevinpapst))
-- move entries from one entity to another upon deletion [\#409](https://github.com/kevinpapst/kimai2/pull/409) ([kevinpapst](https://github.com/kevinpapst))
-- show toolbar filter if they were submitted [\#407](https://github.com/kevinpapst/kimai2/pull/407) ([kevinpapst](https://github.com/kevinpapst))
-- full configurable data columns in all screen sizes [\#404](https://github.com/kevinpapst/kimai2/pull/404) ([kevinpapst](https://github.com/kevinpapst))
-- added global activity support in importer [\#402](https://github.com/kevinpapst/kimai2/pull/402) ([kevinpapst](https://github.com/kevinpapst))
-- added parsedown extension for header ids \(\#388\) [\#399](https://github.com/kevinpapst/kimai2/pull/399) ([lduer](https://github.com/lduer))
-- Fix for \#397 [\#398](https://github.com/kevinpapst/kimai2/pull/398) ([tobybatch](https://github.com/tobybatch))
-- Added links to docker hub and my docker repo [\#396](https://github.com/kevinpapst/kimai2/pull/396) ([tobybatch](https://github.com/tobybatch))
-- fixed issues- & milestone links [\#395](https://github.com/kevinpapst/kimai2/pull/395) ([lduer](https://github.com/lduer))
-- added links to further docker images by the community [\#394](https://github.com/kevinpapst/kimai2/pull/394) ([kevinpapst](https://github.com/kevinpapst))
-- beta test: added quick search box for customers, projects and activities [\#392](https://github.com/kevinpapst/kimai2/pull/392) ([kevinpapst](https://github.com/kevinpapst))
-- updated the documentation, reflecting the changes in \#306 [\#387](https://github.com/kevinpapst/kimai2/pull/387) ([lduer](https://github.com/lduer))
-- Added Hungarian translation and fixed the path of kimai.yaml in translation documentation [\#385](https://github.com/kevinpapst/kimai2/pull/385) ([infeeeee](https://github.com/infeeeee))
-- improved docs and cross-linked docker [\#383](https://github.com/kevinpapst/kimai2/pull/383) ([kevinpapst](https://github.com/kevinpapst))
-- Doc update of install/update instructions re: username [\#382](https://github.com/kevinpapst/kimai2/pull/382) ([srdco](https://github.com/srdco))
-- invoice calculator to group entries by activity [\#380](https://github.com/kevinpapst/kimai2/pull/380) ([kevinpapst](https://github.com/kevinpapst))
-- basic about screen with server and debug infos [\#378](https://github.com/kevinpapst/kimai2/pull/378) ([kevinpapst](https://github.com/kevinpapst))
-- Dev/demo dockerfile [\#377](https://github.com/kevinpapst/kimai2/pull/377) ([tobybatch](https://github.com/tobybatch))
-- Sidebar - user-profile links and language settings [\#369](https://github.com/kevinpapst/kimai2/pull/369) ([kevinpapst](https://github.com/kevinpapst))
-- added configurable initial calendar view [\#363](https://github.com/kevinpapst/kimai2/pull/363) ([kevinpapst](https://github.com/kevinpapst))
-- decrease minimum username to 3 character [\#362](https://github.com/kevinpapst/kimai2/pull/362) ([kevinpapst](https://github.com/kevinpapst))
-- Default country \(\#2\) [\#358](https://github.com/kevinpapst/kimai2/pull/358) ([tobybatch](https://github.com/tobybatch))
-- composer: removed deprecated symfony/lt, updated others [\#354](https://github.com/kevinpapst/kimai2/pull/354) ([kevinpapst](https://github.com/kevinpapst))
-- updated admin-lte theme bundle to 2.1.1 [\#350](https://github.com/kevinpapst/kimai2/pull/350) ([kevinpapst](https://github.com/kevinpapst))
-- updated timesheet and email documentation [\#349](https://github.com/kevinpapst/kimai2/pull/349) ([kevinpapst](https://github.com/kevinpapst))
-- updated required dependencies [\#346](https://github.com/kevinpapst/kimai2/pull/346) ([kevinpapst](https://github.com/kevinpapst))
-- Fix password reset [\#345](https://github.com/kevinpapst/kimai2/pull/345) ([kevinpapst](https://github.com/kevinpapst))
-- added arabic translations and locale support in datepicker [\#337](https://github.com/kevinpapst/kimai2/pull/337) ([kevinpapst](https://github.com/kevinpapst))
-- API endpoint for Timesheet entries [\#332](https://github.com/kevinpapst/kimai2/pull/332) ([kevinpapst](https://github.com/kevinpapst))
-- Support global activities [\#259](https://github.com/kevinpapst/kimai2/pull/259) ([kevinpapst](https://github.com/kevinpapst))
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.6)
 
 ## [0.5](https://github.com/kevinpapst/kimai2/tree/0.5) (2018-09-27)
 [Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.4...0.5)
 
-**Implemented enhancements:**
-
-- API: Kimai metadata endpoint [\#320](https://github.com/kevinpapst/kimai2/issues/320)
-- Support Markdown in timesheet description [\#295](https://github.com/kevinpapst/kimai2/issues/295)
-- Add support for MS Office templates [\#283](https://github.com/kevinpapst/kimai2/issues/283)
-- Adding rates to customers, projects and tasks [\#271](https://github.com/kevinpapst/kimai2/issues/271)
-- Delete invoice templates [\#267](https://github.com/kevinpapst/kimai2/issues/267)
-- Sum of hours in timesheet invoice [\#262](https://github.com/kevinpapst/kimai2/issues/262)
-- Feature request - API [\#251](https://github.com/kevinpapst/kimai2/issues/251)
-- Feature request - PDF Download for monthly report [\#244](https://github.com/kevinpapst/kimai2/issues/244)
-- Add support for OpenOffice templates [\#223](https://github.com/kevinpapst/kimai2/issues/223)
-- Feature Request - Excel Output of times [\#221](https://github.com/kevinpapst/kimai2/issues/221)
-- Add hourly rate options [\#111](https://github.com/kevinpapst/kimai2/issues/111)
-
-**Fixed bugs:**
-
-- Excel Output not containing data [\#327](https://github.com/kevinpapst/kimai2/issues/327)
-
-**Closed issues:**
-
-- Creating database schema throws exceptions [\#322](https://github.com/kevinpapst/kimai2/issues/322)
-- Add permission voter for invoices and templates [\#293](https://github.com/kevinpapst/kimai2/issues/293)
-
-**Merged pull requests:**
-
-- added copy invoice template action [\#331](https://github.com/kevinpapst/kimai2/pull/331) ([kevinpapst](https://github.com/kevinpapst))
-- fix spreadsheet renderer for invoices with one entry [\#328](https://github.com/kevinpapst/kimai2/pull/328) ([kevinpapst](https://github.com/kevinpapst))
-- invoice VAT as float and database key length [\#323](https://github.com/kevinpapst/kimai2/pull/323) ([kevinpapst](https://github.com/kevinpapst))
-- added version command + api endpoint [\#321](https://github.com/kevinpapst/kimai2/pull/321) ([kevinpapst](https://github.com/kevinpapst))
-- Timesheet export [\#317](https://github.com/kevinpapst/kimai2/pull/317) ([kevinpapst](https://github.com/kevinpapst))
-- added invoice voter [\#316](https://github.com/kevinpapst/kimai2/pull/316) ([kevinpapst](https://github.com/kevinpapst))
-- Refactored invoice system [\#306](https://github.com/kevinpapst/kimai2/pull/306) ([kevinpapst](https://github.com/kevinpapst))
-- add stable controller tests [\#305](https://github.com/kevinpapst/kimai2/pull/305) ([kevinpapst](https://github.com/kevinpapst))
-- Fixed rate and Hourly rates [\#304](https://github.com/kevinpapst/kimai2/pull/304) ([kevinpapst](https://github.com/kevinpapst))
-- add hourly\_rate and fixed\_rate to timesheet entries [\#302](https://github.com/kevinpapst/kimai2/pull/302) ([kevinpapst](https://github.com/kevinpapst))
-- allow to switch language on any page [\#299](https://github.com/kevinpapst/kimai2/pull/299) ([kevinpapst](https://github.com/kevinpapst))
--  Fix duration\_short format for french translation  [\#297](https://github.com/kevinpapst/kimai2/pull/297) ([jeau](https://github.com/jeau))
-- allow markdown in timesheet descriptions [\#296](https://github.com/kevinpapst/kimai2/pull/296) ([kevinpapst](https://github.com/kevinpapst))
-- added option to delete invoice template [\#294](https://github.com/kevinpapst/kimai2/pull/294) ([kevinpapst](https://github.com/kevinpapst))
-- Improved invoice preview [\#254](https://github.com/kevinpapst/kimai2/pull/254) ([kevinpapst](https://github.com/kevinpapst))
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.5)
 
 ## [0.4](https://github.com/kevinpapst/kimai2/tree/0.4) (2018-09-01)
 [Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.3...0.4)
 
-**Implemented enhancements:**
-
-- Delete user [\#225](https://github.com/kevinpapst/kimai2/issues/225)
-
-**Fixed bugs:**
-
-- Don't allow to stop an already stopped entry [\#282](https://github.com/kevinpapst/kimai2/issues/282)
-- installed it, and then what??? [\#255](https://github.com/kevinpapst/kimai2/issues/255)
-- fixed calendar for empty timesheet descriptions [\#265](https://github.com/kevinpapst/kimai2/pull/265) ([kevinpapst](https://github.com/kevinpapst))
-- fixed .htaccess for apache users [\#260](https://github.com/kevinpapst/kimai2/pull/260) ([kevinpapst](https://github.com/kevinpapst))
-
-**Closed issues:**
-
-- Spanish Translation Contrib [\#248](https://github.com/kevinpapst/kimai2/issues/248)
-- Administration of projects throws error if locale is "de" [\#247](https://github.com/kevinpapst/kimai2/issues/247)
-- Web Installer Package for near-automated installs from browser [\#235](https://github.com/kevinpapst/kimai2/issues/235)
-- Improve dashboard display [\#280](https://github.com/kevinpapst/kimai2/issues/280)
-- Feature request - Monthly overview / report [\#207](https://github.com/kevinpapst/kimai2/issues/207)
-
-**Merged pull requests:**
-
-- fixed money display in dashboard widgets [\#291](https://github.com/kevinpapst/kimai2/pull/291) ([kevinpapst](https://github.com/kevinpapst))
-- Symfony update 4.1.4 [\#290](https://github.com/kevinpapst/kimai2/pull/290) ([kevinpapst](https://github.com/kevinpapst))
-- do not allow to stop already stopped timesheets [\#289](https://github.com/kevinpapst/kimai2/pull/289) ([kevinpapst](https://github.com/kevinpapst))
-- added configurable formats for duration [\#287](https://github.com/kevinpapst/kimai2/pull/287) ([kevinpapst](https://github.com/kevinpapst))
-- Updated russian translations [\#286](https://github.com/kevinpapst/kimai2/pull/286) ([kevinpapst](https://github.com/kevinpapst))
-- Update french translation [\#279](https://github.com/kevinpapst/kimai2/pull/279) ([jeau](https://github.com/jeau))
-- Fix standard date format in french [\#278](https://github.com/kevinpapst/kimai2/pull/278) ([jeau](https://github.com/jeau))
--  new translations: spanish, french and italian [\#276](https://github.com/kevinpapst/kimai2/pull/276) ([kevinpapst](https://github.com/kevinpapst))
-- French translation for Kimai [\#275](https://github.com/kevinpapst/kimai2/pull/275) ([jeau](https://github.com/jeau))
-- updated to AdminLTE 2.4.8 [\#274](https://github.com/kevinpapst/kimai2/pull/274) ([kevinpapst](https://github.com/kevinpapst))
-- fixing migration\_v1.md url [\#270](https://github.com/kevinpapst/kimai2/pull/270) ([ltsavar](https://github.com/ltsavar))
-- dashboard widgets are configurable via config [\#269](https://github.com/kevinpapst/kimai2/pull/269) ([kevinpapst](https://github.com/kevinpapst))
-- Spanish translation for Kimai [\#266](https://github.com/kevinpapst/kimai2/pull/266) ([cobaltos](https://github.com/cobaltos))
-- moved theme settings to dynamic compiler pass [\#264](https://github.com/kevinpapst/kimai2/pull/264) ([kevinpapst](https://github.com/kevinpapst))
-- Added config setting to disable password-reset and user-registration [\#261](https://github.com/kevinpapst/kimai2/pull/261) ([kevinpapst](https://github.com/kevinpapst))
-- Added basic API endpoints [\#258](https://github.com/kevinpapst/kimai2/pull/258) ([kevinpapst](https://github.com/kevinpapst))
-- Hotfix for Symfony Flex incompatibility with latest composer changes [\#257](https://github.com/kevinpapst/kimai2/pull/257) ([kevinpapst](https://github.com/kevinpapst))
-- added italian translation [\#253](https://github.com/kevinpapst/kimai2/pull/253) ([kevinpapst](https://github.com/kevinpapst))
-- Delete user [\#249](https://github.com/kevinpapst/kimai2/pull/249) ([kevinpapst](https://github.com/kevinpapst))
-- dashboard widgets from event [\#246](https://github.com/kevinpapst/kimai2/pull/246) ([kevinpapst](https://github.com/kevinpapst))
-- Added timesheet-calendar view [\#236](https://github.com/kevinpapst/kimai2/pull/236) ([kevinpapst](https://github.com/kevinpapst))
-- Improved data fixtures [\#234](https://github.com/kevinpapst/kimai2/pull/234) ([kevinpapst](https://github.com/kevinpapst))
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.4)
 
 ## [0.3](https://github.com/kevinpapst/kimai2/tree/0.3) (2018-07-22)
 [Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.2...0.3)
 
-**Implemented enhancements:**
-
-- Install Kimai as WebApp [\#203](https://github.com/kevinpapst/kimai2/issues/203)
-- Replace AvanzuAdminTheme with AdminLTE bundle [\#201](https://github.com/kevinpapst/kimai2/issues/201)
-- Add dynamic column filter [\#174](https://github.com/kevinpapst/kimai2/issues/174)
-- Add register user function [\#164](https://github.com/kevinpapst/kimai2/issues/164)
-- Add forgot password function - login screen [\#163](https://github.com/kevinpapst/kimai2/issues/163)
-- Integrate FOSUserBundle \(for registration, password-reset, etc.\) [\#144](https://github.com/kevinpapst/kimai2/issues/144)
-- added dynamic column filter \#174 [\#184](https://github.com/kevinpapst/kimai2/pull/184) ([kevinpapst](https://github.com/kevinpapst))
-
-**Fixed bugs:**
-
-- Missing assets in fresh installation [\#213](https://github.com/kevinpapst/kimai2/issues/213)
-- Cannot remove payment terms from invoice template [\#188](https://github.com/kevinpapst/kimai2/issues/188)
-- Set PHP locale for date format and month names [\#110](https://github.com/kevinpapst/kimai2/issues/110)
-- Show revenue only for Admin \(wrong currency shown\) [\#19](https://github.com/kevinpapst/kimai2/issues/19)
-
-**Closed issues:**
-
-- Installation Issue of version1.3.1 [\#208](https://github.com/kevinpapst/kimai2/issues/208)
-- Error on bin/console doctrine:schema:create [\#191](https://github.com/kevinpapst/kimai2/issues/191)
-- Verifying email configuration [\#226](https://github.com/kevinpapst/kimai2/issues/226)
-- Add favicon [\#205](https://github.com/kevinpapst/kimai2/issues/205)
-- Document DB requirements in install docu [\#196](https://github.com/kevinpapst/kimai2/issues/196)
-- easier creation of tasks [\#195](https://github.com/kevinpapst/kimai2/issues/195)
-- Integrate lock bot [\#183](https://github.com/kevinpapst/kimai2/issues/183)
-- Upgrade to FontAwesome 5 [\#179](https://github.com/kevinpapst/kimai2/issues/179)
-
-**Merged pull requests:**
-
-- Easier creation of Tasks/Projects/User [\#230](https://github.com/kevinpapst/kimai2/pull/230) ([kevinpapst](https://github.com/kevinpapst))
-- Added email configuration docs [\#228](https://github.com/kevinpapst/kimai2/pull/228) ([kevinpapst](https://github.com/kevinpapst))
-- Show revenue only for ROLE\_ADMIN [\#227](https://github.com/kevinpapst/kimai2/pull/227) ([kevinpapst](https://github.com/kevinpapst))
-- hotfix responsiveness [\#220](https://github.com/kevinpapst/kimai2/pull/220) ([kevinpapst](https://github.com/kevinpapst))
-- Integrated FOSUserBundle [\#216](https://github.com/kevinpapst/kimai2/pull/216) ([kevinpapst](https://github.com/kevinpapst))
-- added auto-script to install assets [\#214](https://github.com/kevinpapst/kimai2/pull/214) ([kevinpapst](https://github.com/kevinpapst))
-- added yunohost installation link [\#212](https://github.com/kevinpapst/kimai2/pull/212) ([kevinpapst](https://github.com/kevinpapst))
-- added favicons and web app metadata [\#211](https://github.com/kevinpapst/kimai2/pull/211) ([kevinpapst](https://github.com/kevinpapst))
-- added FAQ and database requirement docu \#196 [\#210](https://github.com/kevinpapst/kimai2/pull/210) ([kevinpapst](https://github.com/kevinpapst))
-- Updated to AdminLTEBundle 1.0 [\#206](https://github.com/kevinpapst/kimai2/pull/206) ([kevinpapst](https://github.com/kevinpapst))
-- replaced AvanzuAdminTheme with AdminLTE bundle [\#202](https://github.com/kevinpapst/kimai2/pull/202) ([kevinpapst](https://github.com/kevinpapst))
-- allow empty invoice template terms \#188 [\#189](https://github.com/kevinpapst/kimai2/pull/189) ([kevinpapst](https://github.com/kevinpapst))
-- improved install docs and composer [\#187](https://github.com/kevinpapst/kimai2/pull/187) ([kevinpapst](https://github.com/kevinpapst))
-- added lock-bot config \#183 [\#186](https://github.com/kevinpapst/kimai2/pull/186) ([kevinpapst](https://github.com/kevinpapst))
-- Composer package name [\#185](https://github.com/kevinpapst/kimai2/pull/185) ([kevinpapst](https://github.com/kevinpapst))
-- updated to font-awesome 5 \#179 [\#181](https://github.com/kevinpapst/kimai2/pull/181) ([kevinpapst](https://github.com/kevinpapst))
-- language specific money and date display [\#180](https://github.com/kevinpapst/kimai2/pull/180) ([kevinpapst](https://github.com/kevinpapst))
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.3)
 
 ## [0.2](https://github.com/kevinpapst/kimai2/tree/0.2) (2018-06-23)
 [Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.1...0.2)
 
-**Implemented enhancements:**
-
-- Add english translation [\#8](https://github.com/kevinpapst/kimai2/issues/8)
-- Add configurable system configuration [\#6](https://github.com/kevinpapst/kimai2/issues/6)
-- Hide notifications after some seconds [\#169](https://github.com/kevinpapst/kimai2/issues/169)
-- Setup Scrutinizer to run code sniffer [\#158](https://github.com/kevinpapst/kimai2/issues/158)
-- Local config to overwrite settings [\#153](https://github.com/kevinpapst/kimai2/issues/153)
-- Improve mobile view [\#151](https://github.com/kevinpapst/kimai2/issues/151)
-- Add help text to form elements [\#138](https://github.com/kevinpapst/kimai2/issues/138)
-- Add duration-only mode [\#131](https://github.com/kevinpapst/kimai2/issues/131)
-- Add help controller [\#129](https://github.com/kevinpapst/kimai2/issues/129)
-- Secure create-user command [\#123](https://github.com/kevinpapst/kimai2/issues/123)
-- Add command for building a production release [\#115](https://github.com/kevinpapst/kimai2/issues/115)
-- Add webpack and webpack-encore for frontend assets [\#113](https://github.com/kevinpapst/kimai2/issues/113)
-- Add time rounding option [\#112](https://github.com/kevinpapst/kimai2/issues/112)
-- Add field order number in Projects [\#107](https://github.com/kevinpapst/kimai2/issues/107)
-- Create docu for invoice templates [\#106](https://github.com/kevinpapst/kimai2/issues/106)
-- Add invoice template: timesheet [\#104](https://github.com/kevinpapst/kimai2/issues/104)
-- Add importer from Kimai v1 [\#102](https://github.com/kevinpapst/kimai2/issues/102)
-- Setup error pages [\#100](https://github.com/kevinpapst/kimai2/issues/100)
-- Add basic HTML invoice rendering [\#97](https://github.com/kevinpapst/kimai2/issues/97)
-- Filter user in timesheet admin [\#93](https://github.com/kevinpapst/kimai2/issues/93)
-- Support to switch theme settings [\#89](https://github.com/kevinpapst/kimai2/issues/89)
-- Roles should become a real table [\#86](https://github.com/kevinpapst/kimai2/issues/86)
-- Fix Doctrine extensions config loader [\#84](https://github.com/kevinpapst/kimai2/issues/84)
-- Upgrade to Symfony 4 and Flex [\#74](https://github.com/kevinpapst/kimai2/issues/74)
-- Add remember me login [\#53](https://github.com/kevinpapst/kimai2/issues/53)
-- Add preferences sidebar [\#10](https://github.com/kevinpapst/kimai2/issues/10)
-- Add user settings [\#9](https://github.com/kevinpapst/kimai2/issues/9)
-- Mobile alignments and toolbar \#151 [\#157](https://github.com/kevinpapst/kimai2/pull/157) ([kevinpapst](https://github.com/kevinpapst))
-- Local config \#153 [\#156](https://github.com/kevinpapst/kimai2/pull/156) ([kevinpapst](https://github.com/kevinpapst))
-- Filter in hidden toolbar - improved mobile \#151 [\#155](https://github.com/kevinpapst/kimai2/pull/155) ([kevinpapst](https://github.com/kevinpapst))
-- Improved mobile view \#151 [\#150](https://github.com/kevinpapst/kimai2/pull/150) ([kevinpapst](https://github.com/kevinpapst))
-
-**Fixed bugs:**
-
-- Change to users language after login [\#7](https://github.com/kevinpapst/kimai2/issues/7)
-- Prevent end time before start time [\#152](https://github.com/kevinpapst/kimai2/issues/152)
-- Importing old data fails [\#145](https://github.com/kevinpapst/kimai2/issues/145)
-- Translate LanguageType choices  [\#83](https://github.com/kevinpapst/kimai2/issues/83)
-- Mobile alignments and toolbar \\#151 [\#157](https://github.com/kevinpapst/kimai2/pull/157) ([kevinpapst](https://github.com/kevinpapst))
-- Improved mobile view \\#151 [\#150](https://github.com/kevinpapst/kimai2/pull/150) ([kevinpapst](https://github.com/kevinpapst))
-
-**Closed issues:**
-
-- Add CHANGELOG.md [\#177](https://github.com/kevinpapst/kimai2/issues/177)
-- Add preview blog message and info text on old website [\#162](https://github.com/kevinpapst/kimai2/issues/162)
-- Upgrade to Symfony 4.1 [\#149](https://github.com/kevinpapst/kimai2/issues/149)
-- Replace has\_role\(\) with is\_granted\(\) [\#148](https://github.com/kevinpapst/kimai2/issues/148)
-- Duration mode: creating new timesheet records prefills duration with some seconds [\#137](https://github.com/kevinpapst/kimai2/issues/137)
-- \[RFC\] Encore: configureFilenames with hash after filename instead of in the filename [\#125](https://github.com/kevinpapst/kimai2/issues/125)
-- \[RFC\] Kimai license header [\#124](https://github.com/kevinpapst/kimai2/issues/124)
-- Setup travis to run phpunit tests [\#120](https://github.com/kevinpapst/kimai2/issues/120)
-- Add russian translation [\#95](https://github.com/kevinpapst/kimai2/issues/95)
-
-**Merged pull requests:**
-
-- \[WIP\] Translations [\#173](https://github.com/kevinpapst/kimai2/pull/173) ([simonschaufi](https://github.com/simonschaufi))
-- various documentation updates [\#176](https://github.com/kevinpapst/kimai2/pull/176) ([kevinpapst](https://github.com/kevinpapst))
-- code styles: header\_comment and ordered\_imports [\#175](https://github.com/kevinpapst/kimai2/pull/175) ([kevinpapst](https://github.com/kevinpapst))
-- Code sniffer rules \#158 [\#172](https://github.com/kevinpapst/kimai2/pull/172) ([kevinpapst](https://github.com/kevinpapst))
-- Set default locale for unit-tests [\#171](https://github.com/kevinpapst/kimai2/pull/171) ([kevinpapst](https://github.com/kevinpapst))
-- Hide success notification after 5 seconds [\#170](https://github.com/kevinpapst/kimai2/pull/170) ([kevinpapst](https://github.com/kevinpapst))
-- Added validation for end date before start date [\#167](https://github.com/kevinpapst/kimai2/pull/167) ([kevinpapst](https://github.com/kevinpapst))
-- Security expression \#148 [\#166](https://github.com/kevinpapst/kimai2/pull/166) ([kevinpapst](https://github.com/kevinpapst))
-- Composer install [\#165](https://github.com/kevinpapst/kimai2/pull/165) ([kevinpapst](https://github.com/kevinpapst))
-- added scrutinizer config \#158 [\#161](https://github.com/kevinpapst/kimai2/pull/161) ([kevinpapst](https://github.com/kevinpapst))
-- Update to Symfony 4.1 \#149 [\#160](https://github.com/kevinpapst/kimai2/pull/160) ([kevinpapst](https://github.com/kevinpapst))
-- Updated README [\#159](https://github.com/kevinpapst/kimai2/pull/159) ([kevinpapst](https://github.com/kevinpapst))
-- added russian translation \#95 [\#147](https://github.com/kevinpapst/kimai2/pull/147) ([kevinpapst](https://github.com/kevinpapst))
-- Bugfix importer \(\#145\) [\#146](https://github.com/kevinpapst/kimai2/pull/146) ([kevinpapst](https://github.com/kevinpapst))
-- help text and link for form labels \#138 [\#143](https://github.com/kevinpapst/kimai2/pull/143) ([kevinpapst](https://github.com/kevinpapst))
-- bugfix for duration\_only mode \#137 [\#142](https://github.com/kevinpapst/kimai2/pull/142) ([kevinpapst](https://github.com/kevinpapst))
-- Make the back link appear like a normal link instead of a button [\#139](https://github.com/kevinpapst/kimai2/pull/139) ([simonschaufi](https://github.com/simonschaufi))
-- Use short array syntax [\#135](https://github.com/kevinpapst/kimai2/pull/135) ([simonschaufi](https://github.com/simonschaufi))
-- Duration only mode \#131 [\#134](https://github.com/kevinpapst/kimai2/pull/134) ([kevinpapst](https://github.com/kevinpapst))
-- added controller to render markdown documentation \#129 [\#132](https://github.com/kevinpapst/kimai2/pull/132) ([kevinpapst](https://github.com/kevinpapst))
-- Rounding rules [\#128](https://github.com/kevinpapst/kimai2/pull/128) ([kevinpapst](https://github.com/kevinpapst))
-- Secure create-user command [\#127](https://github.com/kevinpapst/kimai2/pull/127) ([simonschaufi](https://github.com/simonschaufi))
-- ConfigureFilenames with hash after filename [\#126](https://github.com/kevinpapst/kimai2/pull/126) ([simonschaufi](https://github.com/simonschaufi))
-- added webpack-encore for managing frontend assets \#113 [\#122](https://github.com/kevinpapst/kimai2/pull/122) ([kevinpapst](https://github.com/kevinpapst))
-- Remove personal mentions in license header [\#119](https://github.com/kevinpapst/kimai2/pull/119) ([simonschaufi](https://github.com/simonschaufi))
-- Add github issue and pull request template [\#118](https://github.com/kevinpapst/kimai2/pull/118) ([simonschaufi](https://github.com/simonschaufi))
-- Improvements [\#114](https://github.com/kevinpapst/kimai2/pull/114) ([kevinpapst](https://github.com/kevinpapst))
-- added first docu on extending kimai with bundles \#106 [\#109](https://github.com/kevinpapst/kimai2/pull/109) ([kevinpapst](https://github.com/kevinpapst))
-- added order number to projects \#107 [\#108](https://github.com/kevinpapst/kimai2/pull/108) ([kevinpapst](https://github.com/kevinpapst))
-- added short invoice calculator and timesheet invoice template \#104 [\#105](https://github.com/kevinpapst/kimai2/pull/105) ([kevinpapst](https://github.com/kevinpapst))
-- added command to import data from kimai v1 \#102 [\#103](https://github.com/kevinpapst/kimai2/pull/103) ([kevinpapst](https://github.com/kevinpapst))
-- Error pages \#100 [\#101](https://github.com/kevinpapst/kimai2/pull/101) ([kevinpapst](https://github.com/kevinpapst))
-- added basic invoice rendering \#97 [\#99](https://github.com/kevinpapst/kimai2/pull/99) ([kevinpapst](https://github.com/kevinpapst))
-- added remember me feature \#53 [\#98](https://github.com/kevinpapst/kimai2/pull/98) ([kevinpapst](https://github.com/kevinpapst))
-- code-cleanup: removed unused classes, added role constants, phpcs fixes [\#96](https://github.com/kevinpapst/kimai2/pull/96) ([kevinpapst](https://github.com/kevinpapst))
-- load doctrine extensions during kernel bootstrap \#84 [\#92](https://github.com/kevinpapst/kimai2/pull/92) ([kevinpapst](https://github.com/kevinpapst))
-- support theme options via user preferences \#89 [\#91](https://github.com/kevinpapst/kimai2/pull/91) ([kevinpapst](https://github.com/kevinpapst))
-- added dynamic user preferences \#7 \#9 [\#90](https://github.com/kevinpapst/kimai2/pull/90) ([kevinpapst](https://github.com/kevinpapst))
-- added control sidebar \#10 [\#87](https://github.com/kevinpapst/kimai2/pull/87) ([kevinpapst](https://github.com/kevinpapst))
-- added english translation \#8 [\#82](https://github.com/kevinpapst/kimai2/pull/82) ([kevinpapst](https://github.com/kevinpapst))
-- upgraded to symfony 4 \#74 [\#81](https://github.com/kevinpapst/kimai2/pull/81) ([kevinpapst](https://github.com/kevinpapst))
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.2)
 
 ## [0.1](https://github.com/kevinpapst/kimai2/tree/0.1) (2018-01-10)
-**Implemented enhancements:**
 
-- Hide inactive delete user button [\#78](https://github.com/kevinpapst/kimai2/issues/78)
-- Delete activity [\#71](https://github.com/kevinpapst/kimai2/issues/71)
-- Delete other users timesheet entries [\#70](https://github.com/kevinpapst/kimai2/issues/70)
-- Delete Project [\#69](https://github.com/kevinpapst/kimai2/issues/69)
-- Delete Customer [\#68](https://github.com/kevinpapst/kimai2/issues/68)
-- Delete timesheet entries [\#67](https://github.com/kevinpapst/kimai2/issues/67)
-- Add installation docu [\#64](https://github.com/kevinpapst/kimai2/issues/64)
-- Disallow login for inactive user [\#57](https://github.com/kevinpapst/kimai2/issues/57)
-- Add toolbar to filter user screen [\#56](https://github.com/kevinpapst/kimai2/issues/56)
-- Upgrade to latest Avanzu version [\#55](https://github.com/kevinpapst/kimai2/issues/55)
-- AdminLTE login screen [\#52](https://github.com/kevinpapst/kimai2/issues/52)
-- Add edit Timesheet entry for Teamleads [\#45](https://github.com/kevinpapst/kimai2/issues/45)
-- Add Timesheet Voter [\#44](https://github.com/kevinpapst/kimai2/issues/44)
-- Developer improvements [\#42](https://github.com/kevinpapst/kimai2/issues/42)
-- Base class for repository and query objects [\#40](https://github.com/kevinpapst/kimai2/issues/40)
-- Add console command to create user [\#36](https://github.com/kevinpapst/kimai2/issues/36)
-- Add basic security Voter [\#34](https://github.com/kevinpapst/kimai2/issues/34)
-- Do not show hidden Activities [\#33](https://github.com/kevinpapst/kimai2/issues/33)
-- Do not show hidden Projects [\#32](https://github.com/kevinpapst/kimai2/issues/32)
-- Add "create timesheet record" form [\#31](https://github.com/kevinpapst/kimai2/issues/31)
-- Add filter to Customer admin [\#28](https://github.com/kevinpapst/kimai2/issues/28)
-- Do not show hidden Customer [\#27](https://github.com/kevinpapst/kimai2/issues/27)
-- Rename Timesheet query class [\#25](https://github.com/kevinpapst/kimai2/issues/25)
-- Add "create activity" functionality [\#24](https://github.com/kevinpapst/kimai2/issues/24)
-- Add "create project" functionality [\#23](https://github.com/kevinpapst/kimai2/issues/23)
-- Add "create customer" functionality [\#22](https://github.com/kevinpapst/kimai2/issues/22)
-- Translate dashboard widgets [\#20](https://github.com/kevinpapst/kimai2/issues/20)
-- Display user avatar in navbar [\#16](https://github.com/kevinpapst/kimai2/issues/16)
-- Add role SUPER\_ADMIN [\#15](https://github.com/kevinpapst/kimai2/issues/15)
-- Teamlead can see all user times [\#13](https://github.com/kevinpapst/kimai2/issues/13)
-- Add filter to Timesheet \(user\) [\#11](https://github.com/kevinpapst/kimai2/issues/11)
-- Add "create user" functionality [\#5](https://github.com/kevinpapst/kimai2/issues/5)
-- Edit users role [\#4](https://github.com/kevinpapst/kimai2/issues/4)
-- Add filter to Timesheet admin [\#3](https://github.com/kevinpapst/kimai2/issues/3)
-- Add filter to Activity admin [\#2](https://github.com/kevinpapst/kimai2/issues/2)
-- Add filter to Project admin [\#1](https://github.com/kevinpapst/kimai2/issues/1)
-
-**Merged pull requests:**
-
-- hide inactive delete user button \#78 [\#79](https://github.com/kevinpapst/kimai2/pull/79) ([kevinpapst](https://github.com/kevinpapst))
-- added delete customer action \#68 [\#77](https://github.com/kevinpapst/kimai2/pull/77) ([kevinpapst](https://github.com/kevinpapst))
-- added delete action for projects \#69 [\#76](https://github.com/kevinpapst/kimai2/pull/76) ([kevinpapst](https://github.com/kevinpapst))
-- Delete actions \#71 [\#75](https://github.com/kevinpapst/kimai2/pull/75) ([kevinpapst](https://github.com/kevinpapst))
-- added delete timesheet record for admins \#70 [\#73](https://github.com/kevinpapst/kimai2/pull/73) ([kevinpapst](https://github.com/kevinpapst))
-- added delete timesheet records action for users \#67 [\#72](https://github.com/kevinpapst/kimai2/pull/72) ([kevinpapst](https://github.com/kevinpapst))
-- added toolbar to user screen \#56 [\#66](https://github.com/kevinpapst/kimai2/pull/66) ([kevinpapst](https://github.com/kevinpapst))
-- document installation options \#64 [\#65](https://github.com/kevinpapst/kimai2/pull/65) ([kevinpapst](https://github.com/kevinpapst))
-- update avanzu admin bundle \#55 [\#63](https://github.com/kevinpapst/kimai2/pull/63) ([kevinpapst](https://github.com/kevinpapst))
-- prevent inactive user from login \#57 [\#61](https://github.com/kevinpapst/kimai2/pull/61) ([kevinpapst](https://github.com/kevinpapst))
-- handle hidden customer \#27 [\#60](https://github.com/kevinpapst/kimai2/pull/60) ([kevinpapst](https://github.com/kevinpapst))
-- handle hidden projects \#32 [\#59](https://github.com/kevinpapst/kimai2/pull/59) ([kevinpapst](https://github.com/kevinpapst))
-- Handle hidden activities \#33 [\#58](https://github.com/kevinpapst/kimai2/pull/58) ([kevinpapst](https://github.com/kevinpapst))
-- using the AdminLTE login screen \#52 [\#54](https://github.com/kevinpapst/kimai2/pull/54) ([kevinpapst](https://github.com/kevinpapst))
-- added toolbar for activity screen \#2 [\#51](https://github.com/kevinpapst/kimai2/pull/51) ([kevinpapst](https://github.com/kevinpapst))
-- Added toolbar to project screen \#1 [\#50](https://github.com/kevinpapst/kimai2/pull/50) ([kevinpapst](https://github.com/kevinpapst))
-- added toolbar to customer screen \#28 [\#49](https://github.com/kevinpapst/kimai2/pull/49) ([kevinpapst](https://github.com/kevinpapst))
-- added form to edit timesheet entries for all user \#45 [\#48](https://github.com/kevinpapst/kimai2/pull/48) ([kevinpapst](https://github.com/kevinpapst))
-- Create timesheet for User \#31 [\#47](https://github.com/kevinpapst/kimai2/pull/47) ([kevinpapst](https://github.com/kevinpapst))
-- added timesheet voter \#44 [\#46](https://github.com/kevinpapst/kimai2/pull/46) ([kevinpapst](https://github.com/kevinpapst))
-- Developer cleanup \#42 [\#43](https://github.com/kevinpapst/kimai2/pull/43) ([kevinpapst](https://github.com/kevinpapst))
-- Repository cleanup [\#41](https://github.com/kevinpapst/kimai2/pull/41) ([kevinpapst](https://github.com/kevinpapst))
-- Added voter for customer, project and activity  [\#39](https://github.com/kevinpapst/kimai2/pull/39) ([kevinpapst](https://github.com/kevinpapst))
-- added create user console command [\#38](https://github.com/kevinpapst/kimai2/pull/38) ([kevinpapst](https://github.com/kevinpapst))
-- added "create user" functionality [\#37](https://github.com/kevinpapst/kimai2/pull/37) ([kevinpapst](https://github.com/kevinpapst))
-- Added "create activity" form [\#35](https://github.com/kevinpapst/kimai2/pull/35) ([kevinpapst](https://github.com/kevinpapst))
-- Added create project functionality [\#30](https://github.com/kevinpapst/kimai2/pull/30) ([kevinpapst](https://github.com/kevinpapst))
-- Rename TimesheetQuery class [\#29](https://github.com/kevinpapst/kimai2/pull/29) ([kevinpapst](https://github.com/kevinpapst))
-- Add customer functionality [\#26](https://github.com/kevinpapst/kimai2/pull/26) ([kevinpapst](https://github.com/kevinpapst))
-- Dashboard widgets [\#21](https://github.com/kevinpapst/kimai2/pull/21) ([kevinpapst](https://github.com/kevinpapst))
-- Added form to edit user roles [\#18](https://github.com/kevinpapst/kimai2/pull/18) ([kevinpapst](https://github.com/kevinpapst))
-- added role ROLE\_SUPER\_ADMIN [\#17](https://github.com/kevinpapst/kimai2/pull/17) ([kevinpapst](https://github.com/kevinpapst))
-- allow TEAMLEAD to see user times [\#14](https://github.com/kevinpapst/kimai2/pull/14) ([kevinpapst](https://github.com/kevinpapst))
-- Timesheet toolbar [\#12](https://github.com/kevinpapst/kimai2/pull/12) ([kevinpapst](https://github.com/kevinpapst))
-
-
-
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.1)

Dockerfile

@@ -33,7 +33,8 @@ RUN apt update && \
         zip && \
     apt remove -y wget && \
     apt -y autoremove && \
-    apt clean
+    apt clean && \
+    cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
 
 FROM tmp_kimai2_base
 

README.md

@@ -5,6 +5,7 @@
 [![Travis Status](https://travis-ci.org/kevinpapst/kimai2.svg?branch=master)](https://travis-ci.org/kevinpapst/kimai2)
 [![Code Coverage](https://codecov.io/gh/kevinpapst/kimai2/branch/master/graph/badge.svg)](https://codecov.io/gh/kevinpapst/kimai2)
 [![Gitter](https://badges.gitter.im/kimai2/support.svg)](https://gitter.im/kimai2/support)
+[![Bountysource](https://img.shields.io/bountysource/team/kimai2/activity)](https://www.bountysource.com/teams/kimai2)
 
 Kimai is a free, open source and online time-tracking software designed for small businesses and freelancers. 
 It is built with modern technologies such as Symfony, Bootstrap, RESTful API, Doctrine, AdminLTE, Webpack, ES6 etc.
@@ -20,14 +21,14 @@ It is built with modern technologies such as Symfony, Bootstrap, RESTful API, Do
 ### Requirements
 
 - PHP 7.2 or higher
-- Database (MySQL, MariaDB, SQLite)
+- Database (MySQL/MariaDB with timezone data, SQLite for development)
 - Webserver (nginx, Apache)
 - A modern browser
 - [Other libraries](https://www.kimai.org/download/)
 
 ### About
 
-This is new version of the open source timetracker Kimai. It is stable and production ready, ships
+This is the new version of the open source timetracker Kimai. It is stable and production ready, ships
 with most advanced features from Kimai 1 and many new ones, including but not limited to: 
 
 JSON API, invoicing, data exports, multi-timer and punch-in punch-out mode, tagging, multi-user and multi-timezones, 
@@ -58,9 +59,9 @@ You can see a rough development roadmap in the [Milestones](https://github.com/k
 It is open for changes and input from the community, your [ideas and questions](https://github.com/kevinpapst/kimai2/issues) are welcome.
 
 > Kimai 2 uses a rolling release concept for delivering updates.
-> You can upgrade Kimai at any time, you don't need to wait for the next official release.
+> You can upgrade Kimai at any time , you don't need to wait for the next official release.
 
-Release versions will be created on a regular base (approx. every second month) and you can use these tags if you are familiar with git.
+Release versions will be created on a regular base (approx. one release per month) and you can should use these tags if you are not familiar with git.
 Every code change, whether it's a new feature or a bug fix, will be done on the master branch. 
 I have to do it this way, as I develop Kimai in my free time and want to put my effort into the software instead of backporting changes for old versions. 
 

SECURITY.md

@@ -7,8 +7,8 @@ As announced in the [README](README.md) I only support the latest available rele
 | Version | Supported          |
 | ------- | ------------------ |
 | master  | :white_check_mark: |
-| 1.0     | :white_check_mark: |
-| < 1.0   | :x:                |
+| 1.7     | :white_check_mark: |
+| < 1.7   | :x:                |
 
 ## Reporting a Vulnerability
 

UPGRADING.md

@@ -5,10 +5,103 @@ _Make sure to create a backup before you start!_
 Read the [updates documentation](https://www.kimai.org/documentation/updates.html) to find out how 
 you can upgrade your Kimai installation to the latest stable release.
 
-**Before you leave ...**
+Check below if there are more version specific steps required, which need to be executed after the normal update process.
+Perform EACH version specific task between your version and the new one, otherwise you risk data inconsistency or a broken installation.
 
-There might be more steps required which are version specific and need to be executed after [the update](https://www.kimai.org/documentation/updates.html).
-Read and perform EACH version specific task below, otherwise you risk data inconsistency or a broken installation!
+## [1.7](https://github.com/kevinpapst/kimai2/releases/tag/1.7)
+
+**New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
+
+New permissions:
+
+- `comments_customer` - show comment list on customer detail page (new feature) 
+- `details_customer` - show detail information for customers (customer number, vat, rates, meta-fields, assigned teams ...)
+- `comments_project` - show comment list on project detail page (new feature) 
+- `details_project` - show detail information for projects (rates, meta-fields, assigned teams ...)
+
+If you are using teams, please read on: The following list of permissions are now also available in the UI and they (can) replace the `X_project` and `X_customer` permissions. 
+They are more strict, as they allow only access to team specific items, the older permissions without `_teamlead_`/`_team_` work on a global level instead.
+  
+- `view_teamlead_customer`, `edit_teamlead_customer`, `budget_teamlead_customer`, `permissions_teamlead_customer`, `comments_teamlead_customer`, `details_teamlead_customer` - allows access to customer data when user is teamlead of a team assigned to the customer (replaces more global permission like `view_customer` for teamleads)
+- `view_team_customer`, `edit_team_customer`, `budget_team_customer`, `comments_team_customer`, `details_team_customer` - allows access to customer data when user is member of a team assigned to the customer (replaces more global permission like `view_customer` for users)
+- `view_teamlead_project`, `edit_teamlead_project`, `budget_teamlead_project`, `permissions_teamlead_project`, `comments_teamlead_project`, `details_teamlead_project` - allows access to customer data when user is teamlead of a team assigned to the project (replaces more global permission like `view_project` for teamleads)
+- `view_team_project`, `edit_team_project`, `budget_team_project`, `comments_team_project`, `details_team_project` - allows access to customer data when user is member of a team assigned to the project (replaces more global permission like `view_project` for users)
+
+### ExpenseBundle
+
+**ATTENTION** due to incompatibilities in the underlying frameworks users of the ExpenseBundle need to do one more step:
+
+You need to delete the bundle before updating: `rm -r var/plugins/ExpenseBundle`, otherwise you will run into errors during the update.
+
+After the Kimai update was successful, you have to re-install the latest bundle version, which is compatible with Kimai 1.7 only. 
+
+### Developer
+
+- Projects now have a start and end date and the API will only return those, which are either unconfigured or currently active, you might want to reload the list of projects once the user entered begin and end datetime OR use the new `ignoreDates` parameter.
+- Doctrine bundle was updated to v2, check your code for [the usage of RegistryInterface and ObjectManager](https://github.com/doctrine/DoctrineBundle/blob/master/UPGRADE-2.0.md)
+- Removed the webserver bundle and the command `server:run` - see [docs](https://www.kimai.org/documentation/developers.html)
+
+## [1.6](https://github.com/kevinpapst/kimai2/releases/tag/1.6), [1.6.1](https://github.com/kevinpapst/kimai2/releases/tag/1.6.1), [1.6.2](https://github.com/kevinpapst/kimai2/releases/tag/1.6.2)
+
+**New database tables and fields were created, don't forget to [run the updater](https://www.kimai.org/documentation/updates.html).**
+
+- Invoice changes:
+  - Moved CSV, ODS and XSLX invoice templates to [another repository](https://github.com/Keleo/kimai2-invoice-templates). Using them? Install them manually (see [invoice documentation](https://www.kimai.org/documentation/invoices.html)).
+  - Added new invoice fields (VAT, contact, payment details) and customer field (VAT). Used the twig settings before? Move them to the respective invoice template settings.
+- Permissions can be managed via Admin UI. Please move your permission settings from [local.yaml to your database](https://www.kimai.org/documentation/permissions.html).
+- Important permission change: regular users with the `view_other_timesheet` permission could see all timesheets. This was a legacy from the time before team permissions were introduced. If you rely on this behavior, you need to create a team with all users and the teamlead being the user who needs access to all timesheets. 
+
+### Developer
+
+Please add default permissions to your [plugin](https://www.kimai.org/documentation/plugins.html).
+
+## [1.5](https://github.com/kevinpapst/kimai2/releases/tag/1.5)
+
+[Update as usual](https://www.kimai.org/documentation/updates.html)
+
+## [1.4](https://github.com/kevinpapst/kimai2/releases/tag/1.4)
+
+**There is a new directory, which needs to be writable by the webserver: `public/avatars/`.**
+
+New permission (used in new dashboard widget):
+- `view_team_member` - display team assignments (names, teamleads and members) for the current user
+
+Activated Javascript select component by default (check mobile devices).
+
+### Developer: BC breaks
+
+- Dashboard widgets and rows need to define their `type` by FQCN
+- Switched to Symfony 4.3 event types, this could fail in plugins, but only if they didn't use the official constants for event names
+
+## [1.3](https://github.com/kevinpapst/kimai2/releases/tag/1.3)
+
+Added `manage_tag` permission for new tag features
+
+### Developer: BC breaks
+
+- Refactored toolbars and search, plugins needs to be checked 
+- Invoices now supports multiple repositories, some method signatures had to be changed (eg. `calculateSumIdentifier()`)  
+
+## [1.2](https://github.com/kevinpapst/kimai2/releases/tag/1.2)
+
+**If you are still using 0.7 or below, you need to upgrade to 1.1 before upgrading to this version.**
+
+- Deleted timezone conversion command. 
+- Minimum password length raised from 5 to 8 character (applies only for password changes and new users)
+- Maximum customer name length lowered to 150 character
+- Maximum project name length lowered to 150 character
+- Maximum activity name length lowered to 150 character
+- Added new permission: `manage_invoice_template`
+  - Removed permissions: `view_invoice_template`, `create_invoice_template`, `edit_invoice_template`, `delete_invoice_template`
+- Removed permission: `view_export` (using `create_export` only)
+
+### Developer: BC breaks
+
+- Custom export renderer need to check for usage of `Timesheet::getEnd()` as running entries can now be exported as well
+
+## [1.1](https://github.com/kevinpapst/kimai2/releases/tag/1.1)
+
+[Update as usual](https://www.kimai.org/documentation/updates.html), nothing special for this release if you upgrade from 1.0 / 1.0.1.
 
 ## [1.0](https://github.com/kevinpapst/kimai2/releases/tag/1.0)
 

assets/app.js

@@ -11,25 +11,56 @@ global.$ = global.jQuery = $;
 
 require('bootstrap-sass');
 require('jquery-slimscroll');
-require('bootstrap-select');
+
+require('select2');
+require('select2/dist/js/i18n/ar');
+require('select2/dist/js/i18n/cs');
+require('select2/dist/js/i18n/da');
+require('select2/dist/js/i18n/de');
+require('select2/dist/js/i18n/es');
+require('select2/dist/js/i18n/eu');
+require('select2/dist/js/i18n/fr');
+require('select2/dist/js/i18n/hu');
+require('select2/dist/js/i18n/it');
+require('select2/dist/js/i18n/ja');
+require('select2/dist/js/i18n/ko');
+require('select2/dist/js/i18n/nl');
+require('select2/dist/js/i18n/pt-BR');
+require('select2/dist/js/i18n/ru');
+require('select2/dist/js/i18n/sk');
+require('select2/dist/js/i18n/sv');
+require('select2/dist/js/i18n/tr');
+require('select2/dist/js/i18n/zh-CN');
 
 const Moment = require('moment');
 global.moment = Moment;
-require('moment/locale/de');
-require('moment/locale/it');
-require('moment/locale/fr');
-require('moment/locale/es');
-require('moment/locale/ru');
 require('moment/locale/ar');
+require('moment/locale/cs');
+require('moment/locale/da');
+require('moment/locale/de');
+require('moment/locale/de-ch');
+require('moment/locale/es');
+require('moment/locale/eu');
+require('moment/locale/fr');
 require('moment/locale/hu');
-require('moment/locale/pt-br');
-require('moment/locale/sv');
+require('moment/locale/it');
 require('moment/locale/ja');
+require('moment/locale/ko');
+require('moment/locale/nl');
+require('moment/locale/pt-br');
+require('moment/locale/ru');
+require('moment/locale/sk');
+require('moment/locale/sv');
+require('moment/locale/tr');
+require('moment/locale/zh-cn');
 
 require('daterangepicker');
 
+const Sortable = require('sortablejs/Sortable.min');
+global.Sortable = Sortable;
+
 // ------ AdminLTE framework ------
-require('../vendor/kevinpapst/adminlte-bundle/Resources/assets/admin-lte.scss');
+require('./sass/admin-lte.scss');
 require('admin-lte/dist/css/AdminLTE.min.css');
 require('admin-lte/dist/css/skins/_all-skins.css');
 require('../vendor/kevinpapst/adminlte-bundle/Resources/assets/admin-lte-extensions.scss');
@@ -44,6 +75,8 @@ require('./sass/app.scss');
 
 // ------ Kimai itself ------
 require('./js/KimaiWebLoader.js');
+global.KimaiPaginatedBoxWidget = require('./js/widgets/KimaiPaginatedBoxWidget').default;
+global.KimaiReloadPageWidget = require('./js/widgets/KimaiReloadPageWidget').default;
 
 // ------ Autocomplete for tags only ------
-require('jquery-ui/ui/widgets/autocomplete');
+require('jquery-ui/ui/widgets/autocomplete');

assets/calendar.js

@@ -2,15 +2,24 @@
 require('fullcalendar');
 require('fullcalendar/dist/gcal.min');
 
-require('fullcalendar/dist/locale/de');
-require('fullcalendar/dist/locale/it');
-require('fullcalendar/dist/locale/fr');
-require('fullcalendar/dist/locale/es');
-require('fullcalendar/dist/locale/ru');
 require('fullcalendar/dist/locale/ar');
+require('fullcalendar/dist/locale/cs');
+require('fullcalendar/dist/locale/da');
+require('fullcalendar/dist/locale/de');
+require('fullcalendar/dist/locale/de-ch');
+require('fullcalendar/dist/locale/es');
+require('fullcalendar/dist/locale/eu');
+require('fullcalendar/dist/locale/fr');
 require('fullcalendar/dist/locale/hu');
-require('fullcalendar/dist/locale/pt-br');
-require('fullcalendar/dist/locale/sv');
+require('fullcalendar/dist/locale/it');
 require('fullcalendar/dist/locale/ja');
+require('fullcalendar/dist/locale/ko');
+require('fullcalendar/dist/locale/nl');
+require('fullcalendar/dist/locale/pt-br');
+require('fullcalendar/dist/locale/ru');
+require('fullcalendar/dist/locale/sk');
+require('fullcalendar/dist/locale/sv');
+require('fullcalendar/dist/locale/tr');
+require('fullcalendar/dist/locale/zh-cn');
 
 require('fullcalendar/dist/fullcalendar.min.css');

assets/js/KimaiLoader.js

@@ -16,7 +16,6 @@ import KimaiContainer from "./KimaiContainer";
 import KimaiActiveRecordsDuration from './plugins/KimaiActiveRecordsDuration.js';
 import KimaiDatatableColumnView from './plugins/KimaiDatatableColumnView.js';
 import KimaiThemeInitializer from "./plugins/KimaiThemeInitializer";
-import KimaiJqueryPluginInitializer from "./plugins/KimaiJqueryPluginInitializer";
 import KimaiDateRangePicker from "./plugins/KimaiDateRangePicker";
 import KimaiDatatable from "./plugins/KimaiDatatable";
 import KimaiToolbar from "./plugins/KimaiToolbar";
@@ -31,13 +30,17 @@ import KimaiEvent from "./plugins/KimaiEvent";
 import KimaiAPILink from "./plugins/KimaiAPILink";
 import KimaiAlert from "./plugins/KimaiAlert";
 import KimaiAutocomplete from "./plugins/KimaiAutocomplete";
-import KimaiToolbarAction from "./plugins/KimaiToolbarAction";
+import KimaiFormSelect from "./plugins/KimaiFormSelect";
+import KimaiForm from "./plugins/KimaiForm";
+import KimaiDatePicker from "./plugins/KimaiDatePicker";
+import KimaiConfirmationLink from "./plugins/KimaiConfirmationLink";
+import KimaiMultiUpdateTable from "./plugins/KimaiMultiUpdateTable";
 
 export default class KimaiLoader {
 
     constructor(configurations, translations) {
         // set the current locale for all javascript components
-        moment.locale(configurations['locale']);
+        moment.locale(configurations['locale'].replace('_', '-').toLowerCase());
 
         const kimai = new KimaiContainer(
             new KimaiConfiguration(configurations),
@@ -47,14 +50,15 @@ export default class KimaiLoader {
         kimai.registerPlugin(new KimaiEvent());
         kimai.registerPlugin(new KimaiAPI());
         kimai.registerPlugin(new KimaiAlert());
+        kimai.registerPlugin(new KimaiFormSelect('.selectpicker'));
+        kimai.registerPlugin(new KimaiConfirmationLink('confirmation-link'));
         kimai.registerPlugin(new KimaiActiveRecordsDuration('[data-since]'));
         kimai.registerPlugin(new KimaiDatatableColumnView('data-column-visibility'));
-        kimai.registerPlugin(new KimaiThemeInitializer());
-        kimai.registerPlugin(new KimaiJqueryPluginInitializer());
-        kimai.registerPlugin(new KimaiDateRangePicker('.content-wrapper'));
-        kimai.registerPlugin(new KimaiDateTimePicker('.content-wrapper'));
-        kimai.registerPlugin(new KimaiDatatable('table.dataTable'));
-        kimai.registerPlugin(new KimaiToolbar());
+        kimai.registerPlugin(new KimaiDateRangePicker('input[data-daterangepickerenable="on"]'));
+        kimai.registerPlugin(new KimaiDateTimePicker('input[data-datetimepicker="on"]'));
+        kimai.registerPlugin(new KimaiDatePicker('input[data-datepickerenable="on"]'));
+        kimai.registerPlugin(new KimaiDatatable('section.content', 'table.dataTable'));
+        kimai.registerPlugin(new KimaiToolbar('form.header-search', 'toolbar-action'));
         kimai.registerPlugin(new KimaiSelectDataAPI('select[data-related-select]'));
         kimai.registerPlugin(new KimaiAlternativeLinks('.alternative-link'));
         kimai.registerPlugin(new KimaiAjaxModalForm('.modal-ajax-form'));
@@ -62,7 +66,9 @@ export default class KimaiLoader {
         kimai.registerPlugin(new KimaiActiveRecords('li.messages-menu', 'li.messages-menu-empty'));
         kimai.registerPlugin(new KimaiAPILink('api-link'));
         kimai.registerPlugin(new KimaiAutocomplete('.js-autocomplete'));
-        kimai.registerPlugin(new KimaiToolbarAction('toolbar-action'));
+        kimai.registerPlugin(new KimaiForm());
+        kimai.registerPlugin(new KimaiThemeInitializer());
+        kimai.registerPlugin(new KimaiMultiUpdateTable());
         //kimai.registerPlugin(new KimaiPauseRecord('li.messages-menu ul.menu li'));
 
         // notify all listeners that Kimai plugins can now be registered

assets/js/plugins/KimaiAPILink.js

@@ -5,7 +5,7 @@
  * file that was distributed with this source code.
  */
 
-import KimaiClickHandlerReducedInTableRow from "./KimaiClickHandlerReducedInTableRow";
+import KimaiPlugin from "../KimaiPlugin";
 
 /**
  * Needs to be initialized with a class name.
@@ -18,7 +18,7 @@ import KimaiClickHandlerReducedInTableRow from "./KimaiClickHandlerReducedInTabl
  *
  * @param selector
  */
-export default class KimaiAPILink extends KimaiClickHandlerReducedInTableRow {
+export default class KimaiAPILink extends KimaiPlugin {
 
     constructor(selector) {
         super();

assets/js/plugins/KimaiAjaxModalForm.js

@@ -29,6 +29,24 @@ export default class KimaiAjaxModalForm extends KimaiClickHandlerReducedInTableR
     init() {
         const self = this;
 
+        this.modal = jQuery('#remote_form_modal');
+        this.modal.on('hide.bs.modal', function () {
+            self.getContainer().getPlugin('event').trigger('modal-hide');
+        });
+        this.modal.on('hidden.bs.modal', function () {
+            // kill all references, so GC can kick in
+            self.getContainer().getPlugin('form').destroyForm(self._getFormIdentifier());
+            jQuery('#remote_form_modal .modal-body').replaceWith('');
+        });
+
+        this.modal.on('show.bs.modal', function () {
+            self.getContainer().getPlugin('event').trigger('modal-show');
+        });
+        this.modal.on('shown.bs.modal', function () {
+            // workaround for autofocus attribute, as the modal "steals" it
+            jQuery(self._getFormIdentifier()).find('input[type=text],textarea,select').filter(':not("[data-datetimepicker=on]")').filter(':visible:first').focus().delay(1000).focus();
+        });
+
         this._addClickHandlerReducedInTableRow(this.selector, function(href) {
             self.openUrlInModal(href);
         });
@@ -39,12 +57,9 @@ export default class KimaiAjaxModalForm extends KimaiClickHandlerReducedInTableR
 
         if (errorHandler === undefined) {
             errorHandler = function(xhr, err) {
-                if (xhr.status !== undefined && xhr.status === 403) {
-                    const alert = self.getContainer().getPlugin('alert');
-                    alert.error(xhr.statusText);
-                    return;
+                if (xhr.status === undefined || xhr.status !== 403) {
+                    window.location = url;
                 }
-                window.location = url;
             };
         }
 
@@ -57,17 +72,26 @@ export default class KimaiAjaxModalForm extends KimaiClickHandlerReducedInTableR
         });
     }
 
+    /**
+     * Returns the CSS selector for the modal form.
+     * 
+     * @returns {string}
+     * @private
+     */
+    _getFormIdentifier() {
+        return '#remote_form_modal .modal-content form';
+    }
+
     _openFormInModal(html) {
         const self = this;
 
-        // the modal that we use to render the form in
-        let formIdentifier = '#remote_form_modal .modal-content form';
+        let formIdentifier = this._getFormIdentifier();
         // if any of these is found in a response, the form will be re-displayed
         let flashErrorIdentifier = 'div.alert-error';
         // messages to show above the form
         let flashMessageIdentifier = 'div.alert';
         let form = jQuery(formIdentifier);
-        let remoteModal = jQuery('#remote_form_modal');
+        let remoteModal = this.modal;
 
         // will be (re-)activated later
         form.off('submit');
@@ -89,15 +113,8 @@ export default class KimaiAjaxModalForm extends KimaiClickHandlerReducedInTableR
                 jQuery(html).find('#form_modal .modal-content')
             );
 
-            // TODO these should be handled with Events, probably using Custom Events
-            // https://developer.mozilla.org/en-US/docs/Web/Guide/Events/Creating_and_triggering_events
-
             // activate new loaded widgets
-            self.getContainer().getPlugin('date-time-picker').activateDateTimePicker(formIdentifier);
-            self.getContainer().getPlugin('autocomplete').activateAutocomplete(formIdentifier + " .js-autocomplete");
-
-            // activate selectpicker if beta test is active
-            jQuery('.selectpicker').selectpicker('refresh');
+            self.getContainer().getPlugin('form').activateForm(formIdentifier);
         }
 
         // show error flash messages
@@ -116,11 +133,7 @@ export default class KimaiAjaxModalForm extends KimaiClickHandlerReducedInTableR
         });
         // -----------------------------------------------------------------------
 
-        // workaround for autofocus attribute, as the modal "steals" it
-        remoteModal.on('shown.bs.modal', function () {
-            jQuery(this).find('input[type=text],textarea,select').filter(':not("[data-datetimepicker=on]")').filter(':visible:first').focus().delay(1000).focus();
-        });
-
+        this.getContainer().getPlugin('toolbar').hide();
         remoteModal.modal('show');
 
         // the new form that was loaded via ajax
@@ -184,6 +197,10 @@ export default class KimaiAjaxModalForm extends KimaiClickHandlerReducedInTableR
                         err = '[' + xhr.status +'] ' + xhr.statusText;
                     }
                     alert.error(message, err);
+                    // this is useful for changing form fields and retrying to save (and in development to test form changes)
+                    setTimeout(function() {
+                        btn.button('reset');
+                    }, 1500);
                 }
             });
         });

assets/js/plugins/KimaiAlert.js

@@ -27,7 +27,7 @@ export default class KimaiAlert extends KimaiPlugin {
             message = translation.get(message);
         }
         Swal.fire({
-            type: 'error',
+            icon: 'error',
             title: title.replace('%reason%', ''),
             text: message,
         });
@@ -42,10 +42,11 @@ export default class KimaiAlert extends KimaiPlugin {
 
         Swal.fire({
             timer: 2000,
+            timerProgressBar: true,
             toast: true,
             position: 'top-end',
             showConfirmButton: false,
-            type: 'success',
+            icon: 'success',
             title: message,
         });
     }
@@ -65,7 +66,7 @@ export default class KimaiAlert extends KimaiPlugin {
 
         Swal.fire({
             title: message,
-            type: 'question',
+            icon: 'question',
             showCancelButton: true,
             confirmButtonText: translation.get('confirm'),
             cancelButtonText: translation.get('cancel')

assets/js/plugins/KimaiAutocomplete.js

@@ -20,7 +20,7 @@ export default class KimaiAutocomplete extends KimaiPlugin {
     }
 
     init() {
-        this.activateAutocomplete(this.selector);
+        this.minChars = this.getContainer().getConfiguration().get('autoComplete');
     }
 
     getId() {
@@ -35,60 +35,72 @@ export default class KimaiAutocomplete extends KimaiPlugin {
         return this.splitTagList(term).pop();
     }
 
-    activateAutocomplete(selector)
-    {
-        const apiUrl = jQuery(selector).attr('data-autocomplete-url');
+    activateAutocomplete(selector) {
         const self = this;
-        const API = self.getContainer().getPlugin('api');
+        
+        jQuery(selector + ' ' + this.selector).each(function(index) {
+            const currentField = jQuery(this);
+            const apiUrl = currentField.attr('data-autocomplete-url');
+            const API = self.getContainer().getPlugin('api');
 
-        jQuery(selector)
-            // don't navigate away from the field on tab when selecting an item
-            .on("keydown", function (event) {
-                if (event.keyCode === jQuery.ui.keyCode.TAB &&
-                    jQuery(this).autocomplete("instance").menu.active) {
-                    event.preventDefault();
-                }
-            })
-            .autocomplete({
-                source: function (request, response) {
-                    const lastEntry = self.extractLastTag(request.term);
-                    API.get(apiUrl, {'name': lastEntry}, function(data){
-                        response(data);
-                    });
-                },
-                search: function () {
-                    // custom minLength
-                    var term = self.extractLastTag(this.value);
-                    if (term.length < 2) {
-                        return false;
+            currentField
+                // don't navigate away from the field on tab when selecting an item
+                .on("keydown", function (event) {
+                    if (event.keyCode === jQuery.ui.keyCode.TAB &&
+                        jQuery(this).autocomplete("instance").menu.active) {
+                        event.preventDefault();
                     }
-                },
-                focus: function () {
-                    // prevent value inserted on focus
-                    return false;
-                },
-                select: function (event, ui) {
-                    var terms = self.splitTagList(this.value);
+                })
+                .autocomplete({
+                        source: function (request, response) {
+                            const lastEntry = self.extractLastTag(request.term);
+                            API.get(apiUrl, {'name': lastEntry}, function(data){
+                                response(data);
+                            });
+                        },
+                        search: function () {
+                            // custom minLength
+                            var term = self.extractLastTag(this.value);
+                            if (term.length < self.minChars) {
+                                return false;
+                            }
+                        },
+                        focus: function () {
+                            // prevent value inserted on focus
+                            return false;
+                        },
+                        select: function (event, ui) {
+                            var terms = self.splitTagList(this.value);
 
-                    // remove the current input
-                    terms.pop();
+                            // remove the current input
+                            terms.pop();
 
-                    // check if selected tag is already in list
-                    if (!terms.includes(ui.item.value)) {
-                        // add the selected item
-                        terms.push(ui.item.value);
+                            // check if selected tag is already in list
+                            if (!terms.includes(ui.item.value)) {
+                                // add the selected item
+                                terms.push(ui.item.value);
+                            }
+                            // add placeholder to get the comma-and-space at the end
+                            terms.push("");
+
+                            this.value = terms.join(", ");
+
+                            $(this).trigger('change');
+
+                            return false;
+                        }
                     }
-                    // add placeholder to get the comma-and-space at the end
-                    terms.push("");
+                )
+            ;
+        });
+    }
 
-                    this.value = terms.join(", ");
-
-                    $(this).trigger('change');
-
-                    return false;
-                }
-            }
-        );
+    destroyAutocomplete(selector) {
+        jQuery(selector + ' ' + this.selector).each(function(index) {
+            const currentField = jQuery(this);
+            currentField.autocomplete("destroy");
+            currentField.removeData('autocomplete');
+        });
     }
 
 }

assets/js/plugins/KimaiClickHandlerReducedInTableRow.js

@@ -21,12 +21,13 @@ export default class KimaiClickHandlerReducedInTableRow extends KimaiPlugin {
                 return;
             }
 
-            // handles the "click" on table rows to open an entry for editing: when a button within a row is clicked,
-            // we don't want the table row event to be processed - so we intercept it
+            // handles the "click" on table rows to open an entry for editing 
             let target = event.target;
             if (event.currentTarget.matches('tr')) {
                 while (target !== null && !target.matches('body')) {
-                    if (target.matches('a') || target.matches ('button')) {
+                    // when an element within the row is clicked, that can trigger stuff itself, we don't want the event to be processed
+                    // don't act if a link, button or form element was clicked
+                    if (target.matches('a') || target.matches ('button') || target.matches ('input')) {
                         return;
                     }
                     target = target.parentNode;

assets/js/plugins/KimaiConfirmationLink.js

@@ -0,0 +1,70 @@
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import KimaiPlugin from "../KimaiPlugin";
+
+/**
+ * Needs to be initialized with a class name.
+ *
+ * Allows to assign the given selector to any element, which then is used as click-handler
+ * calling an API method and trigger the event from data-event attribute afterwards.
+ *
+ * @param selector
+ */
+export default class KimaiConfirmationLink extends KimaiPlugin {
+
+    constructor(selector) {
+        super();
+        this.selector = selector;
+    }
+
+    init() {
+        const self = this;
+        document.addEventListener('click', function(event) {
+            let target = event.target;
+            while (target !== null && !target.matches('body')) {
+                if (target.classList.contains(self.selector)) {
+                    const attributes = target.dataset;
+
+                    // is this a link? 
+                    let url = attributes['href'];
+                    // or another HTML element with a custom href 
+                    if (!url) {
+                        url = target.getAttribute('href');
+                    }
+                    
+                    // or is this a button?
+                    let form = null;
+                    if (target.type === 'submit' && target.form !== undefined) {
+                        form = target.form;
+                    }
+
+                    if (attributes.question !== undefined) {
+                        self.getContainer().getPlugin('alert').question(attributes.question, function(value) {
+                            if (value) {
+                                if (form === null) {
+                                    document.location = url;
+                                } else {
+                                    if (url !== null) {
+                                        form.action = url;
+                                    }
+                                    form.submit();
+                                }
+                            }
+                        });
+                    }
+
+                    event.preventDefault();
+                    event.stopPropagation();
+                }
+
+                target = target.parentNode;
+            }
+        });
+    }
+
+}

assets/js/plugins/KimaiDatatable.js

@@ -14,9 +14,10 @@ import KimaiPlugin from "../KimaiPlugin";
 
 export default class KimaiDatatable extends KimaiPlugin {
 
-    constructor(selector) {
+    constructor(contentAreaSelector, tableSelector) {
         super();
-        this.selector = selector;
+        this.contentArea = contentAreaSelector;
+        this.selector = tableSelector;
     }
 
     getId() {
@@ -44,17 +45,26 @@ export default class KimaiDatatable extends KimaiPlugin {
         for (let eventName of events.split(' ')) {
             document.addEventListener(eventName, handle);
         }
+
+        if (this.getContainer().getConfiguration().get('autoReloadDatatable')) {
+            document.addEventListener('toolbar-change', handle);
+        } else {
+            document.addEventListener('pagination-change', handle);
+            document.addEventListener('filter-change', handle);
+        }
     }
 
     reloadDatatable() {
-        // FIXME remove query
+        const contentArea = this.contentArea;
         const durations = this.getContainer().getPlugin('timesheet-duration');
-        const form = jQuery('.toolbar form');
+        const toolbarSelector = this.getContainer().getPlugin('toolbar').getSelector();
+        
+        const form = jQuery(toolbarSelector);
         let loading = '<div class="overlay"><i class="fas fa-sync fa-spin"></i></div>';
-        jQuery('section.content').append(loading);
+        jQuery(contentArea).append(loading);
 
         // remove the empty fields to prevent errors
-        let formData = jQuery('.toolbar form :input')
+        let formData = jQuery(toolbarSelector + ' :input')
             .filter(function(index, element) {
                 return jQuery(element).val() != '';
             })
@@ -65,8 +75,8 @@ export default class KimaiDatatable extends KimaiPlugin {
             type: form.attr('method'),
             data: formData,
             success: function(html) {
-                jQuery('section.content').replaceWith(
-                    jQuery(html).find('section.content')
+                jQuery(contentArea).replaceWith(
+                    jQuery(html).find(contentArea)
                 );
                 durations.updateRecords();
             },

assets/js/plugins/KimaiDatePicker.js

@@ -24,13 +24,9 @@ export default class KimaiDatePicker extends KimaiPlugin {
         return 'date-picker';
     }
 
-    init() {
-        this.activateDatePicker(this.selector);
-    }
-
     activateDatePicker(selector) {
-        let translator = this.getContainer().getTranslation();
-        jQuery(selector + ' input[data-datepickerenable="on"]').each(function(index) {
+        const TRANSLATE = this.getContainer().getTranslation();
+        jQuery(selector + ' ' + this.selector).each(function(index) {
             let localeFormat = jQuery(this).data('format');
             jQuery(this).daterangepicker({
                 singleDatePicker: true,
@@ -39,9 +35,9 @@ export default class KimaiDatePicker extends KimaiPlugin {
                 locale: {
                     format: localeFormat,
                     firstDay: 1,
-                    applyLabel: translator.get('confirm'),
-                    cancelLabel: translator.get('cancel'),
-                    customRangeLabel: translator.get('customRange'),
+                    applyLabel: TRANSLATE.get('confirm'),
+                    cancelLabel: TRANSLATE.get('cancel'),
+                    customRangeLabel: TRANSLATE.get('customRange'),
                     daysOfWeek: moment.weekdaysShort(),
                     monthNames: moment.months(),
                 }
@@ -54,4 +50,13 @@ export default class KimaiDatePicker extends KimaiPlugin {
         });
     }
 
+    destroyDatePicker(selector) {
+        jQuery(selector + ' ' + this.selector).each(function(index) {
+            if (jQuery(this).data('daterangepicker') !== undefined) {
+                jQuery(this).daterangepicker('destroy');
+                jQuery(this).data('daterangepicker').remove();
+            }
+        });
+    }
+
 }

assets/js/plugins/KimaiDateRangePicker.js

@@ -24,13 +24,9 @@ export default class KimaiDateRangePicker extends KimaiPlugin {
         return 'date-range-picker';
     }
 
-    init() {
-        this.activateDateRangePicker(this.selector);
-    }
-
     activateDateRangePicker(selector) {
         let translator = this.getContainer().getTranslation();
-        jQuery(selector + ' input[data-daterangepickerenable="on"]').each(function(index) {
+        jQuery(selector + ' ' + this.selector).each(function(index) {
             let localeFormat = jQuery(this).data('format');
             let separator = jQuery(this).data('separator');
             let rangesList = {};
@@ -65,9 +61,20 @@ export default class KimaiDateRangePicker extends KimaiPlugin {
 
             jQuery(this).on('apply.daterangepicker', function(ev, picker) {
                 jQuery(this).val(picker.startDate.format(localeFormat) + ' - ' + picker.endDate.format(localeFormat));
+                jQuery(this).data('begin', picker.startDate.format(localeFormat));
+                jQuery(this).data('end', picker.endDate.format(localeFormat));
                 jQuery(this).trigger("change");
             });
         });
     }
 
+    destroyDateRangePicker(selector) {
+        jQuery(selector + ' ' + this.selector).each(function(index) {
+            if (jQuery(this).data('daterangepicker') !== undefined) {
+                jQuery(this).daterangepicker('destroy');
+                jQuery(this).data('daterangepicker').remove();
+            }
+        });
+    }
+
 }

assets/js/plugins/KimaiDateTimePicker.js

@@ -24,15 +24,11 @@ export default class KimaiDateTimePicker extends KimaiPlugin {
         return 'date-time-picker';
     }
 
-    init() {
-        this.activateDateTimePicker(this.selector);
-    }
-
     activateDateTimePicker(selector) {
         let translator = this.getContainer().getTranslation();
         let configuration = this.getContainer().getConfiguration();
 
-        jQuery(selector + ' input[data-datetimepicker="on"]').each(function(index) {
+        jQuery(selector + ' ' + this.selector).each(function(index) {
             let localeFormat = jQuery(this).data('format');
             jQuery(this).daterangepicker({
                 singleDatePicker: true,
@@ -58,4 +54,13 @@ export default class KimaiDateTimePicker extends KimaiPlugin {
         });
     }
 
+    destroyDateTimePicker(selector) {
+        jQuery(selector + ' ' + this.selector).each(function(index) {
+            if (jQuery(this).data('daterangepicker') !== undefined) {
+                jQuery(this).daterangepicker('destroy');
+                jQuery(this).data('daterangepicker').remove();
+            }
+        });
+    }
+
 }

assets/js/plugins/KimaiForm.js

@@ -0,0 +1,35 @@
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*!
+ * [KIMAI] KimaiForm: basic functions for all forms
+ */
+
+import KimaiPlugin from "../KimaiPlugin";
+
+export default class KimaiForm extends KimaiPlugin {
+
+    getId() {
+        return 'form';
+    }
+
+    activateForm(formSelector, container) {
+        this.getContainer().getPlugin('date-range-picker').activateDateRangePicker(formSelector);
+        this.getContainer().getPlugin('date-time-picker').activateDateTimePicker(formSelector);
+        this.getContainer().getPlugin('date-picker').activateDatePicker(formSelector);
+        this.getContainer().getPlugin('autocomplete').activateAutocomplete(formSelector);
+        this.getContainer().getPlugin('form-select').activateSelectPicker(formSelector, container);
+    }
+    
+    destroyForm(formSelector) {
+        this.getContainer().getPlugin('form-select').destroySelectPicker(formSelector);
+        this.getContainer().getPlugin('autocomplete').destroyAutocomplete(formSelector);
+        this.getContainer().getPlugin('date-picker').destroyDatePicker(formSelector);
+        this.getContainer().getPlugin('date-time-picker').destroyDateTimePicker(formSelector);
+        this.getContainer().getPlugin('date-range-picker').destroyDateRangePicker(formSelector);
+    }
+}

assets/js/plugins/KimaiFormSelect.js

@@ -0,0 +1,168 @@
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*!
+ * [KIMAI] KimaiFormSelect: enhanced functionality for HTML select's
+ */
+
+import KimaiPlugin from "../KimaiPlugin";
+import jQuery from "jquery";
+
+export default class KimaiFormSelect extends KimaiPlugin {
+
+    constructor(selector) {
+        super();
+        this.selector = selector;
+    }
+
+    getId() {
+        return 'form-select';
+    }
+
+    activateSelectPicker(selector, container) {
+        const elementSelector = this.selector;
+        let options = {};
+        if (container !== undefined) {
+            options = {
+                dropdownParent: $(container),
+            };
+        }
+
+        // Function to match the name of the parent and not only the names of the children
+        // Based on the original matcher function of Select2: https://github.com/select2/select2/blob/5765090318c4d382ae56463cfa25ba8ca7bdd495/src/js/select2/defaults.js#L272
+        // More information: https://select2.org/searching | https://github.com/select2/docs/blob/develop/pages/11.searching/docs.md
+        function matcher(params, data) {
+            // Always return the object if there is nothing to compare
+            if (jQuery.trim(params.term) === '') {
+                return data;
+            }
+
+            // Check whether options has children
+            let hasChildren = data.children && data.children.length > 0;
+
+            // Split search param by space to search for all terms and convert all to uppercase
+            let terms = params.term.toUpperCase().split(' ');
+            let original = data.text.toUpperCase();
+
+            // Always return the parent option including its children, when the name matches one of the params
+            // Check if the text contains all or at least one of the terms
+            let foundAll = true;
+            let foundOne = false;
+            let missingTerms = [];
+            terms.forEach(function(item, index) {
+                if (original.indexOf(item) > -1) {
+                    foundOne = true;
+                } else {
+                    foundAll = false;
+                    missingTerms.push(item);
+                }
+            });
+
+            // If the option element contains all terms, return it
+            if(foundAll) {
+                return data;
+            }
+
+            // Do a recursive check for options with children
+            if (hasChildren) {
+                // If the parent already contains one or more search terms, proceed only with the missing ones
+                // First: Clone the original params object...
+                let newParams = jQuery.extend(true, {}, params);
+                if (foundOne) {
+                    newParams.term = missingTerms.join(' ');
+                } else {
+                    newParams.term = params.term;
+                }
+
+                // Clone the data object if there are children
+                // This is required as we modify the object to remove any non-matches
+                let match = jQuery.extend(true, {}, data);
+
+                // Check each child of the option
+                for (let c = data.children.length - 1; c >= 0; c--) {
+                    let child = data.children[c];
+
+                    let matches = matcher(newParams, child);
+
+                    // If there wasn't a match, remove the object in the array
+                    if (matches === null) {
+                        match.children.splice(c, 1);
+                    }
+                }
+
+                // If any children matched, return the new object
+                if (match.children.length > 0) {
+                    return match;
+                }
+            }
+
+            // If the option or its children do not contain the term, don't return anything
+            return null;
+        }
+
+        options = {...options, ...{
+            language: this.getContainer().getConfiguration().get('locale').replace('_', '-'),
+            theme: "bootstrap",
+            matcher: matcher
+        }};
+        jQuery(selector + ' ' + elementSelector).select2(options);
+
+        jQuery('body').on('reset', 'form', function(event){
+            setTimeout(function() {
+                jQuery(event.target).find(elementSelector).trigger('change');
+            }, 10);
+        });
+    }
+
+    destroySelectPicker(selector) {
+        jQuery(selector + ' ' + this.selector).select2('destroy');
+    }
+
+    updateOptions(selectIdentifier, data) {
+        let select = jQuery(selectIdentifier);
+        let emptyOption = jQuery(selectIdentifier + ' option[value=""]');
+        const selectedValue = select.val();
+
+        select.find('option').remove().end().find('optgroup').remove().end();
+
+        if (emptyOption.length !== 0) {
+            select.append('<option value="">' + emptyOption.text() + '</option>');
+        }
+
+        let htmlOptions = '';
+        let emptyOptions = '';
+
+        for (const [key, value] of Object.entries(data)) {
+            if (key === '__empty__') {
+                for (const entity of value) {
+                    emptyOptions +=  '<option value="' + entity.id + '">' + entity.name + '</option>';
+                }
+                continue;
+            }
+
+            htmlOptions += '<optgroup label="' + key + '">';
+            for (const entity of value) {
+                htmlOptions +=  '<option value="' + entity.id + '">' + entity.name + '</option>';
+            }
+            htmlOptions += '</optgroup>';
+        }
+
+        select.append(htmlOptions);
+        select.append(emptyOptions);
+
+        // if available, re-select the previous selected option (mostly usable for global activities)
+        select.val(selectedValue);
+
+        // if we don't trigger the change, the other selects won't be resetted
+        select.trigger('change');
+
+        // if the beta test kimai.theme.select_type is active, this will tell the selects to refresh
+        if (select.hasClass('selectpicker')) {
+            select.trigger('change.select2');
+        }
+    }
+}

assets/js/plugins/KimaiJqueryPluginInitializer.js

@@ -1,24 +0,0 @@
-/*
- * This file is part of the Kimai time-tracking app.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/*!
- * [KIMAI] KimaiJqueryPluginInitializer: initialize jQuery plugins
- */
-
-import jQuery from 'jquery';
-import KimaiPlugin from '../KimaiPlugin';
-
-export default class KimaiJqueryPluginInitializer extends KimaiPlugin {
-
-    init() {
-        // activate the dropdown functionality
-        jQuery('.dropdown-toggle').dropdown();
-        // activate the tooltip functionality
-        jQuery('[data-toggle="tooltip"]').tooltip();
-    }
-
-}

assets/js/plugins/KimaiMultiUpdateTable.js

@@ -0,0 +1,73 @@
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*!
+ * [KIMAI] KimaiMultiUpdateForm: handle the multi update checkbox list and form
+ */
+
+import KimaiPlugin from '../KimaiPlugin';
+import jQuery from "jquery";
+
+export default class KimaiMultiUpdateTable extends KimaiPlugin {
+
+    init() {
+        const self = this;
+        
+        jQuery('body').
+            on('change', '#multi_update_all', function(event) {
+                jQuery('.multi_update_single').prop('checked', jQuery(event.target).prop('checked'));
+                self.toggleForm();
+            })
+            .on('change', '.multi_update_single', function(event) {
+                self.toggleForm();
+            })
+            .on('change', '#multi_update_table_action', function(event) {
+                const selectedItem = jQuery('#multi_update_table_action option:selected');
+                const selectedVal = selectedItem.val();
+
+                if (selectedVal === '') {
+                    return;
+                }
+                
+                const form = jQuery('#multi_update_form form');
+                const selectedText = selectedItem.text();
+                const ids = self.getSelectedIds();
+                const question = form.attr('data-question').replace(/%action%/, selectedText).replace(/%count%/, ids.length);
+                
+                self.getContainer().getPlugin('alert').question(question, function(value) {
+                    if (value) {
+                        form.attr('action', selectedVal).submit();
+                    } else {
+                        jQuery('#multi_update_table_action').val('').trigger('change');
+                    }
+                });
+            });
+    }
+    
+    getSelectedIds()
+    {
+        let ids = [];
+        jQuery('.multi_update_single:checked').each(function(i){
+            ids[i] = $(this).val();
+        });
+
+        return ids;
+    }
+    
+    toggleForm() 
+    {
+        const ids = this.getSelectedIds();
+        jQuery('#multi_update_table_entities').val(ids.join(','));
+
+        if (ids.length > 0) {
+            jQuery('#multi_update_form').show();
+        } else {
+            jQuery('#multi_update_form').hide();
+        }
+    }
+    
+}

assets/js/plugins/KimaiSelectDataAPI.js

@@ -11,6 +11,7 @@
 
 import jQuery from 'jquery';
 import KimaiPlugin from "../KimaiPlugin";
+import moment from 'moment';
 
 export default class KimaiSelectDataAPI extends KimaiPlugin {
 
@@ -32,50 +33,98 @@ export default class KimaiSelectDataAPI extends KimaiPlugin {
         const API = this.getContainer().getPlugin('api');
 
         jQuery('body').on('change', selector, function(event) {
-            let apiUrl = jQuery(this).attr('data-api-url').replace('-s-', jQuery(this).val());
-            const targetSelect = '#' + jQuery(this).attr('data-related-select');
+            const targetSelect = '#' + this.dataset['relatedSelect'];
 
             // if the related target select does not exist, we do not need to load the related data
             if (jQuery(targetSelect).length === 0) {
                 return;
             }
 
+            let formPrefix = jQuery(this).parents('form').first().attr('name');
+            if (formPrefix === undefined || formPrefix === null) {
+                formPrefix = '';
+            } else {
+                formPrefix += '_';
+            }
+            
+            let newApiUrl = self._buildUrlWithFormFields(this.dataset['apiUrl'], formPrefix);
+
             if (jQuery(this).val() === '') {
-                if (jQuery(this).attr('data-empty-url') === undefined) {
+                if (this.dataset['emptyUrl'] === undefined) {
                     self._updateSelect(targetSelect, {});
                     jQuery(targetSelect).attr('disabled', 'disabled');
                     return;
                 }
-                apiUrl = jQuery(this).attr('data-empty-url').replace('-s-', jQuery(this).val());
+                newApiUrl = self._buildUrlWithFormFields(this.dataset['emptyUrl'], formPrefix);
             }
 
             jQuery(targetSelect).removeAttr('disabled');
 
-            API.get(apiUrl, {}, function(data){
+            API.get(newApiUrl, {}, function(data){
                 self._updateSelect(targetSelect, data);
             });
         });
     }
+    
+    _buildUrlWithFormFields(apiUrl, formPrefix) {
+        let newApiUrl = apiUrl;
 
-    _updateSelect(selectName, data) {
-        let select = jQuery(selectName);
-        let emptyOption = jQuery(selectName + ' option[value=""]');
-
-        select.find('option').remove().end().find('optgroup').remove().end();
-
-        if (emptyOption.length !== 0) {
-            select.append('<option value="">' + emptyOption.text() + '</option>');
-        }
-
-        jQuery.each(data, function(i, obj) {
-            select.append('<option value="' + obj.id + '">' + obj.name + '</option>');
+        apiUrl.split('?')[1].split('&').forEach(item => {
+            let [key, value] = item.split('=');
+            let decoded = decodeURIComponent(value);
+            let test = decoded.match(/%(.*)%/);
+            if (test !== null) {
+                let targetField = jQuery('#' + formPrefix + test[1]);
+                let newValue = '';
+                if (targetField.length === 0) {
+                    // debug: this case for example happens in duration only mode, when the end field is not found
+                    //console.log('ERROR: Cannot find field with name "' + test[1] + '" by selector: #' + formPrefix + test[1]);
+                } else {
+                    if (targetField.val() !== null) {
+                        newValue = targetField.val();
+                        
+                        if (newValue !== '') {
+                            // having that special case here is far from being perfect... but for now it works ;-)
+                            if (targetField.data('daterangepicker') !== undefined) {
+                                if (key === 'begin' || key === 'start' || targetField.data('daterangepicker').singleDatePicker) {
+                                    newValue = targetField.data('daterangepicker').startDate.format(moment.HTML5_FMT.DATETIME_LOCAL_SECONDS);
+                                } else if (key === 'end') {
+                                    newValue = targetField.data('daterangepicker').endDate.format(moment.HTML5_FMT.DATETIME_LOCAL_SECONDS);
+                                }
+                            } else if (targetField.data('format') !== undefined) {
+                                if (moment(newValue, targetField.data('format')).isValid()) {
+                                    newValue = moment(newValue, targetField.data('format')).format(moment.HTML5_FMT.DATETIME_LOCAL_SECONDS);
+                                }
+                            } 
+                        }
+                    }
+                }
+                newApiUrl = newApiUrl.replace(value, newValue);
+            }
         });
 
-        // if we don't trigger the change, the other selects won't be resetted
-        select.trigger('change');
+        return newApiUrl;
+    }
 
-        // if the beta test kimai.theme.select_type is active, this will tell the selects to refresh
-        jQuery('.selectpicker').selectpicker('refresh');
+    _updateSelect(selectName, data) {
+        const options = {};
+        for (const apiData of data) {
+            let title = '__empty__';
+            if (apiData.hasOwnProperty('parentTitle') && apiData.parentTitle !== null) {
+                title = apiData.parentTitle;
+            }
+            if (!options.hasOwnProperty(title)) {
+                options[title] = [];
+            }
+            options[title].push(apiData);
+        }
+
+        const ordered = {};
+        Object.keys(options).sort().forEach(function(key) {
+            ordered[key] = options[key];
+        });
+
+        this.getContainer().getPlugin('form-select').updateOptions(selectName, ordered);
     }
 
 }

assets/js/plugins/KimaiThemeInitializer.js

@@ -15,7 +15,35 @@ import KimaiPlugin from '../KimaiPlugin';
 export default class KimaiThemeInitializer extends KimaiPlugin {
 
     init() {
+        this.registerGlobalAjaxErrorHandler();
         this.registerAutomaticAlertRemove('div.alert-success', 5000);
+        // activate the dropdown functionality
+        jQuery('.dropdown-toggle').dropdown();
+        // activate the tooltip functionality
+        jQuery('[data-toggle="tooltip"]').tooltip();
+        // activate all form plugins
+        this.getContainer().getPlugin('form').activateForm('.content-wrapper form', 'body');
+    }
+
+    /**
+     * redirect access denied / session timeouts to login page
+     */
+    registerGlobalAjaxErrorHandler() {
+        const loginUrl = this.getContainer().getConfiguration().get('login');
+        const alert = this.getContainer().getPlugin('alert');
+        const translation = this.getContainer().getTranslation().get('login.required');
+        jQuery(document).ajaxError(function(event, jqxhr, settings, thrownError) {
+            if (jqxhr.status !== undefined && jqxhr.status === 403) {
+                const loginRequired = jqxhr.getResponseHeader('login-required');
+                if (loginRequired !== null) {
+                    alert.question(translation, function (result) {
+                        if (result === true) {
+                            window.location.replace(loginUrl);
+                        }
+                    });
+                }
+            }
+        });
     }
 
     /**

assets/js/plugins/KimaiToolbar.js

@@ -14,12 +14,183 @@ import KimaiPlugin from "../KimaiPlugin";
 
 export default class KimaiToolbar extends KimaiPlugin {
 
-    init() {
-        const datatable = this.getContainer().getPlugin('datatable');
+    constructor(formSelector, formSubmitActionClass) {
+        super();
+        this.formSelector = formSelector;
+        this.actionClass = formSubmitActionClass;
+    }
 
-        // This catches all clicks on the pagination and prevents the default action, as we want to relad the page via JS
+    getId() {
+        return 'toolbar';
+    }
+
+    init() {
+        const formSelector = this.getSelector();
+        const self = this;
+        const EVENT = self.getContainer().getPlugin('event');
+
+        this._registerPagination(formSelector, EVENT);
+        this._registerSortableTables(formSelector, EVENT);
+        this._registerAlternativeSubmitActions(formSelector, this.actionClass);
+        this._registerSearchButtons(formSelector);
+
+        jQuery('body')
+            // prevent that the dropdown closes, when a form input is changed - eg. a select option was clicked
+            .on('click', formSelector + ' .dropdown-menu', function (event) {
+                event.stopPropagation();
+            })
+            // prevent that a click into the search field will close the dropdown
+            .on('click', '.select2-search__field', function (event) {
+                event.stopPropagation();
+            })
+            // prevent that the dropdown closes when a optgroup header is clicked
+            .on('click', '.select2-results__group', function (event) {
+                event.stopPropagation();
+            })
+            // prevent that a click into a daterangepicker will close the dropdown
+            .on('click', '.daterangepicker', function (event) {
+                event.stopPropagation();
+            })
+            // prevent that clicks in the dropdown elements, but outside of elements will close the dropdown (eg border besides the search field)
+            .on('click', '.select2-container', function (event) {
+                event.stopPropagation();
+            })
+        ;
+
+        // Reset the page if filter values are changed, otherwise we might end up with a limited set of data, 
+        // which does not support the given page - and it would be just wrong to stay in the same page
+        jQuery(formSelector +' input').change(function (event) {
+            switch (event.target.id) {
+                case 'order':
+                case 'orderBy':
+                case 'page':
+                    break;
+                default:
+                    jQuery(formSelector + ' input#page').val(1);
+                    break;
+            }
+            self.triggerChange();
+        });
+        
+        // when user selected a new customer or project, reset the pagination back to 1
+        // and then find out if the results should be reloaded
+        jQuery(formSelector + ' select').change(function (event) {
+            let reload = true;
+            switch (event.target.id) {
+                case 'customer':
+                    if (jQuery(formSelector + ' select#project').length > 0) {
+                        reload = false;
+                    }
+                    break;
+
+                case 'project':
+                    if (jQuery(formSelector + ' select#activity').length > 0) {
+                        reload = false;
+                    }
+                    break;
+            }
+            jQuery(formSelector + ' input#page').val(1);
+
+            if (reload) {
+                self.triggerChange();
+            }
+        });
+
+        // close all open selectpicker upon choosing any dropdown option
+        jQuery(formSelector + ' select.selectpicker').on('change', function(event) {
+            jQuery('.bootstrap-select.open').removeClass('open');
+        });
+        
+    }
+
+    /**
+     * The search toggle button is not part of this component, but it is directly connected to it.
+     * @private
+     */
+    _registerSearchButtons(formSelector) {
+        jQuery('body')
+            // only for mobile experience currently: show the search form field
+            .on('click', '.btn-search.search-toggle', function (event) {
+                event.preventDefault();
+                event.stopPropagation();
+                jQuery(formSelector).parent('section').toggleClass('search-open');
+                jQuery(formSelector).toggleClass('hidden-xs');
+                jQuery(formSelector + ' input#searchTerm').dropdown('toggle');
+                jQuery(formSelector + ' input#searchTerm').focus();
+            })
+            // hide the search form field
+            .on('click', formSelector + ' a.search-cancel', function (event) {
+                event.preventDefault();
+                event.stopPropagation();
+                jQuery(formSelector).parent('section').toggleClass('search-open');
+                jQuery(formSelector + ' input#searchTerm').dropdown('toggle');
+                jQuery(formSelector).toggleClass('hidden-xs');
+            })
+        ;
+    }
+
+    /**
+     * Some actions utilize the filter from the search form and submit it to another URL.
+     * @private
+     */
+    _registerAlternativeSubmitActions(toolbarSelector, actionBtnClass) {
+        document.addEventListener('click', function(event) {
+            let target = event.target;
+            while (target !== null && !target.matches('body')) {
+                if (target.classList.contains(actionBtnClass)) {
+                    const form = document.querySelector(toolbarSelector);
+                    if (form === null) {
+                        return;
+                    }
+                    const prevAction = form.action;
+                    const prevMethod = form.method;
+                    form.target = '_blank';
+                    form.action = target.href;
+                    if (target.dataset.method !== undefined) {
+                        form.method = target.dataset.method;
+                    }
+                    form.submit();
+                    form.target = '';
+                    form.action = prevAction;
+                    form.method = prevMethod;
+
+                    event.preventDefault();
+                    event.stopPropagation();
+                }
+
+                target = target.parentNode;
+            }
+        });        
+    }
+
+    /**
+     * Sortable datatables use hidden fields in the toolbar filter/search form
+     * @private
+     */
+    _registerSortableTables(formSelector, EVENT) {
+        jQuery('body').on('click', 'th.sortable', function(event){
+            var $header = jQuery(event.target);
+            var order = 'DESC';
+            var orderBy = $header.data('order');
+            if ($header.hasClass('sorting_desc')) {
+                order = 'ASC';
+            }
+            jQuery(formSelector + ' input#orderBy').val(orderBy);
+            jQuery(formSelector + ' input#order').val(order);
+            // triggers the page reset - see below
+            jQuery(formSelector + ' input#order').trigger('change');
+            // triggers the datatable reload - search for the event name
+            EVENT.trigger('filter-change');
+        });
+    }
+    
+    /**
+     * This catches all clicks on the pagination and prevents the default action, as we want to reload the page via JS
+     * @private
+     */
+    _registerPagination(formSelector, EVENT) {
         jQuery('body').on('click', 'div.navigation ul.pagination li a', function(event) {
-            let pager = jQuery(".toolbar form input[name='page']");
+            let pager = jQuery(formSelector + " input#page");
             if (pager.length === 0) {
                 return;
             }
@@ -29,41 +200,33 @@ export default class KimaiToolbar extends KimaiPlugin {
             let page = urlParts[urlParts.length-1];
             pager.val(page);
             pager.trigger('change');
+            EVENT.trigger('pagination-change');
             return false;
         });
 
-        // Reset the page if any other value is changed, otherwise we might end up with a limited set
-        // of data which does not support the given page - and it would be just wrong to stay in the same page
-        jQuery('.toolbar form input').change(function (event) {
-            switch (event.target.id) {
-                case 'page':
-                    break;
-                default:
-                    jQuery('.toolbar form input#page').val(1);
-            }
-            datatable.reloadDatatable();
-        });
+    }
+    
+    hide() {
+        const toggle = jQuery(this.getSelector() + ' #searchTerm.dropdown-toggle');
+        if (toggle.parent().hasClass('open')) {
+            toggle.dropdown('toggle');
+        }
+    }
 
-        jQuery('.toolbar form select').change(function (event) {
-            let reload = true;
-            switch (event.target.id) {
-                case 'customer':
-                    if (jQuery('.toolbar form select#project').length > 0) {
-                        reload = false;
-                    }
-                    break;
+    /**
+     * Triggers an event, that everyone can listen for.
+     */
+    triggerChange() {
+        this.getContainer().getPlugin('event').trigger('toolbar-change');
+    }
 
-                case 'project':
-                    if (jQuery('.toolbar form select#activity').length > 0) {
-                        reload = false;
-                    }
-                    break;
-            }
-            jQuery('.toolbar form input#page').val(1);
-            if (reload) {
-                datatable.reloadDatatable();
-            }
-        });
+    /**
+     * Returns the CSS selector to target the toolbar form.
+     * 
+     * @returns {string}
+     */
+    getSelector() {
+        return this.formSelector;
     }
 
 }

assets/js/plugins/KimaiToolbarAction.js

@@ -1,56 +0,0 @@
-/*
- * This file is part of the Kimai time-tracking app.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-import KimaiPlugin from '../KimaiPlugin';
-
-/**
- * Needs to be initialized with a class name.
- *
- * A link like <a href=# class=remoteLink> can be activated with:
- * new KimaiToolbarAction('remoteLink')
- *
- * @param selector
- */
-export default class KimaiToolbarAction extends KimaiPlugin {
-
-    constructor(selector) {
-        super();
-        this.selector = selector;
-    }
-
-    init() {
-        const self = this;
-        document.addEventListener('click', function(event) {
-            let target = event.target;
-            while (target !== null && !target.matches('body')) {
-                if (target.classList.contains(self.selector)) {
-                    const form = document.querySelector('div.toolbar form.navbar-form');
-                    if (form === null) {
-                        return;
-                    }
-                    const prevAction = form.action;
-                    const prevMethod = form.method;
-                    form.target = '_blank';
-                    form.action = target.href;
-                    if (target.dataset.method !== undefined) {
-                        form.method = target.dataset.method;
-                    }
-                    form.submit();
-                    form.target = '';
-                    form.action = prevAction;
-                    form.method = prevMethod;
-
-                    event.preventDefault();
-                    event.stopPropagation();
-                }
-
-                target = target.parentNode;
-            }
-        });
-    }
-
-}

assets/js/widgets/KimaiPaginatedBoxWidget.js

@@ -0,0 +1,97 @@
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*!
+ * [KIMAI] KimaiPaginatedBoxWidget: handles box widgets that have a pagination
+ */
+
+import jQuery from "jquery";
+
+export default class KimaiPaginatedBoxWidget {
+
+    constructor(boxId) {
+        this.selector = boxId;
+        this.overlay = jQuery('<div class="overlay"><div class="fas fa-sync fa-spin"></div></div>');
+        this.widget = jQuery(this.selector);
+        this.href = this.widget.data('href');
+        this.events = this.widget.data('reload').split(' ');
+
+        const self = this;
+
+        const reloadPage = function (event) {
+            const page = jQuery(self.selector + ' .box-tools').data('page');
+            const url = self._buildUrl(page);
+            self.loadPage(url);
+        };
+
+        for (const eventName of this.events) {
+            document.addEventListener(eventName, reloadPage);
+        }
+
+        this.widget.on('click', '.box-tools a', function (event) {
+            event.preventDefault();
+            self.loadPage(jQuery(event.target).attr('href'));
+        });
+    }
+    
+    static create(elementId) {
+        return new KimaiPaginatedBoxWidget(elementId);
+    }
+    
+    _showOverlay() {
+        this.widget.append(this.overlay);
+    }
+    
+    _hideOverlay() {
+        jQuery(this.overlay).remove();
+    }
+    
+    loadPage(url) {
+        const self = this;
+        const selector = this.selector;
+        
+        self._showOverlay();
+
+        jQuery.ajax({
+            url: url,
+            data: {},
+            success: function (response) {
+                const html = jQuery(response);
+                jQuery(selector + ' .box-tools').replaceWith(html.find('.box-tools'));
+                jQuery(selector + ' .box-body').replaceWith(html.find('.box-body'));
+                jQuery(selector + ' .box-title').replaceWith(html.find('.box-title'));
+                if (jQuery(selector + ' .box-footer').length > 0) {
+                    jQuery(selector + ' .box-footer').replaceWith(html.find('.box-footer'));
+                }
+                jQuery(selector + ' .box-body [data-toggle="tooltip"]').tooltip();
+                self.widget.removeData('error-retry');
+                self._hideOverlay();
+            },
+            dataType: 'html',
+            error: function(jqXHR, textStatus, errorThrown) {
+                if (jqXHR.status !== undefined && jqXHR.status === 500) {
+                    if (self.widget.data('error-retry') !== undefined) {
+                        // TODO show error message ?
+                        return;
+                    }
+                    const page = jQuery(selector + ' .box-tools').data('page');
+                    if (page > 1) {
+                        self.widget.data('error-retry', 1);
+                        var url = self._buildUrl(page - 1);
+                        self.loadPage(url);
+                    }
+                }
+                self._hideOverlay();
+            }
+        });        
+    }
+    
+    _buildUrl(page) {
+        return this.href.replace('1', page);
+    }
+    
+}

assets/js/widgets/KimaiReloadPageWidget.js

@@ -0,0 +1,72 @@
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*!
+ * [KIMAI] KimaiReloadPageWidget: a simple helper to reload the page on events
+ */
+
+import jQuery from "jquery";
+
+export default class KimaiReloadPageWidget {
+
+    constructor(events, fullReload) {
+        this.overlay = jQuery('<div class="overlay-wrapper"><div class="overlay"><div class="fas fa-sync fa-spin"></div></div></div>');
+        this.widget = jQuery('div.content-wrapper');
+
+        const self = this;
+
+        const reloadPage = function (event) {
+            if (fullReload) {
+                document.location.reload(true);
+            } else {
+                self.loadPage(document.location);
+            }
+        };
+
+        for (const eventName of events.split(' ')) {
+            document.addEventListener(eventName, reloadPage);
+        }
+    }
+    
+    static create(events, fullReload) {
+        if (fullReload === undefined || fullReload === null) {
+            fullReload = false;
+        }
+        return new KimaiReloadPageWidget(events, fullReload);
+    }
+    
+    _showOverlay() {
+        this.widget.append(this.overlay);
+    }
+    
+    _hideOverlay() {
+        jQuery(this.overlay).remove();
+    }
+    
+    loadPage(url) {
+        const self = this;
+        
+        self._showOverlay();
+
+        jQuery.ajax({
+            url: url,
+            data: {},
+            success: function (response) {
+                jQuery('section.content').replaceWith(
+                    jQuery(response).find('section.content')
+                );
+                self._hideOverlay();
+            },
+            dataType: 'html',
+            error: function(jqXHR, textStatus, errorThrown) {
+                self._hideOverlay();
+                document.location = url;
+            }
+        });        
+    }
+
+}

assets/sass/admin-lte.scss

@@ -0,0 +1,10 @@
+
+$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
+$fa-font-path: "~@fortawesome/fontawesome-free/webfonts/";
+
+@import '~bootstrap-sass/assets/stylesheets/bootstrap';
+@import '~@fortawesome/fontawesome-free/scss/fontawesome';
+@import '~@fortawesome/fontawesome-free/scss/regular';
+@import '~@fortawesome/fontawesome-free/scss/solid';
+@import '~@fortawesome/fontawesome-free/scss/brands';
+@import '~daterangepicker/daterangepicker.css';

assets/sass/app.scss

@@ -5,11 +5,11 @@
  * file that was distributed with this source code.
  */
 
-@import "~bootstrap-sass/assets/stylesheets/bootstrap/variables";
 @import 'variables';
 @import 'error-page';
 @import 'print';
 @import 'content';
+@import 'content-header';
 @import 'toolbar';
 @import 'sidebar';
 @import 'footer';
@@ -23,3 +23,4 @@
 @import 'skins';
 @import 'sweetalert';
 @import 'autocomplete';
+@import 'selectpicker';

assets/sass/content-header.scss

@@ -0,0 +1,52 @@
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+.content-header {
+    height: 50px;
+    border-top: 1px solid rgba(0, 0, 0, 0.1);
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) !important;
+    background-color: #fff !important;
+    padding: 10px 0 0 10px;
+
+    h1 {
+        padding-top: 3px;
+        float: left;
+        small {
+            display: none;
+        }
+    }
+}
+
+/* Page based action buttons in the upper right corner of the content area */
+.content-header>.breadcrumb {
+    position: absolute;
+    float: right;
+    background: transparent;
+    top: 0;
+    right: 0;
+    padding-left: 10px;
+}
+
+@media (max-width: $screen-md-min) {
+    .content-header>.breadcrumb {
+        margin-top: 0;
+    }
+}
+
+@media (min-width: $screen-sm-min) {
+    .content-header>.breadcrumb {
+        right: 10px;
+    }
+
+    .content-header {
+        h1 {
+            small {
+                display: inline-block;
+            }
+        }
+    }
+}

assets/sass/content.scss

@@ -8,43 +8,8 @@
 .content {
     padding: 15px 0;
 }
-.content-header {
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) !important;
-    background-color: #fff !important;
-    padding: 15px 0 15px 10px;
-
-    h1 {
-        small {
-            display: none;
-        }
-    }
-}
-
-.content-header>.breadcrumb {
-    position: relative;
-    margin-top: 5px;
-    top: 0;
-    right: 0;
-    float: none;
-    background: #d2d6de;
-    padding-left: 10px;
-}
 
 @media (min-width: $screen-sm-min) {
-    .content-header>.breadcrumb {
-        right: 10px;
-    }
-}
-
-@media (min-width: $screen-sm-min) {
-    .content-header {
-        h1 {
-            small {
-                display: inline-block;
-            }
-        }
-    }
     .content {
         padding: 15px;
     }
@@ -69,4 +34,23 @@ td {
     text-align: center;
     line-height: 35px;
     margin-right: 15px;
+}
+
+/* Profile */
+.box-profile {
+    img.img-circle {
+        width: 100px;
+    }
+    .profile-username {
+        margin-top: 15px;
+    }
+}
+
+.label-gray {
+    background-color: $gray-lte;
+}
+
+/* Delete link in action dropdowns */
+.dropdown-menu > li.delete > a {
+    color: #dd4b39;
 }

assets/sass/datatable-extensions.scss

@@ -5,6 +5,8 @@
  * file that was distributed with this source code.
  */
 
+span.label-color,
+span.label-meta,
 span.label-activity,
 span.label-project,
 span.label-customer {
@@ -21,20 +23,21 @@ span.label-customer {
 table.dataTable {
     /* action column */
     .actions {
-        width: 90px;
-        li.delete a {
-            color: #dd4b39;
-        }
+        width: 40px;
     }
     tr {
         /* summary row - provided in the users own timesheet table */
         &.summary td {
             font-weight: bold;
             border-bottom: 1px solid #ccc;
+            background-color: #eaeaea;
         }
         &.open-edit {
             cursor: pointer;
         }
+        th.multiCheckbox {
+            width: 15px;
+        }
     }
     td {
         /*
@@ -48,6 +51,7 @@ table.dataTable {
             font-size: 85%;
             font-weight: 500;
             padding: .3em .6em .3em;
+            line-height: 24px;
         }
         span.label-activity,
         span.label-project,

assets/sass/datatable.scss

@@ -23,7 +23,7 @@ section.content .overlay > .fas,
 section.content > .overlay,
 .box > .loading-img,
 .overlay-wrapper > .loading-img {
-    position: absolute;
+    position: fixed; /* see #1330 */
     top: 0;
     left: 0;
     width: 100%;
@@ -125,34 +125,35 @@ table.dataTable thead .sorting_desc_disabled {
     position: relative;
 }
 
-table.dataTable thead .sorting:after,
-table.dataTable thead .sorting_asc:after,
-table.dataTable thead .sorting_desc:after {
+table.dataTable thead .sorting:before,
+table.dataTable thead .sorting_asc:before,
+table.dataTable thead .sorting_desc:before {
     position: absolute;
-    top: 8px;
-    right: 8px;
+    top: 10px;
+    left: 5px;
     display: block;
     font-family: 'Glyphicons Halflings';
     opacity: 0.5;
+    font-size: 12px;
 }
-table.dataTable thead .sorting:after {
+table.dataTable thead .sorting:before {
     opacity: 0.2;
     content: "\e150"; /* sort */
 }
-table.dataTable thead .sorting_asc:after {
+table.dataTable thead .sorting_asc:before {
     content: "\e155"; /* sort-by-attributes */
 }
-table.dataTable thead .sorting_desc:after {
+table.dataTable thead .sorting_desc:before {
     content: "\e156"; /* sort-by-attributes-alt */
 }
-div.dataTables_scrollBody table.dataTable thead .sorting:after,
-div.dataTables_scrollBody table.dataTable thead .sorting_asc:after,
-div.dataTables_scrollBody table.dataTable thead .sorting_desc:after {
+div.dataTables_scrollBody table.dataTable thead .sorting:before,
+div.dataTables_scrollBody table.dataTable thead .sorting_asc:before,
+div.dataTables_scrollBody table.dataTable thead .sorting_desc:before {
     display: none;
 }
 
-table.dataTable thead .sorting_asc_disabled:after,
-table.dataTable thead .sorting_desc_disabled:after {
+table.dataTable thead .sorting_asc_disabled:before,
+table.dataTable thead .sorting_desc_disabled:before {
     color: #eee;
 }
 
@@ -175,9 +176,9 @@ table.dataTable.table-condensed thead > tr > th {
     padding-right: 20px;
 }
 
-table.dataTable.table-condensed thead .sorting:after,
-table.dataTable.table-condensed thead .sorting_asc:after,
-table.dataTable.table-condensed thead .sorting_desc:after {
+table.dataTable.table-condensed thead .sorting:before,
+table.dataTable.table-condensed thead .sorting_asc:before,
+table.dataTable.table-condensed thead .sorting_desc:before {
     top: 6px;
     right: 6px;
 }
@@ -264,3 +265,22 @@ div.dataTables_scrollHead table.table-bordered {
 .table-striped.dataTable tbody tr.active:nth-child(odd) th {
     background-color: #017ebc;
 }
+
+/* custom extension to make the column wide enough to show the sortable icons */
+table.dataTable th.sortable {
+    padding-left: 22px;
+}
+
+table.dataTable.table > tbody > tr > td {
+    &.avatars {
+        line-height: 40px;
+    }    
+    vertical-align: middle;
+    .img-circle {
+        max-width: 35px;
+        margin-right: 10px;
+        &.teamlead {
+            box-shadow: 0 0 5px 3px $gray-lte;
+        }
+    }
+}

assets/sass/invoice.scss

@@ -5,301 +5,256 @@
  * file that was distributed with this source code.
  */
 
-.invoice {
-    margin: 0;
-    border: none;
-}
-
-@media (min-width: $screen-sm-min) {
+body.invoice_print {
+    background-color: #eee;
+    
     .invoice {
-        margin: 25px;
+        margin: 105px auto 30px auto;
+        padding: 50px 65px;
+        min-height: 297mm;
+        position: relative;
+        max-width: 210mm;
+        box-shadow: 0 0 20px rgba(80,80,80,0.7);
     }
-}
-
-.page-header-small{
-    font-size: 14px;
-}
-
-div.invoice-address {
-    margin-top: 30px;
-    margin-bottom: 30px;
-}
-
-table.invoice-records {}
-table.invoice-meta th {
-    padding-right: 40px;
-}
-table.invoice-sum th {
-    width: 70%;
-}
-table.invoice-sum th, table.invoice-sum td  {
-    text-align: right;
-}
-
-/* ================================ FREELANCER INVOICE ================================ */
-
-#freelancer-invoice {
-    font: 15px/1 $font-family-sans-serif;
-    box-sizing: border-box;
-
-    h1 {
-        font: bold 100% sans-serif;
-        letter-spacing: 0.5em;
-        text-align: center;
-        text-transform: uppercase;
+    
+    .page-header h3 {
+        border-color: #ddd;
     }
-
-    h2 {
-        font: bold 1.5em sans-serif;
-        margin-bottom: 1em;
+    
+    div.invoice-address {
+        margin-top: 30px;
+        margin-bottom: 30px;
     }
-
-    /* table */
-
-    table {
-        table-layout: fixed;
-        width: 100%;
+    
+    table.invoice-meta th {
+        padding-right: 40px;
     }
-
-    table {
-        border-collapse: separate;
-        border-spacing: 0;
+    table.invoice-sum th {
+        width: 70%;
     }
-
-    /* header */
-
-    header {
-    }
-
-    header:after {
-        clear: both;
-        content: "";
-        display: table;
-        font-size: 1em;
-    }
-
-    header address {
-        float: left;
-        font-style: normal;
-        line-height: 1.25;
-        margin: 0 1em 1em 0;
-        font-weight: bold;
-        font-size: 0.7em;
-    }
-
-    article address {
-        font-size: 1em;
-        float: left;
-        margin: 1em 0;
-    }
-
-    article.address {
-        margin-bottom: 1.5em;
-    }
-
-    article.footer {
-        margin-top: 60px;
-    }
-
-    /* article */
-
-    article, table.meta, table.inventory {
-        margin: 1em 0;
-    }
-
-    article:after {
-        clear: both;
-        content: "";
-        display: table;
-    }
-
-    article h1 {
-        clip: rect(0 0 0 0);
-        position: absolute;
-    }
-
-    article p {
-        margin-bottom: 20px;
-    }
-
-    /* table meta & balance */
-
-    table.meta:after, table.balance:after {
-        clear: both;
-        content: "";
-        display: table;
-    }
-
-    /* table meta */
-
-    table.meta {
-        float: right;
-        width: 50%;
-        font-size: 85%;
-
-        th {
-            text-align: right;
-            font-weight: normal;
-        }
-
-        td {
-            width: 120px;
-            text-align: right;
-        }
-    }
-
-    /* table balance */
-
-    table.balance {
-        float: right;
-        th {
-            text-align: right;
-            font-weight: normal;
-        }
-
-        td {
-            width: 140px;
-            text-align: right;
-        }
-
-        .total {
-            font-weight: bold;
-        }
-    }
-
-    /* table items */
-
-    table.inventory {
-        clear: both;
-        width: 100%;
-        margin-top: 2em;
-        border-bottom: 1px solid #000;
-    }
-
-    table.inventory th {
-        font-weight: bold;
-        border-width: 0 0 1px 0;
-        border-bottom: 1px solid #000;
-    }
-    table.inventory th,
-    table.inventory td {
-        padding: 5px;
-    }
-
-    table.inventory td:nth-child(1),
-    table.inventory th:nth-child(1) {
-        text-align: left;
-    }
-
-    table.inventory td:nth-child(2),
-    table.inventory th:nth-child(2) {
-        text-align: center;
-        width: 20%;
-    }
-
-    table.inventory td:nth-child(3),
-    table.inventory th:nth-child(3) {
-        text-align: center;
-        width: 20%;
-    }
-
-    table.inventory td:nth-child(4),
-    table.inventory th:nth-child(4) {
+    table.invoice-sum th, table.invoice-sum td  {
         text-align: right;
-        width: 20%;
+    }
+    
+    .invoice-items {
+        margin-top: 2em;
+        margin-bottom: 3em;
+    
+        .table {
+            thead th {
+                font-weight: bold;
+                border-bottom: 1px solid #ddd;
+                padding-bottom: 15px
+            }
+            tfoot {
+                border-top: 1px solid #ddd;
+                
+                tr:first-child th,
+                tr:first-child td {
+                    padding-top: 15px
+                }
+                tr {
+                    th,td {
+                        border:none;
+                        padding: 4px 8px;
+                    }
+                }
+            }
+        }
+    
     }
 
-    /* footer */
-
-    footer {
+    .footer {
+        border-top: 1px solid #ccc;
         margin-top: 50px;
-    }
-
-    footer table {
-        border-top: 1px solid #000;
         font-size: 0.8em;
-        padding-top: 5px;
-    }
-
-    footer th {
-        text-align: left;
-        font-weight: bold;
-        margin-bottom: 10px;
-    }
-
-    footer table th:nth-child(1) {
-        width: 32%;
-    }
-
-    footer table th:nth-child(3) {
-        width: 28%;
-    }
-
-    footer td {
-        text-align: left;
-        vertical-align: bottom;
-    }
-
-    /* aside */
-
-    aside {
-        position: absolute;
-        top: 10in;
-        width: 7.5in;
-    }
-
-    aside h1 {
-        border: none;
-        border-width: 0 0 1px;
-        margin: 0 0 1em;
-    }
-
-    aside h1 {
-        border-color: #999;
-        border-bottom-style: solid;
-    }
-
-    aside p {
-        font-size: 85%;
-    }
-
-    aside div {
-        margin-top: 15px;
-    }
-
-    aside div p {
-        line-height: 1.4;
-    }
-
-    aside p span {
-        width: 130px;
-        font-weight: bold;
-        display: inline-block;
-    }
-}
-
-@media print {
-    * {
-        -webkit-print-color-adjust: exact;
-    }
-    body, .wrapper, #freelancer-invoice {
-        margin: 0;
-        padding: 0;
+        padding-top: 10px;
+        width: 100%;
     }
 
+    /* ================================ FREELANCER INVOICE ================================ */
+    
     #freelancer-invoice {
-        margin: 1em 2em;
-
-        span:empty {
-            display: none;
+        
+        box-sizing: border-box;
+    
+        h1 {
+            font: bold 100% sans-serif;
+            letter-spacing: 0.5em;
+            text-align: center;
+            text-transform: uppercase;
+        }
+    
+        h2 {
+            font: bold 1.5em sans-serif;
+            margin-bottom: 1em;
+        }
+    
+        /* table */
+    
+        table {
+            width: 100%;
+        }
+    
+        table {
+            border-collapse: separate;
+            border-spacing: 0;
+        }
+    
+        /* header */
+    
+        header {
+            &:after {
+                clear: both;
+                content: "";
+                display: table;
+                font-size: 1em;
+            }
+    
+            address {
+                float: left;
+                font-style: normal;
+                line-height: 1.25;
+                margin: 0 1em 1em 0;
+                font-size: 0.7em;
+            }
+        }
+    
+        article address {
+            font-size: 1em;
+            float: left;
         }
 
-        .add, .cut {
-            display: none;
+        article.address {
+            margin:1em 0 1.5em 0;
+        }
+
+        /* article */
+
+        article:after {
+            clear: both;
+            content: "";
+            display: table;
+        }
+    
+        article h1 {
+            clip: rect(0 0 0 0);
+            position: absolute;
+        }
+    
+        article p {
+            margin-bottom: 20px;
+        }
+    
+        /* table meta & balance */
+    
+        table.meta:after, table.balance:after {
+            clear: both;
+            content: "";
+            display: table;
+        }
+    
+        /* table meta */
+    
+        table.meta {
+            float: right;
+            width: 50%;
+            font-size: 85%;
+    
+            th {
+                text-align: right;
+                font-weight: normal;
+            }
+    
+            td {
+                width: 120px;
+                text-align: right;
+            }
+        }
+    
+        /* table balance */
+    
+        table.balance {
+            float: right;
+            margin-top: 1em;
+            th {
+                text-align: right;
+                font-weight: normal;
+            }
+    
+            td {
+                width: 140px;
+                text-align: right;
+                line-height: 22px;
+            }
+    
+            .total {
+                font-weight: bold;
+            }
+        }
+    
+        /* table items */
+    
+        table.inventory {
+            clear: both;
+            width: 100%;
+            margin-top: 2em;
+            border-bottom: 1px solid #000;
+        }
+    
+        table.inventory th,
+        table.inventory td {
+            padding: 5px;
+        }
+    
+        table.inventory thead th {
+            font-weight: bold;
+            border-width: 0 0 1px 0;
+            border-bottom: 1px solid #000;
+            padding-bottom: 15px
+        }
+    
+        table.inventory tbody tr:first-child td {
+            padding-top: 15px
+        }
+    
+        table.inventory tbody tr:last-child td {
+            padding-bottom: 15px
+        }
+
+        .footer {
+            border-color: #000;
         }
     }
 
-    .invoice {
-        width: unset;
+    /* ================================ PRINTING RULES ================================ */
+
+    @media print {
+        * {
+            -webkit-print-color-adjust: exact;
+        }
+        body, .wrapper {
+            margin: 0;
+            padding: 0;
+            background-color: white;
+        }
+        #freelancer-invoice {
+            span:empty {
+                display: none;
+            }
+            .add, .cut {
+                display: none;
+            }
+        }
+        .invoice {
+            margin: 1em 2em;
+            font-size: 90%;
+            width: unset;
+            padding: 0;
+            min-height: unset;
+            position: unset;
+            max-width: unset;
+            box-shadow: unset;
+        }
     }
 }

assets/sass/navbar.scss

@@ -6,6 +6,10 @@
  */
 
 .navbar-nav {
+    img.img-circle {
+        max-height: 26px;
+        margin-top: -2px;
+    }
     li>a.ddt-large {
         padding: 15px 12px 11px 10px;
         font-size: 10px;

assets/sass/selectpicker.scss

@@ -0,0 +1,23 @@
+@import '~select2/dist/css/select2.min.css';
+@import '~select2-bootstrap-theme/dist/select2-bootstrap.min.css';
+
+/* some labels were placed incorrect due to a margin-top: -4px */
+.select2-container .select2-selection--single .select2-selection__rendered {
+    margin-top: 0;
+}
+/* make sure the border looks like all other form elements */
+.select2-container--bootstrap .select2-selection {
+    border-radius: 0;
+}
+/* placeholder in multi-selects were cut off */
+.select2-search.select2-search--inline .select2-search__field {
+    width: 100% !important;
+}
+/* make sure that <optgroup> elements are padded, to allow visual difference to global activities */
+.select2-container--bootstrap .select2-results__options.select2-results__options--nested li.select2-results__option {
+    padding-left: 30px;
+}
+/* empty <option> were too small to be noticed as clickable element */
+.select2-container--bootstrap .select2-results__option {
+    min-height: 30px;
+}

assets/sass/sidebar.scss

@@ -39,3 +39,13 @@
         }
     }
 }
+
+/* 
+Simplify focus detection, when using keyboard tab navigation
+Deactivated, as it looks weird when the link is clicked 
+*/
+/*
+.sidebar-menu > li > a:focus {
+    text-decoration: underline;
+}
+*/

assets/sass/toolbar.scss

@@ -5,13 +5,6 @@
  * file that was distributed with this source code.
  */
 
-/* Page based action buttons in the upper right corner of the content area */
-.content-header > .breadcrumb {
-    position: absolute;
-    float: right;
-    background: transparent;
-}
-
 .toolbar-pad {
     padding: 10px;
 }
@@ -19,6 +12,7 @@
 /* The filter form is available on most pages above the datatable */
 @media (min-width: $screen-sm-min) {
     .toolbar {
+        // @deprecated since 1.2 - using the toolbar is deprecated and will be removed with 2.0
         form.navbar-form {
             font-size: $font-size-base;
             .form-control {
@@ -39,3 +33,58 @@
     }
 }
 
+/* Search form with filter dropdown */
+.content-header {
+    form {
+        width: 200px;
+        float: left;
+        .container-fluid {
+            padding-left: 0;
+            padding-right: 0;
+        }
+        .form-group {
+            margin: 0 0 5px 0;
+        }
+        input.search-has-error {
+            color: $red;
+        }
+        .input-group-addon.has-error {
+            color: $red;
+            border-color: $red;
+        }
+        input.has-error {
+            border-color: $red;
+        }
+        ul.dropdown-menu {
+            max-height: 100vh;
+            overflow-y: auto;
+            padding-top: 10px;
+            width: 500px;
+            box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+            max-width: 90vw;
+        }
+        a.search-cancel {
+            margin-top: 8px;
+        }
+    }
+}
+
+@media (max-width: $screen-xs-min) {
+    .content-header.search-open {
+        h1 {
+            display: none;
+        }
+        .breadcrumb {
+            display: none;
+        }
+        form.header-search {
+            padding: 0 10px 0 0;
+            float: none;
+            width: 100%;
+            ul.dropdown-menu {
+                width: 100%;
+                max-width: 100%;
+            }
+        }
+    }
+}

assets/sass/variables.scss

@@ -5,6 +5,8 @@
  * file that was distributed with this source code.
  */
 
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/variables";
+
 /**
  * A simple one to one clone of /node_modules/admin-lte/build/less/variables.less
  */

bin/console

@@ -1,25 +1,26 @@
 #!/usr/bin/env php
 <?php
 
+set_time_limit(0);
+
+if (!file_exists(__DIR__.'/../vendor/autoload.php')) {
+    echo 'Warning: You need to run "composer install" before you can use the console.' . \PHP_EOL;
+    die(1);
+}
+
+require __DIR__.'/../vendor/autoload.php';
+
 use App\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Debug\Debug;
 use Symfony\Component\Dotenv\Dotenv;
 
-set_time_limit(0);
-
-require __DIR__.'/../vendor/autoload.php';
-
-if (!class_exists(Application::class)) {
-    throw new \RuntimeException('You need to add "symfony/framework-bundle" as a Composer dependency.');
-}
-
 if (!isset($_SERVER['APP_ENV'])) {
     if (!class_exists(Dotenv::class)) {
-        throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
+        throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables or change the variables in your .env file.');
     }
-    (new Dotenv())->load(__DIR__.'/../.env');
+    (new Dotenv(true))->load(__DIR__.'/../.env');
 }
 
 $input = new ArgvInput();

composer.json

@@ -18,22 +18,22 @@
         "ext-pdo": "*",
         "ext-zip": "*",
         "beberlei/doctrineextensions": "^1.2",
-        "doctrine/doctrine-fixtures-bundle": "^3.0",
         "erusev/parsedown": "^1.6",
-        "friendsofsymfony/rest-bundle": "^2.3",
-        "friendsofsymfony/user-bundle": "~2.0",
-        "fzaninotto/faker": "^1.8",
+        "friendsofsymfony/rest-bundle": "^2.5",
+        "friendsofsymfony/user-bundle": "dev-master",
         "gedmo/doctrine-extensions": "^2.4",
         "jms/metadata": "^2.0",
         "jms/serializer-bundle": "^3.2",
-        "kevinpapst/adminlte-bundle": "~2.6",
+        "kevinpapst/adminlte-bundle": "~3.0",
         "kimai/kimai2-composer": "^0.1",
-        "mpdf/mpdf": "^7.1",
+        "laravolt/avatar": "^3.0",
+        "league/csv": "^9.4",
+        "mpdf/mpdf": "^8.0",
         "nelmio/api-doc-bundle": "^3.2",
         "nelmio/cors-bundle": "^1.5",
-        "ocramius/proxy-manager": "2.1.1",
-        "phpoffice/phpspreadsheet": "^1.4",
-        "phpoffice/phpword": "^0.15.0",
+        "ocramius/proxy-manager": "^2.1.1",
+        "phpoffice/phpspreadsheet": "^1.10",
+        "phpoffice/phpword": "^0.17",
         "psr/log": "^1.1",
         "sensio/framework-extra-bundle": "^5.2",
         "symfony/asset": "^4.0",
@@ -45,18 +45,15 @@
         "symfony/form": "^4.0",
         "symfony/framework-bundle": "^4.0",
         "symfony/intl": "^4.0",
-        "symfony/maker-bundle": "^1.0",
-        "symfony/monolog-bundle": "^3.1",
+        "symfony/monolog-bundle": "^3.4",
         "symfony/orm-pack": "^1.0",
-        "symfony/profiler-pack": "^1.0",
-        "symfony/security-bundle": "~4.2.0",
+        "symfony/security-bundle": "^4.0",
         "symfony/security-csrf": "^4.0",
         "symfony/serializer": "^4.0",
-        "symfony/swiftmailer-bundle": "^3.1",
+        "symfony/swiftmailer-bundle": "^3.2",
         "symfony/translation": "^4.0",
         "symfony/twig-bundle": "^4.0",
         "symfony/validator": "^4.0",
-        "symfony/web-server-bundle": "^4.0",
         "symfony/webpack-encore-bundle": "^1.5",
         "symfony/yaml": "^4.0",
         "twig/extensions": "^1.5",
@@ -64,18 +61,30 @@
     },
     "require-dev": {
         "dama/doctrine-test-bundle": "^5.0",
+        "doctrine/doctrine-fixtures-bundle": "^3.2",
         "friendsofphp/php-cs-fixer": "^2.10",
-        "phpstan/phpstan": "^0.11.7",
-        "phpstan/phpstan-doctrine": "^0.11.4",
-        "phpstan/phpstan-phpunit": "^0.11.2",
-        "phpstan/phpstan-symfony": "^0.11.6",
-        "phpunit/phpunit": "^7.0",
+        "fzaninotto/faker": "^1.8",
+        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan-doctrine": "^0.12",
+        "phpstan/phpstan-phpunit": "^0.12",
+        "phpstan/phpstan-symfony": "^0.12",
+        "phpunit/phpunit": "^8.0",
         "symfony/browser-kit": "^4.0",
         "symfony/css-selector": "^4.0",
+        "symfony/maker-bundle": "^1.12",
         "symfony/phpunit-bridge": "^4.0",
-        "symfony/thanks": "^1.0"
+        "symfony/profiler-pack": "^1.0"
     },
+    "repositories": [
+        {
+            "type": "artifact",
+            "url": "var/packages/"
+        }
+    ],    
     "config": {
+        "platform": {
+            "php": "7.2"
+        },
         "preferred-install": {
             "*": "dist"
         },
@@ -113,10 +122,21 @@
         "post-update-cmd": [
             "@auto-scripts"
         ],
-        "kimai:code-check":  [
+        "kimai:pre-commit":  [
             "@kimai:codestyle",
             "@kimai:phpstan",
-            "@kimai:tests"
+            "@kimai:code-lint",
+            "@kimai:tests-unit"
+        ],
+        "kimai:code-check":  [
+            "@kimai:pre-commit",
+            "@kimai:tests-integration"
+        ],
+        "kimai:code-lint":  [
+            "bin/console lint:yaml config --parse-tags",
+            "bin/console lint:twig templates",
+            "bin/console lint:xliff translations",
+            "bin/console doctrine:schema:validate --skip-sync -vvv --no-interaction"
         ],
         "kimai:tests": "vendor/bin/phpunit tests/",
         "kimai:tests-unit": "vendor/bin/phpunit --exclude-group integration tests/",
@@ -135,7 +155,7 @@
         "symfony": {
             "id": "01C3FWRDJJEX9K6Y3A4XDFXPBR",
             "allow-contrib": true,
-            "require": "~4.2.0"
+            "require": "4.3.*"
         }
     }
 }

config/bundles.php

@@ -2,8 +2,6 @@
 
 return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
-    Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true],
-    Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true],
     Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
     Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
     Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],

config/packages/assets.yaml

@@ -1,3 +1,6 @@
 framework:
     assets:
         json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
+        packages:
+            avatars:
+                base_path: 'avatars'

config/packages/doctrine.yaml

@@ -28,7 +28,7 @@ doctrine:
         entity_managers:
             default:
                 connection: default
-                naming_strategy: doctrine.orm.naming_strategy.underscore
+                naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
                 auto_mapping: true
                 mappings:
                     App:

config/packages/doctrine/mysql.yaml

@@ -0,0 +1,119 @@
+doctrine:
+     orm:
+         dql:
+             datetime_functions:
+                 addtime: DoctrineExtensions\Query\Mysql\AddTime
+                 convert_tz: DoctrineExtensions\Query\Mysql\ConvertTz
+                 date: DoctrineExtensions\Query\Mysql\Date
+                 date_format: DoctrineExtensions\Query\Mysql\DateFormat
+                 dateadd: DoctrineExtensions\Query\Mysql\DateAdd
+                 datesub: DoctrineExtensions\Query\Mysql\DateSub
+                 datediff: DoctrineExtensions\Query\Mysql\DateDiff
+                 day: DoctrineExtensions\Query\Mysql\Day
+                 dayname: DoctrineExtensions\Query\Mysql\DayName
+                 dayofweek: DoctrineExtensions\Query\Mysql\DayOfWeek
+                 dayofyear: DoctrineExtensions\Query\Mysql\DayOfYear
+                 div: DoctrineExtensions\Query\Mysql\Div
+                 from_unixtime: DoctrineExtensions\Query\Mysql\FromUnixtime
+                 hour: DoctrineExtensions\Query\Mysql\Hour
+                 last_day: DoctrineExtensions\Query\Mysql\LastDay
+                 makedate: DoctrineExtensions\Query\Mysql\MakeDate
+                 minute: DoctrineExtensions\Query\Mysql\Minute
+                 now: DoctrineExtensions\Query\Mysql\Now
+                 month: DoctrineExtensions\Query\Mysql\Month
+                 monthname: DoctrineExtensions\Query\Mysql\MonthName
+                 period_diff: DoctrineExtensions\Query\Mysql\PeriodDiff
+                 second: DoctrineExtensions\Query\Mysql\Second
+                 sectotime: DoctrineExtensions\Query\Mysql\SecToTime
+                 strtodate: DoctrineExtensions\Query\Mysql\StrToDate
+                 time: DoctrineExtensions\Query\Mysql\Time
+                 timediff: DoctrineExtensions\Query\Mysql\TimeDiff
+                 timestampadd: DoctrineExtensions\Query\Mysql\TimestampAdd
+                 timestampdiff: DoctrineExtensions\Query\Mysql\TimestampDiff
+                 timetosec: DoctrineExtensions\Query\Mysql\TimeToSec
+                 week: DoctrineExtensions\Query\Mysql\Week
+                 weekday: DoctrineExtensions\Query\Mysql\WeekDay
+                 year: DoctrineExtensions\Query\Mysql\Year
+                 yearmonth: DoctrineExtensions\Query\Mysql\YearMonth
+                 yearweek: DoctrineExtensions\Query\Mysql\YearWeek
+                 unix_timestamp: DoctrineExtensions\Query\Mysql\UnixTimestamp
+                 utc_timestamp: DoctrineExtensions\Query\Mysql\UtcTimestamp
+                 extract: DoctrineExtensions\Query\Mysql\Extract
+
+             numeric_functions:
+                 acos: DoctrineExtensions\Query\Mysql\Acos
+                 asin: DoctrineExtensions\Query\Mysql\Asin
+                 atan2: DoctrineExtensions\Query\Mysql\Atan2
+                 atan: DoctrineExtensions\Query\Mysql\Atan
+                 bit_count: DoctrineExtensions\Query\Mysql\BitCount
+                 bit_xor: DoctrineExtensions\Query\Mysql\BitXor
+                 ceil: DoctrineExtensions\Query\Mysql\Ceil
+                 cos: DoctrineExtensions\Query\Mysql\Cos
+                 cot: DoctrineExtensions\Query\Mysql\Cot
+                 degrees: DoctrineExtensions\Query\Mysql\Degrees
+                 exp: DoctrineExtensions\Query\Mysql\Exp
+                 floor: DoctrineExtensions\Query\Mysql\Floor
+                 log: DoctrineExtensions\Query\Mysql\Log
+                 log10: DoctrineExtensions\Query\Mysql\Log10
+                 log2: DoctrineExtensions\Query\Mysql\Log2
+                 pi: DoctrineExtensions\Query\Mysql\Pi
+                 power: DoctrineExtensions\Query\Mysql\Power
+                 quarter: DoctrineExtensions\Query\Mysql\Quarter
+                 radians: DoctrineExtensions\Query\Mysql\Radians
+                 rand: DoctrineExtensions\Query\Mysql\Rand
+                 round: DoctrineExtensions\Query\Mysql\Round
+                 stddev: DoctrineExtensions\Query\Mysql\StdDev
+                 sin: DoctrineExtensions\Query\Mysql\Sin
+                 std: DoctrineExtensions\Query\Mysql\Std
+                 tan: DoctrineExtensions\Query\Mysql\Tan
+                 variance: DoctrineExtensions\Query\Mysql\Variance
+
+             string_functions:
+                 aes_decrypt: DoctrineExtensions\Query\Mysql\AesDecrypt
+                 aes_encrypt: DoctrineExtensions\Query\Mysql\AesEncrypt
+                 any_value: DoctrineExtensions\Query\Mysql\AnyValue
+                 ascii: DoctrineExtensions\Query\Mysql\Ascii
+                 binary: DoctrineExtensions\Query\Mysql\Binary
+                 cast: DoctrineExtensions\Query\Mysql\Cast
+                 char_length: DoctrineExtensions\Query\Mysql\CharLength
+                 collate: DoctrineExtensions\Query\Mysql\Collate
+                 concat_ws: DoctrineExtensions\Query\Mysql\ConcatWs
+                 countif: DoctrineExtensions\Query\Mysql\CountIf
+                 crc32: DoctrineExtensions\Query\Mysql\Crc32
+                 degrees: DoctrineExtensions\Query\Mysql\Degrees
+                 field: DoctrineExtensions\Query\Mysql\Field
+                 find_in_set: DoctrineExtensions\Query\Mysql\FindInSet
+                 format: DoctrineExtensions\Query\Mysql\Format
+                 greatest: DoctrineExtensions\Query\Mysql\Greatest
+                 group_concat: DoctrineExtensions\Query\Mysql\GroupConcat
+                 hex: DoctrineExtensions\Query\Mysql\Hex
+                 ifelse: DoctrineExtensions\Query\Mysql\IfElse
+                 ifnull: DoctrineExtensions\Query\Mysql\IfNull
+                 inet_aton: DoctrineExtensions\Query\Mysql\InetAton
+                 inet_ntoa: DoctrineExtensions\Query\Mysql\InetNtoa
+                 inet6_aton: DoctrineExtensions\Query\Mysql\Inet6Aton
+                 inet6_ntoa: DoctrineExtensions\Query\Mysql\Inet6Ntoa
+                 instr: DoctrineExtensions\Query\Mysql\Instr
+                 is_ipv4: DoctrineExtensions\Query\Mysql\IsIpv4
+                 is_ipv4_compat: DoctrineExtensions\Query\Mysql\IsIpv4Compat
+                 is_ipv4_mapped: DoctrineExtensions\Query\Mysql\IsIpv4Mapped
+                 is_ipv6: DoctrineExtensions\Query\Mysql\IsIpv6
+                 lag: DoctrineExtensions\Query\Mysql\Lag
+                 lead: DoctrineExtensions\Query\Mysql\Lead
+                 least: DoctrineExtensions\Query\Mysql\Least
+                 lpad: DoctrineExtensions\Query\Mysql\Lpad
+                 match: DoctrineExtensions\Query\Mysql\MatchAgainst
+                 md5: DoctrineExtensions\Query\Mysql\Md5
+                 nullif: DoctrineExtensions\Query\Mysql\NullIf
+                 over: DoctrineExtensions\Query\Mysql\Over
+                 radians: DoctrineExtensions\Query\Mysql\Radians
+                 regexp: DoctrineExtensions\Query\Mysql\Regexp
+                 replace: DoctrineExtensions\Query\Mysql\Replace
+                 rpad: DoctrineExtensions\Query\Mysql\Rpad
+                 sha1: DoctrineExtensions\Query\Mysql\Sha1
+                 sha2: DoctrineExtensions\Query\Mysql\Sha2
+                 soundex: DoctrineExtensions\Query\Mysql\Soundex
+                 str_to_date: DoctrineExtensions\Query\Mysql\StrToDate
+                 substring_index: DoctrineExtensions\Query\Mysql\SubstringIndex
+                 unhex: DoctrineExtensions\Query\Mysql\Unhex
+                 uuid_short: DoctrineExtensions\Query\Mysql\UuidShort

config/packages/doctrine/sqlite.yaml

@@ -0,0 +1,56 @@
+doctrine:
+     orm:
+         dql:
+             datetime_functions:
+                 convert_tz: App\Doctrine\Query\Sqlite\ConvertTz
+                 date: DoctrineExtensions\Query\Sqlite\Date
+                 date_format: DoctrineExtensions\Query\Sqlite\DateFormat
+                 #dateadd: DoctrineExtensions\Query\Sqlite\DateAdd
+                 #datediff: DoctrineExtensions\Query\Sqlite\DateDiff
+                 day: DoctrineExtensions\Query\Sqlite\Day
+                 dayname: DoctrineExtensions\Query\Sqlite\DayName
+                 hour: DoctrineExtensions\Query\Sqlite\Hour
+                 julianday: DoctrineExtensions\Query\Sqlite\JulianDay
+                 minute: DoctrineExtensions\Query\Sqlite\Minute
+                 #month: DoctrineExtensions\Query\Sqlite\Month
+                 #monthname: DoctrineExtensions\Query\Sqlite\MonthName
+                 second: DoctrineExtensions\Query\Sqlite\Second
+                 month:  DoctrineExtensions\Query\Sqlite\Month
+                 strftime:  DoctrineExtensions\Query\Sqlite\StrfTime
+                 #strtodate: DoctrineExtensions\Query\Sqlite\StrToDate
+                 #time: DoctrineExtensions\Query\Sqlite\Time
+                 #timestampadd: DoctrineExtensions\Query\Sqlite\TimestampAdd
+                 #timestampdiff: DoctrineExtensions\Query\Sqlite\TimestampDiff
+                 week: DoctrineExtensions\Query\Sqlite\Week
+                 weekday: DoctrineExtensions\Query\Sqlite\WeekDay
+                 year: DoctrineExtensions\Query\Sqlite\Year
+
+
+             string_functions:
+#                 binary: DoctrineExtensions\Query\Sqlite\Binary
+#                 char_length: DoctrineExtensions\Query\Sqlite\CharLength
+                 concat_ws: DoctrineExtensions\Query\Sqlite\ConcatWs
+#                 countif: DoctrineExtensions\Query\Sqlite\CountIf
+#                 crc32: DoctrineExtensions\Query\Sqlite\Crc32
+#                 degrees: DoctrineExtensions\Query\Sqlite\Degrees
+#                 field: DoctrineExtensions\Query\Sqlite\Field
+#                 find_in_set: DoctrineExtensions\Query\Sqlite\FindInSet
+#                 group_concat: DoctrineExtensions\Query\Sqlite\GroupConcat
+                 greatest: DoctrineExtensions\Query\Sqlite\Greatest
+                 ifelse: DoctrineExtensions\Query\Sqlite\IfElse
+                 ifnull: DoctrineExtensions\Query\Sqlite\IfNull
+                 least: DoctrineExtensions\Query\Sqlite\Least
+#                 match: DoctrineExtensions\Query\Sqlite\MatchAgainst
+#                 md5: DoctrineExtensions\Query\Sqlite\Md5
+#                 nullif: DoctrineExtensions\Query\Sqlite\NullIf
+#                 radians: DoctrineExtensions\Query\Sqlite\Radians
+                 random: DoctrineExtensions\Query\Sqlite\Random
+#                 regexp: DoctrineExtensions\Query\Sqlite\Regexp
+                 replace: DoctrineExtensions\Query\Sqlite\Replace
+#                 sha1: DoctrineExtensions\Query\Sqlite\Sha1
+#                 sha2: DoctrineExtensions\Query\Sqlite\Sha2
+#                 soundex: DoctrineExtensions\Query\Sqlite\Soundex
+#                 uuid_short: DoctrineExtensions\Query\Sqlite\UuidShort
+
+             numeric_functions:
+                 round: DoctrineExtensions\Query\Sqlite\Round

config/packages/framework.yaml

@@ -29,6 +29,3 @@ framework:
     #validation:
         # possible values: 'loose', 'strict', 'html5'
         #email_validation_mode: 'html5'
-
-    assets:
-        json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'

config/packages/kimai.yaml

@@ -21,11 +21,13 @@ kimai:
 # --------------------------------------------------------------------------------
 # TIME-TRACKING
 # All configs related to time-tracking, timesheets and record management
+# Most settings can be configured in the System configuration screen     
 # --------------------------------------------------------------------------------
     timesheet:
 
-        # renders timesheet descriptions with markdown
-        markdown_content: false
+        # Allows to render timesheet descriptions with markdown
+        # This setting can be changed through the Administration screen
+        # markdown_content: false
 
         # The time-tracking mode that should be used.
         # See https://www.kimai.org/documentation/timesheet.html#tracking-modes
@@ -42,36 +44,36 @@ kimai:
         # Rounding rules are used to round the begin & end dates and the duration for timesheet records.
         # The "default" rule will round "begin" down and "end" up to the full minute, the "duration" will not be rounded.
         # Find out more about rounding rules at https://www.kimai.org/documentation/timesheet.html
-        rounding:
-            default:
-                days: ['monday','tuesday','wednesday','thursday','friday','saturday','sunday']
-                begin: 1
-                end: 1
-                duration: 0
-                mode: default
+        # rounding:
+        #    default:
+        #        days: ['monday','tuesday','wednesday','thursday','friday','saturday','sunday']
+        #        begin: 1
+        #        end: 1
+        #        duration: 0
+        #        mode: default
 
-#       # If you want to apply different hourly rates for specific weekdays, you can uncomment the "rates" configuration.
-#       # The "weekend" rule will add 50% to each timesheet entry that will be recorded on "saturdays" or "sundays".
-#       # See documentation at: https://www.kimai.org/documentation/timesheet.html#rate-calculation
-#        rates:
-#            weekend:
-#                days: ['saturday','sunday']
-#                factor: 1.5
-#
-#        # If you want to limit the max. active entries per user, you can do it here.
-#        # The soft_limit is used as theme setting and displays a warning color if the user has reached X active recordings
-#        # The hard_limit is used to detect how many active records are allowed per user:
-#        # - by default a user can only have one active time-record: it is automatically stopped when a new one is started
-#        # - when hard_limit is > 1 and the user is trying to start a new entry after reaching the limit, a warning is shown
-#        #   and the user has to stop an active entry first
-#        active_entries:
-#            soft_limit: 1
-#            hard_limit: 3
-#
-#        # Rules that define timesheet validation and behaviour
-#        rules:
-#            # whether records in the future can be created
-#            allow_future_times: true
+        # If you want to apply different hourly rates for specific weekdays, you can uncomment the "rates" configuration.
+        # The "weekend" rule will add 50% to each timesheet entry that will be recorded on "saturdays" or "sundays".
+        # See documentation at: https://www.kimai.org/documentation/timesheet.html#rate-calculation
+        # rates:
+        #    weekend:
+        #        days: ['saturday','sunday']
+        #        factor: 1.5
+
+        # If you want to limit the max. active entries per user, you can do it here.
+        # The soft_limit is used as theme setting and displays a warning color if the user has reached X active recordings
+        # The hard_limit is used to detect how many active records are allowed per user:
+        # - by default a user can only have one active time-record: it is automatically stopped when a new one is started
+        # - when hard_limit is > 1 and the user is trying to start a new entry after reaching the limit, a warning is shown
+        #   and the user has to stop an active entry first
+        # active_entries:
+        #    soft_limit: 1
+        #    hard_limit: 3
+
+        # Rules that define timesheet validation and behaviour
+        # allow_future_times: whether records in the future can be created
+        # rules:
+        #    allow_future_times: true
 # --------------------------------------------------------------------------------
 
 
@@ -84,29 +86,45 @@ kimai:
         # mapping complex rule sets of single permissions to named "sets" ("set name" = [array of "permissions and sets"])
         sets:
             ACTIVITIES: ['view_activity','create_activity','edit_activity','budget_activity','delete_activity']
-            PROJECTS: ['view_project','create_project','edit_project','budget_project','delete_project']
-            CUSTOMERS: ['view_customer','create_customer','edit_customer','budget_customer','delete_customer']
+            ACTIVITIES_TEAMLEAD: ['view_activity','create_activity','edit_teamlead_activity','budget_teamlead_activity']
+            PROJECTS: ['view_project','create_project','edit_project','budget_project','delete_project','permissions_project','comments_project','details_project']
+            PROJECTS_ALL_TEAMLEAD: ['view_teamlead_project','edit_teamlead_project','budget_teamlead_project','permissions_teamlead_project','comments_teamlead_project','details_teamlead_project']
+            PROJECTS_ALL_TEAM: ['view_team_project','edit_team_project','budget_team_project','comments_team_project','details_team_project']
+            PROJECTS_TEAMLEAD: ['view_teamlead_project','edit_teamlead_project','budget_teamlead_project','comments_teamlead_project','details_teamlead_project']
+            CUSTOMERS: ['view_customer','create_customer','edit_customer','budget_customer','delete_customer','permissions_customer','comments_customer','details_customer']
+            CUSTOMERS_ALL_TEAMLEAD: ['view_teamlead_customer','edit_teamlead_customer','budget_teamlead_customer','permissions_teamlead_customer','comments_teamlead_customer','details_teamlead_customer']
+            CUSTOMERS_ALL_TEAM: ['view_team_customer','edit_team_customer','budget_team_customer','comments_team_customer','details_team_customer']
+            CUSTOMERS_TEAMLEAD: ['view_teamlead_customer','edit_teamlead_customer','budget_teamlead_customer','comments_teamlead_customer','details_teamlead_customer']
             INVOICE: ['view_invoice','create_invoice']
-            INVOICE_TEMPLATE: ['view_invoice_template','create_invoice_template','edit_invoice_template','delete_invoice_template']
+            INVOICE_TEMPLATE: ['manage_invoice_template']
             TIMESHEET: ['view_own_timesheet','start_own_timesheet','stop_own_timesheet','create_own_timesheet','edit_own_timesheet','export_own_timesheet','delete_own_timesheet']
             TIMESHEET_OTHER: ['view_other_timesheet','start_other_timesheet','stop_other_timesheet','create_other_timesheet','edit_other_timesheet','export_other_timesheet','delete_other_timesheet']
             PROFILE: ['view_own_profile','edit_own_profile','password_own_profile','preferences_own_profile','api-token_own_profile']
-            PROFILE_OTHER: ['view_other_profile','edit_other_profile','delete_other_profile','password_other_profile','roles_other_profile','preferences_other_profile','api-token_other_profile']
-            TAGS: ['view_tag','delete_tag']
+            PROFILE_OTHER: ['view_other_profile','edit_other_profile','password_other_profile','roles_other_profile','preferences_other_profile','api-token_other_profile','teams_other_profile']
+            TAGS: ['view_tag','manage_tag','delete_tag']
             USER: ['view_user','create_user','delete_user','role_permissions']
             RATE: ['view_rate_own_timesheet','edit_rate_own_timesheet']
             RATE_OTHER: ['view_rate_other_timesheet','edit_rate_other_timesheet']
-            EXPORT: ['view_export','create_export','edit_export_own_timesheet','edit_export_other_timesheet']
-            ROLE_USER: ['@TIMESHEET','@PROFILE']
-            ROLE_TEAMLEAD: ['@INVOICE','@TIMESHEET','@TIMESHEET_OTHER','@PROFILE','@EXPORT','@TAGS','@INVOICE_TEMPLATE','!delete_invoice_template','view_rate_own_timesheet','view_rate_other_timesheet','hourly-rate_own_profile']
-            ROLE_ADMIN: ['@ACTIVITIES','@PROJECTS','@CUSTOMERS','@INVOICE','@INVOICE_TEMPLATE','@TIMESHEET','@TIMESHEET_OTHER','@PROFILE','@RATE','@RATE_OTHER','@EXPORT','@TAGS','hourly-rate_own_profile','edit_exported_timesheet']
-            ROLE_SUPER_ADMIN: ['@ACTIVITIES','@PROJECTS','@CUSTOMERS','@INVOICE','@INVOICE_TEMPLATE','@TIMESHEET','@TIMESHEET_OTHER','@PROFILE','@PROFILE_OTHER','@USER','@RATE','@RATE_OTHER','@EXPORT','@TAGS','hourly-rate_own_profile','hourly-rate_other_profile','delete_own_profile','roles_own_profile','system_information','system_configuration','plugins','edit_exported_timesheet']
+            EXPORT: ['create_export','edit_export_own_timesheet','edit_export_other_timesheet']
+            TEAMS: ['view_team','create_team','edit_team','delete_team']
+            # some single default definitions for roles 
+            SINGLE_USER: ['view_team_member','budget_team_project']
+            SINGLE_TEAMLEAD: ['view_rate_own_timesheet','view_rate_other_timesheet','hourly-rate_own_profile','view_team_member']
+            SINGLE_ADMIN: ['hourly-rate_own_profile','edit_exported_timesheet','teams_own_profile','view_team_member']
+            SINGLE_SUPER_ADMIN: ['hourly-rate_own_profile','hourly-rate_other_profile','roles_own_profile','system_information','system_configuration','plugins','edit_exported_timesheet','teams_own_profile','view_team_member']
+            # link above sets to one complete set for each user role
+            ROLE_USER: ['@TIMESHEET','@PROFILE','@SINGLE_USER']
+            ROLE_TEAMLEAD: ['@ACTIVITIES_TEAMLEAD','@PROJECTS_TEAMLEAD','@CUSTOMERS_TEAMLEAD','@TIMESHEET_OTHER','@INVOICE','@TIMESHEET','@PROFILE','@EXPORT','@TAGS','@SINGLE_TEAMLEAD']
+            ROLE_ADMIN: ['@ACTIVITIES','@PROJECTS','@CUSTOMERS','@INVOICE','@INVOICE_TEMPLATE','@TIMESHEET','@TIMESHEET_OTHER','@PROFILE','@TEAMS','@RATE','@RATE_OTHER','@EXPORT','@TAGS','@SINGLE_ADMIN']
+            ROLE_SUPER_ADMIN: ['@ACTIVITIES','@PROJECTS','@CUSTOMERS','@INVOICE','@INVOICE_TEMPLATE','@TIMESHEET','@TIMESHEET_OTHER','@PROFILE','@PROFILE_OTHER','@USER','@TEAMS','@RATE','@RATE_OTHER','@EXPORT','@TAGS','@SINGLE_SUPER_ADMIN']
         # mapping "sets" or permissions to user roles ("role name" = [array of "set names"])
         maps:
             ROLE_USER: ['ROLE_USER']
             ROLE_TEAMLEAD: ['ROLE_TEAMLEAD']
             ROLE_ADMIN: ['ROLE_ADMIN']
             ROLE_SUPER_ADMIN: ['ROLE_SUPER_ADMIN']
+            # only here to register the (partially) unused permissions in the UI
+            ROLE_FAKE: ['CUSTOMERS_ALL_TEAMLEAD','CUSTOMERS_ALL_TEAM','PROJECTS_ALL_TEAMLEAD','PROJECTS_ALL_TEAM']
         # add or remove single permissions
         roles:
             ROLE_USER: []
@@ -124,6 +142,7 @@ kimai:
 #        week_numbers: true
 #        weekends: true
 #        day_limit: 4
+#        slot_duration: '00:30:00'
 #        businessHours:
 #            days: [1, 2, 3, 4, 5]
 #            begin: '08:00'
@@ -153,18 +172,6 @@ kimai:
 # --------------------------------------------------------------------------------
 
 
-# --------------------------------------------------------------------------------
-# THEME Settings
-# will be available as twig globals at "kimai_context.*".
-# See documentation at https://www.kimai.org/documentation/theme.html
-# --------------------------------------------------------------------------------
-#    theme:
-#        # BETA test: If you set this to 'selectpicker' the customer/project/activity select boxes will be transformed
-#        # into a searchable and javascript enhanced input type
-#        select_type: ~
-# --------------------------------------------------------------------------------
-
-
 # --------------------------------------------------------------------------------
 # DASHBOARD
 # Using the configurable widget sections.
@@ -172,16 +179,21 @@ kimai:
 # --------------------------------------------------------------------------------
     dashboard:
         user_duration:
-            title: dashboard.you
+            title: stats.yourWorkingHours
             order: 10
-            permission: ROLE_USER
-            type: 'compoundChart'
+            permission: view_own_timesheet
+            type: '\App\Widget\Type\CompoundChart'
             widgets: [DailyWorkingTimeChart, userDurationToday, userDurationWeek, userDurationMonth, userDurationYear]
         user_rates:
             title: ~
             order: 20
             permission: view_rate_own_timesheet
             widgets: [userAmountToday, userAmountWeek, userAmountMonth, userAmountYear]
+        user_teams:
+            title: ~
+            order: 15
+            permission: ROLE_USER
+            widgets: [UserTeams, UserTeamProjects]
         duration:
             title: dashboard.all
             order: 30
@@ -205,29 +217,42 @@ kimai:
 # Locale specific settings, like date formats
 # --------------------------------------------------------------------------------
     languages:
+        cs:
+            date_time_type: 'dd.MM.yyyy HH:mm'
+            date_type: 'dd.MM.yyyy'
+            date: 'd.m.Y'
+            date_time: 'd.m H:i'
+        da:
+            date_time_type: 'dd.MM.yyyy HH:mm'
+            date_type: 'dd.MM.yyyy'
+            date: 'd.m.Y'
+            date_time: 'd.m. H:i'
         de:
             date_time_type: 'dd.MM.yyyy HH:mm'
             date_type: 'dd.MM.yyyy'
             date: 'd.m.Y'
             date_time: 'd.m. H:i'
-            duration: '%%h:%%m h'
+        de_CH:
+            date_time_type: 'dd.MM.yyyy HH:mm'
+            date_type: 'dd.MM.yyyy'
+            date: 'd.m.Y'
+            date_time: 'd.m. H:i'
         en:
             date_time_type: 'yyyy-MM-dd HH:mm'
             date_type: 'yyyy-MM-dd'
             date: 'Y-m-d'
             date_time: 'm-d H:i'
             duration: '%%h:%%m h'
-        pt_BR:
-            date_time_type: 'dd-MM-yyyy HH:mm'
-            date_type: 'dd-MM-yyyy'
-            date: 'd-m-Y'
-            date_time: 'd-m H:i'
-            duration: '%%h:%%m h'
-        it:
+        es:
             date_time_type: 'dd.MM.yyyy HH:mm'
             date_type: 'dd.MM.yyyy'
             date: 'd.m.Y'
             date_time: 'd.m. H:i'
+        eu:
+            date_time_type: 'yyyy-MM-dd HH:mm'
+            date_type: 'yyyy-MM-dd'
+            date: 'Y-m-d'
+            date_time: 'm-d H:i'
             duration: '%%h:%%m h'
         fr:
             date_time_type: 'dd/MM/yyyy HH:mm'
@@ -235,54 +260,39 @@ kimai:
             date: 'd/m/Y'
             date_time: 'd/m H:i'
             duration: '%%h h %%m'
-        es:
-            date_time_type: 'dd.MM.yyyy HH:mm'
-            date_type: 'dd.MM.yyyy'
-            date: 'd.m.Y'
-            date_time: 'd.m. H:i'
-            duration: '%%h:%%m h'
-        ru:
-            date_time_type: 'dd.MM.yyyy HH:mm'
-            date_type: 'dd.MM.yyyy'
-            date: 'd.m.Y'
-            date_time: 'd.m. H:i'
-            duration: '%%h:%%m h'
-        ar:
-            date_time_type: 'yyyy-MM-dd HH:mm'
-            date_type: 'yyyy-MM-dd'
-            date: 'Y-m-d'
-            date_time: 'm-d H:i'
-            duration: '%%h:%%m h'
         hu:
             date_time_type: 'yyyy.MM.dd. HH:mm'
             date_type: 'yyyy.MM.dd.'
             date: 'Y.m.d.'
             date_time: 'm.d. H:i'
-            duration: '%%h:%%m h'
+        it:
+            date_time_type: 'dd.MM.yyyy HH:mm'
+            date_type: 'dd.MM.yyyy'
+            date: 'd.m.Y'
+            date_time: 'd.m. H:i'
+        nl:
+            date_time_type: 'dd.MM.yyyy HH:mm'
+            date_type: 'dd.MM.yyyy'
+            date: 'd.m.Y'
+            date_time: 'd.m. H:i'
+            duration: '%%hu%%m'
+        pt_BR:
+            date_time_type: 'dd-MM-yyyy HH:mm'
+            date_type: 'dd-MM-yyyy'
+            date: 'd-m-Y'
+            date_time: 'd-m H:i'
+        ru:
+            date_time_type: 'dd.MM.yyyy HH:mm'
+            date_type: 'dd.MM.yyyy'
+            date: 'd.m.Y'
+            date_time: 'd.m. H:i'
+        sk:
+            date_time_type: 'dd. MM. yyyy HH:mm'
+            date_type: 'dd. MM. yyyy'
+            date: 'd. m. Y'
+            date_time: 'd. m.  H:i'
         sv:
-            date_time_type: 'yyyy-MM-dd HH:mm'
-            date_type: 'yyyy-MM-dd'
-            date: 'Y-m-d'
-            date_time: 'm-d H:i'
             duration: '%%h:%%m tim'
-        ja:
-            date_time_type: 'yyyy-MM-dd HH:mm'
-            date_type: 'yyyy-MM-dd'
-            date: 'Y-m-d'
-            date_time: 'm-d H:i'
-            duration: '%%h:%%m tim'
-# --------------------------------------------------------------------------------
-
-
-# --------------------------------------------------------------------------------
-# FORMS
-# Default settings used to populate forms
-# --------------------------------------------------------------------------------
-#    defaults:
-#        customer:
-#            timezone: Europe/Berlin
-#            country: DE
-#            currency: EUR
 # --------------------------------------------------------------------------------
 
 
@@ -293,12 +303,3 @@ kimai:
     data_dir: '%kernel.project_dir%/var/data'
     plugin_dir: '%kernel.project_dir%/var/plugins'
 # --------------------------------------------------------------------------------
-
-
-# --------------------------------------------------------------------------------
-# LDAP
-# Connect to your companies directory server, see https://www.kimai.org/documentation/ldap.html
-# --------------------------------------------------------------------------------
-#    ldap:
-#        active: true
-# --------------------------------------------------------------------------------

config/packages/nelmio_api_doc.yaml

@@ -14,14 +14,19 @@ nelmio_api_doc:
             - { alias: ActivityEntity,            type: App\Entity\Activity,                      groups: [Default, Entity, Activity] }
             - { alias: ActivityMetaField,         type: App\Entity\ActivityMeta,                  groups: [Default, Activity] }
             - { alias: ActivityCollection,        type: App\Entity\Activity,                      groups: [Default, Collection, Activity] }
+            - { alias: TagEditForm,               type: App\Form\API\TagApiEditForm,              groups: [Default, Entity, Tag] }
+            - { alias: TagEntity,                 type: App\Entity\Tag,                           groups: [Default, Entity, Tag] }
             - { alias: TimesheetEditForm,         type: App\Form\API\TimesheetApiEditForm,        groups: [Default, Entity, Timesheet] }
             - { alias: TimesheetEntity,           type: App\Entity\Timesheet,                     groups: [Default, Entity, Timesheet] }
             - { alias: TimesheetMeta,             type: App\Entity\TimesheetMeta,                 groups: [Default, Timesheet] }
             - { alias: TimesheetCollection,       type: App\Entity\Timesheet,                     groups: [Default, Collection, Timesheet] }
             - { alias: TimesheetSubCollection,    type: App\Entity\Timesheet,                     groups: [Default, Subresource, Timesheet] }
-            - { alias: UserEntity,                type: App\Entity\User,                          groups: [Default, Entity, User] }
+            - { alias: UserEntity,                type: App\Entity\User,                          groups: [Default, Entity, User, User_Entity] }
             - { alias: UserCollection,            type: App\Entity\User,                          groups: [Default, Collection, User] }
+            - { alias: TeamEntity,                type: App\Entity\Team,                          groups: [Default, Entity, Team, Team_Entity] }
+            - { alias: TeamCollection,            type: App\Entity\Team,                          groups: [Default, Collection, Team] }
             - { alias: I18nConfig,                type: App\API\Model\I18n,                       groups: [Default] }
+            - { alias: TimesheetConfig,           type: App\API\Model\TimesheetConfig,            groups: [Default] }
     areas:
         path_patterns:
             - ^/api(?!/doc)
@@ -33,9 +38,9 @@ nelmio_api_doc:
         info:
             title: Kimai 2 - API Docs
             description: |
-                REST API for the Kimai 2 time-tracking software. Read more about its usage in the [API documentation](https://www.kimai.org/documentation/rest-api.html) and then download a [Swagger file](doc.json) for import e.g. in Postman.
+                JSON API for the Kimai 2 time-tracking software. Read more about its usage in the [API documentation](https://www.kimai.org/documentation/rest-api.html) and then download a [Swagger file](doc.json) for import e.g. in Postman.
                 Be aware: it is not yet considered stable and BC breaks might happen, but we try to avoid them.
-            version: 0.3
+            version: '0.4'
         securityDefinitions:
             apiUser:
                 type: apiKey

config/packages/prod/monolog.yaml

@@ -10,8 +10,8 @@ monolog:
         nested:
             type: stream
             path: "%kernel.logs_dir%/%kernel.environment%.log"
-            level: debug
+
         console:
-            type:   console
+            type: console
             process_psr_3_messages: false
             channels: ["!event", "!doctrine"]

config/packages/security.yaml

@@ -1,6 +1,6 @@
 security:
     encoders:
-        App\Entity\User: bcrypt
+        App\Entity\User: auto
 
     providers:
         chain_provider:
@@ -48,6 +48,7 @@ security:
         allow_if_all_abstain: false
 
     role_hierarchy:
+        ROLE_USER:        ~
         ROLE_TEAMLEAD:    ROLE_USER
         ROLE_ADMIN:       ROLE_TEAMLEAD
         ROLE_SUPER_ADMIN: ROLE_ADMIN

config/packages/test/security.yaml

@@ -4,7 +4,7 @@ security:
     encoders:
         # to make tests much faster, BCrypt cost is changed to its minimum allowed value (4)
         # See https://symfony.com/doc/current/reference/configuration/security.html#using-the-bcrypt-password-encoder
-        App\Entity\User: { algorithm: bcrypt, cost: 4 }
+        App\Entity\User: { algorithm: auto }
 
     firewalls:
         secured_area:

config/routes.yaml

@@ -7,7 +7,10 @@ home:
 
 homeLocale:
     path: /{_locale}
+    requirements:
+        _locale: '%app_locales%'
     defaults:
         _controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction
+        _locale: '%locale%'
         route: homepage
         permanent: true

config/routes/test/test_routes.yaml

@@ -1,6 +1,6 @@
-app.test.sidebar_settings:
-    path: /{_locale}/sidebar/settings
-    controller: App\Controller\SidebarController::settingsAction
+app.test.active_entries:
+    path: /{_locale}/layou/active_entries
+    controller: App\Controller\LayoutController::activeEntries
     requirements:
         _locale: '%app_locales%'
     defaults:

config/serializer/App/Entity.Activity.yml

@@ -1,6 +1,6 @@
 App\Entity\Activity:
     exclusion_policy: All
-    custom_accessor_order: [id, name, comment, visible, project, fixedRate, hourlyRate, color, budget, timeBudget, metaFields]
+    custom_accessor_order: [id, name, comment, visible, project, fixedRate, hourlyRate, color, budget, timeBudget, metaFields, parentTitle]
     properties:
         id:
             include: true
@@ -35,6 +35,11 @@ App\Entity\Activity:
         metaFields:
             exclude: true
     virtual_properties:
+        parentTitle:
+            serialized_name: parentTitle
+            include: true
+            exp: "object.getProject() === null ? null : object.getProject().getName()"
+            groups: [Default]
         getProject:
             serialized_name: project
             exp: "object.getProject() === null ? null : object.getProject().getId()"

config/serializer/App/Entity.Project.yml

@@ -1,6 +1,6 @@
 App\Entity\Project:
     exclusion_policy: All
-    custom_accessor_order: [id, name, comment, visible, orderNumber, customer, fixedRate, hourlyRate, color, budget, timeBudget, metaFields]
+    custom_accessor_order: [id, name, comment, visible, orderNumber, orderDate, customer, start, end, fixedRate, hourlyRate, color, budget, timeBudget, metaFields, parentTitle]
     properties:
         id:
             include: true
@@ -20,6 +20,15 @@ App\Entity\Project:
         orderNumber:
             include: true
             groups: [Entity]
+        orderDate:
+            include: true
+            groups: [Entity]
+        start:
+            include: true
+            groups: [Project]
+        end:
+            include: true
+            groups: [Project]
         fixedRate:
             include: true
             groups: [Project]
@@ -33,6 +42,11 @@ App\Entity\Project:
         metaFields:
             exclude: true
     virtual_properties:
+        parentTitle:
+            serialized_name: parentTitle
+            include: true
+            exp: "object.getCustomer() === null ? null : object.getCustomer().getName()"
+            groups: [Default]
         getCustomer:
             serialized_name: customer
             exp: "object.getCustomer() === null ? null : object.getCustomer().getId()"

config/serializer/App/Entity.Team.yml

@@ -0,0 +1,18 @@
+App\Entity\Team:
+    exclusion_policy: All
+    custom_accessor_order: [id, name, teamlead, users]
+    properties:
+        id:
+            include: true
+        name:
+            include: true
+        teamlead:
+            include: true
+            groups: [Team_Entity]
+        users:
+            include: true
+            groups: [Team_Entity]
+        customers:
+            exclude: true
+        projects:
+            exclude: true

config/serializer/App/Entity.User.yml

@@ -1,6 +1,6 @@
 App\Entity\User:
     exclusion_policy: All
-    custom_accessor_order: [id, alias, title, avatar, language, timezone]
+    custom_accessor_order: [id, alias, title, avatar, language, timezone, teams]
     properties:
         id:
             include: true
@@ -10,18 +10,21 @@ App\Entity\User:
             groups: [Default]
         title:
             include: true
-            groups: [Entity]
+            groups: [User_Entity]
         avatar:
             include: true
-            groups: [Entity]
+            groups: [User_Entity]
+        teams:
+            include: true
+            groups: [User_Entity]
     virtual_properties:
         getLanguage:
             serialized_name: language
             exp: "object.getPreferenceValue('language') === null ? null : object.getPreferenceValue('language')"
             type: string
-            groups: [Entity]
+            groups: [User_Entity]
         getTimezone:
             serialized_name: timezone
             exp: "object.getPreferenceValue('timezone') === null ? null : object.getPreferenceValue('timezone')"
             type: string
-            groups: [Entity]
+            groups: [User_Entity]

config/serializer/FOS/UserBundle/Model.User.yml

@@ -10,7 +10,7 @@ FOS\UserBundle\Model\User:
         roles:
             type: array<string>
             include: true
-            groups: [Entity]
+            groups: [User_Entity]
         groups:
             exclude: true
         email:

config/services.yaml

@@ -2,7 +2,7 @@
 # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
 parameters:
     locale: en
-    app_locales: en|de|it|fr|es|ru|ar|hu|pt_BR|sv|ja
+    app_locales: ar|cs|de|de_CH|da|en|es|eu|fr|hu|it|ja|ko|nl|pt_BR|ru|sk|sv|tr|zh_CN
 
 services:
     # default configuration for services in *this* file
@@ -74,13 +74,15 @@ services:
     App\Plugin\PluginManager:
         arguments: [!tagged kimai.plugin]
 
-    App\Export\ServiceExport:
-        arguments: [!tagged export.renderer]
-
     App\Widget\WidgetService:
         arguments:
             $renderer: !tagged widget.renderer
 
+    App\Utils\Translator:
+        decorates: translator
+        arguments:
+            $localDomains: '%kimai.i18n_domains%'
+
     # ================================================================================
     # DATABASE
     # ================================================================================
@@ -116,21 +118,29 @@ services:
     # TIMESHEET RECORD CALCULATOR
     # ================================================================================
 
-    App\Timesheet\Calculator\DurationCalculator:
-        arguments: ['%kimai.timesheet.rounding%']
+    App\Timesheet\RoundingService:
+        arguments:
+            $roundingModes: !tagged timesheet.rounding_mode
+            $rules: '%kimai.timesheet.rounding%'
 
     App\Timesheet\Calculator\RateCalculator:
         arguments: ['%kimai.timesheet.rates%']
 
+    App\Timesheet\TrackingModeService:
+        arguments: 
+            $modes: !tagged timesheet.tracking_mode
+
     # ================================================================================
     # SECURITY & VOTER
     # ================================================================================
 
     App\Security\RoleService:
-        arguments: ['%security.role_hierarchy.roles%']
+        arguments:
+            $roles: '%security.role_hierarchy.roles%'
 
     App\Security\RolePermissionManager:
-        arguments: ['%kimai.permissions%']
+        arguments:
+            $permissions: '%kimai.permissions%'
 
     # ================================================================================
     # LDAP
@@ -154,6 +164,11 @@ services:
         factory:   ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\User']
 
+    App\Repository\TeamRepository:
+        class:     Doctrine\ORM\EntityRepository
+        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        arguments: ['App\Entity\Team']
+
     App\Repository\ActivityRepository:
         class:     Doctrine\ORM\EntityRepository
         factory:   ['@doctrine.orm.entity_manager', getRepository]
@@ -184,6 +199,16 @@ services:
         factory:   ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\Configuration']
 
+    App\Repository\RoleRepository:
+        class:     Doctrine\ORM\EntityRepository
+        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        arguments: ['App\Entity\Role']
+
+    App\Repository\RolePermissionRepository:
+        class:     Doctrine\ORM\EntityRepository
+        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        arguments: ['App\Entity\RolePermission']
+    
     App\Repository\InvoiceDocumentRepository:
         class: App\Repository\InvoiceDocumentRepository
         arguments: ['%kimai.invoice.documents%']

config/services_test.yaml

@@ -1,3 +1,7 @@
+parameters:
+    locale: en
+    app_locales: ar|cs|de|de_CH|da|en|es|fr|hu|it|ja|ko|nl|pt_BR|ru|sk|sv|tr|zh_CN
+
 services:
     _defaults:
         public: true

config/validator/validation.yaml

@@ -9,5 +9,5 @@ App\Entity\User:
             - NotBlank: ~
             - Email: ~
         plainPassword:
-            - NotBlank: { groups: [registration, passwordUpdate] }
-            - Length: { min: 5, max: 60, groups: [registration, passwordUpdate] }
+            - NotBlank: { groups: [Registration, PasswordUpdate] }
+            - Length: { min: 8, max: 60, groups: [Registration, PasswordUpdate] }

package.json

@@ -25,7 +25,6 @@
     "@symfony/webpack-encore": "^0.27.0",
     "admin-lte": "~2.4.8",
     "bootstrap-sass": "^3.3.7",
-    "bootstrap-select": "^1.13.1",
     "chart.js": "~2.8.0",
     "core-js": "^3.1.3",
     "daterangepicker": "^3.0.3",
@@ -38,7 +37,10 @@
     "moment": "^2.24.0",
     "node-sass": "^4.9.0",
     "sass-loader": "^7.0.2",
-    "sweetalert2": "^8.11.7",
+    "select2": "^4.0.10",
+    "select2-bootstrap-theme": "^0.1.0-beta.10",
+    "sortablejs": "^1.10.1",
+    "sweetalert2": "^9.3",
     "webpack-notifier": "^1.5.1"
   }
 }

phpstan.neon

@@ -1,21 +1,25 @@
 includes:
     - vendor/phpstan/phpstan-symfony/extension.neon
     - vendor/phpstan/phpstan-doctrine/extension.neon
+    - vendor/phpstan/phpstan-symfony/rules.neon
 
 parameters:
+    tmpDir: %rootDir%/../../../var/cache/phpstan
     autoload_directories:
         - %rootDir%/../../../src/Migrations
 #    symfony:
 #        container_xml_path: '%rootDir%/../../../var/cache/dev/srcApp_KernelDevDebugContainer.xml'
     ignoreErrors:
         - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface::scalarNode\(\).#'
-        - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::children\(\).#'
-        - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::useAttributeAsKey\(\).#'
+        - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface::integerNode\(\).#'
+        - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface::booleanNode\(\).#'
+        - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface::end\(\).#'
+        - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface::defaultValue\(\).#'
         - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::addDefaultsIfNotSet\(\).#'
-        - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::requiresAtLeastOneElement\(\).#'
         - '#Access to an undefined property Faker\\Generator::\$stateAbbr.#'
         - '#Access to an undefined property Faker\\Generator::\$catchPhrase.#'
         - '#Access to an undefined property Faker\\Generator::\$bs.#'
+        - '#Method Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface::dispatch\(\) invoked with 2 parameters, 1 required.#'
     excludes_analyse:
         - %rootDir%/../../../src/Command/KimaiImporterCommand.php
         - %rootDir%/../../../src/Ldap/LdapDriver.php

public/.htaccess

@@ -5,6 +5,15 @@
 # to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl).
 DirectoryIndex index.php
 
+# Do NOT use Kimai with http, this is a huge security risk!
+# Activate these lines if you configured SSL and certificates:
+
+#<IfModule mod_rewrite.c>
+#    RewriteEngine On
+#    RewriteCond %{SERVER_PORT} 80
+#    RewriteRule ^(.*)$ https://kimai.example.com/$1 [R,L]
+#</IfModule>
+
 <IfModule mod_rewrite.c>
     RewriteEngine On
 

public/build/entrypoints.json

@@ -2,44 +2,44 @@
   "entrypoints": {
     "app": {
       "js": [
-        "build/runtime.784b5d0d.js",
-        "build/0.66b5fd0b.js",
-        "build/1.93f0cf2b.js",
-        "build/app.0ac6f178.js"
+        "build/runtime.6ca1eea5.js",
+        "build/0.1a6ffb43.js",
+        "build/1.16767f92.js",
+        "build/app.8b409f35.js"
       ],
       "css": [
-        "build/app.7f4a18a1.css"
+        "build/app.8240996d.css"
       ]
     },
     "chart": {
       "js": [
-        "build/runtime.784b5d0d.js",
-        "build/0.66b5fd0b.js",
-        "build/2.c06cd055.js",
-        "build/chart.2bb71e2e.js"
+        "build/runtime.6ca1eea5.js",
+        "build/0.1a6ffb43.js",
+        "build/2.dad56560.js",
+        "build/chart.7f4d7f29.js"
       ]
     },
     "calendar": {
       "js": [
-        "build/runtime.784b5d0d.js",
-        "build/0.66b5fd0b.js",
-        "build/1.93f0cf2b.js",
-        "build/calendar.59417f4c.js"
+        "build/runtime.6ca1eea5.js",
+        "build/0.1a6ffb43.js",
+        "build/1.16767f92.js",
+        "build/calendar.13664a8f.js"
       ],
       "css": [
-        "build/calendar.b0551848.css"
+        "build/calendar.ade7bcdf.css"
       ]
     }
   },
   "integrity": {
-    "build/runtime.784b5d0d.js": "sha384-+AsC7zoefPga1AkczlNSCXcbGwD0TwokkldvNISHf1nMlOpafanLjtKvlZy9cVsm",
-    "build/0.66b5fd0b.js": "sha384-ncT/BKhCsqH6jhxwdsSG95m1ei7ZZjeZtzH1262h+OPUU80TSFFE3dt+abcHHMok",
-    "build/1.93f0cf2b.js": "sha384-pmnwzvj+UJhDD3uDf+ekLARMBRtMDxWGbnJDrJvwIoRZd3MW/tOGzAW5Ybhbvw20",
-    "build/app.0ac6f178.js": "sha384-eORpGh3VKK5IISACV4rmp8CpkZ+s47G8aKaZnXVpswgZccU/YcJPkSa5+jhcI88T",
-    "build/app.7f4a18a1.css": "sha384-p8Dw7CP1RxxJ2K5yuaNpCw8r1lKd64DlVA2IQeEGxBAC2QxOjweafd8w9CSMk0GC",
-    "build/2.c06cd055.js": "sha384-txR0QG+838LKYtPQ99Gx4OU7WmgN9J3joZEyGwIskSz74EN1T4/IBVnmNaKiFN1q",
-    "build/chart.2bb71e2e.js": "sha384-I57c9DtU3AOG2kzKqIZkIu0hi1aGYHRZ5QG4LKC9+9slzJnAMttPGXoL2cQG3m6y",
-    "build/calendar.59417f4c.js": "sha384-16sOZQy1UmOaoLAVFPfHnF8nFqUxhc4URAg+ypJnnab8uqZAGHDfFFrnq0/6PXl1",
-    "build/calendar.b0551848.css": "sha384-ta519W5+NY1a8FBh7rD4zORYTfUXCYTLci0Z25nf4BfodmuXqyPVNEe7dSe2/fRd"
+    "build/runtime.6ca1eea5.js": "sha384-xNNrNinl64G3nCUrIskgSjU0mUXXCB9lj6XCSInBTwxSKXk8uTMafnLHtdWdIGtd",
+    "build/0.1a6ffb43.js": "sha384-vuVCyLVj2b4h3jpKl+JSANRCacmXeLk+ihK5T5NZBO7+SJ5Y+o6d4qju116hTPSD",
+    "build/1.16767f92.js": "sha384-JPoKdrVtBemSiVBoAnmSxLML7xXM9zYeuwOPYQv/kLzt/P4cmLY5r9gH8oaGRPFG",
+    "build/app.8b409f35.js": "sha384-KLjCz4QplvRgAqezJx4OSJp38bRW0WHel8mmbmGgDtYTKIHBahoGY72PQwD+UU4m",
+    "build/app.8240996d.css": "sha384-ZaS4ro6HGbDfLyaJc8cVXJzTd8plX3mRzhHhiiUEErSzPlRKdZfViDk23BNvAaz+",
+    "build/2.dad56560.js": "sha384-oKsefSmRq0GL+Qa6f6jExXvFay3cM6YZFHQRKoAHi2p54UOCtjJfjF2eAB1qykoL",
+    "build/chart.7f4d7f29.js": "sha384-I57c9DtU3AOG2kzKqIZkIu0hi1aGYHRZ5QG4LKC9+9slzJnAMttPGXoL2cQG3m6y",
+    "build/calendar.13664a8f.js": "sha384-CDVRjmMRhA0KU90taIf50/DQOr1gbxGmdxVW8uj+qcwzKE843XPCz40fYQudopGU",
+    "build/calendar.ade7bcdf.css": "sha384-ta519W5+NY1a8FBh7rD4zORYTfUXCYTLci0Z25nf4BfodmuXqyPVNEe7dSe2/fRd"
   }
 }

public/build/manifest.json

@@ -1,13 +1,13 @@
 {
-  "build/0.66b5fd0b.js": "build/0.66b5fd0b.js",
-  "build/1.93f0cf2b.js": "build/1.93f0cf2b.js",
-  "build/2.c06cd055.js": "build/2.c06cd055.js",
-  "build/app.css": "build/app.7f4a18a1.css",
-  "build/app.js": "build/app.0ac6f178.js",
-  "build/calendar.css": "build/calendar.b0551848.css",
-  "build/calendar.js": "build/calendar.59417f4c.js",
-  "build/chart.js": "build/chart.2bb71e2e.js",
-  "build/runtime.js": "build/runtime.784b5d0d.js",
+  "build/0.1a6ffb43.js": "build/0.1a6ffb43.js",
+  "build/1.16767f92.js": "build/1.16767f92.js",
+  "build/2.dad56560.js": "build/2.dad56560.js",
+  "build/app.css": "build/app.8240996d.css",
+  "build/app.js": "build/app.8b409f35.js",
+  "build/calendar.css": "build/calendar.ade7bcdf.css",
+  "build/calendar.js": "build/calendar.13664a8f.js",
+  "build/chart.js": "build/chart.7f4d7f29.js",
+  "build/runtime.js": "build/runtime.6ca1eea5.js",
   "build/fonts/fa-brands-400.eot": "build/fonts/fa-brands-400.8e49b728.eot",
   "build/fonts/fa-brands-400.woff": "build/fonts/fa-brands-400.9f018d10.woff",
   "build/fonts/fa-brands-400.woff2": "build/fonts/fa-brands-400.9f4ce3dc.woff2",

public/build/runtime.6ca1eea5.js

@@ -0,0 +1 @@
+!function(e){function r(r){for(var n,l,i=r[0],f=r[1],a=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var f=t[i];0!==o[f]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={runtime:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="build/";var i=window.webpackJsonp=window.webpackJsonp||[],f=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var p=f;t()}([]);

public/build/runtime.784b5d0d.js

@@ -1 +0,0 @@
-!function(e){function r(r){for(var n,i,l=r[0],f=r[1],a=r[2],c=0,s=[];c<l.length;c++)i=l[c],o[i]&&s.push(o[i][0]),o[i]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var f=t[l];0!==o[f]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={runtime:0},u=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="build/";var l=window.webpackJsonp=window.webpackJsonp||[],f=l.push.bind(l);l.push=r,l=l.slice();for(var a=0;a<l.length;a++)r(l[a]);var p=f;t()}([]);

public/index.php

@@ -12,10 +12,10 @@ if (!isset($_SERVER['APP_ENV'])) {
     if (!class_exists(Dotenv::class)) {
         throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
     }
-    (new Dotenv())->load(__DIR__.'/../.env');
+    (new Dotenv(true))->load(__DIR__.'/../.env');
 }
 
-$env = $_SERVER['APP_ENV'] ?? 'dev';
+$env = $_SERVER['APP_ENV'] ?? 'prod';
 $debug = $_SERVER['APP_DEBUG'] ?? ('prod' !== $env);
 
 if ($debug) {

src/API/ActivityController.php

@@ -12,16 +12,20 @@ declare(strict_types=1);
 namespace App\API;
 
 use App\Entity\Activity;
+use App\Event\ActivityMetaDefinitionEvent;
 use App\Form\API\ActivityApiEditForm;
 use App\Repository\ActivityRepository;
 use App\Repository\Query\ActivityQuery;
+use App\Utils\SearchTerm;
 use FOS\RestBundle\Controller\Annotations as Rest;
 use FOS\RestBundle\Controller\Annotations\RouteResource;
 use FOS\RestBundle\Request\ParamFetcherInterface;
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
+use Nelmio\ApiDocBundle\Annotation\Security as ApiSecurity;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Swagger\Annotations as SWG;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -29,23 +33,28 @@ use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 /**
  * @RouteResource("Activity")
  *
- * @Security("is_granted('ROLE_USER')")
+ * @Security("is_granted('IS_AUTHENTICATED_REMEMBERED')")
  */
 class ActivityController extends BaseApiController
 {
     /**
      * @var ActivityRepository
      */
-    protected $repository;
+    private $repository;
     /**
      * @var ViewHandlerInterface
      */
-    protected $viewHandler;
+    private $viewHandler;
+    /**
+     * @var EventDispatcherInterface
+     */
+    private $dispatcher;
 
-    public function __construct(ViewHandlerInterface $viewHandler, ActivityRepository $repository)
+    public function __construct(ViewHandlerInterface $viewHandler, ActivityRepository $repository, EventDispatcherInterface $dispatcher)
     {
         $this->viewHandler = $viewHandler;
         $this->repository = $repository;
+        $this->dispatcher = $dispatcher;
     }
 
     /**
@@ -62,19 +71,17 @@ class ActivityController extends BaseApiController
      * @Rest\QueryParam(name="project", requirements="\d+", strict=true, nullable=true, description="Project ID to filter activities. If none is provided, all activities will be returned.")
      * @Rest\QueryParam(name="visible", requirements="1|2|3", strict=true, nullable=true, description="Visibility status to filter activities. Allowed values: 1=visible, 2=hidden, 3=all (default: 1)")
      * @Rest\QueryParam(name="globals", requirements="true", strict=true, nullable=true, description="Use if you want to fetch only global activities. Allowed values: true (default: false)")
-     * @Rest\QueryParam(name="globalsFirst", requirements="false", strict=true, nullable=true, description="Use if you don't want global activities to be listed first. Allowed values: false (default: true)")
+     * @Rest\QueryParam(name="globalsFirst", requirements="true|false", strict=true, nullable=true, description="Deprecated parameter, value is not used any more")
      * @Rest\QueryParam(name="orderBy", requirements="id|name|project", strict=true, nullable=true, description="The field by which results will be ordered. Allowed values: id, name, project (default: name)")
      * @Rest\QueryParam(name="order", requirements="ASC|DESC", strict=true, nullable=true, description="The result order. Allowed values: ASC, DESC (default: ASC)")
+     * @Rest\QueryParam(name="term", requirements="[a-zA-Z0-9 \-,:]+", strict=true, nullable=true, description="Free search term")
      *
-     * @return Response
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
      */
-    public function cgetAction(ParamFetcherInterface $paramFetcher)
+    public function cgetAction(ParamFetcherInterface $paramFetcher): Response
     {
         $query = new ActivityQuery();
-        $query->setOrderGlobalsFirst(true)
-            ->setResultType(ActivityQuery::RESULT_TYPE_OBJECTS)
-            ->setOrderBy('name')
-        ;
 
         if (null !== ($order = $paramFetcher->get('order'))) {
             $query->setOrder($order);
@@ -88,8 +95,8 @@ class ActivityController extends BaseApiController
             $query->setGlobalsOnly(true);
         }
 
-        if ('false' === $paramFetcher->get('globalsFirst')) {
-            $query->setOrderGlobalsFirst(false);
+        if (null !== $paramFetcher->get('globalsFirst')) {
+            @trigger_error('API parameter globalsFirst is deprecated and will be removed with 2.0', E_USER_DEPRECATED);
         }
 
         if (!empty($project = $paramFetcher->get('project'))) {
@@ -100,7 +107,11 @@ class ActivityController extends BaseApiController
             $query->setVisibility($visible);
         }
 
-        $data = $this->repository->findByQuery($query);
+        if (!empty($term = $paramFetcher->get('term'))) {
+            $query->setSearchTerm(new SearchTerm($term));
+        }
+
+        $data = $this->repository->getActivitiesForQuery($query);
         $view = new View($data, 200);
         $view->getContext()->setGroups(['Default', 'Collection', 'Activity']);
 
@@ -123,12 +134,11 @@ class ActivityController extends BaseApiController
      *      required=true,
      * )
      *
-     * @param int $id
-     * @return Response
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
      */
-    public function getAction($id)
+    public function getAction(int $id): Response
     {
-        /** @var Activity $data */
         $data = $this->repository->find($id);
 
         if (null === $data) {
@@ -159,13 +169,10 @@ class ActivityController extends BaseApiController
      *      @SWG\Schema(ref="#/definitions/ActivityEditForm")
      * )
      *
-     * @param Request $request
-     * @return Response
-     * @throws \App\Repository\RepositoryException
-     * @throws \Doctrine\ORM\ORMException
-     * @throws \Doctrine\ORM\OptimisticLockException
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
      */
-    public function postAction(Request $request)
+    public function postAction(Request $request): Response
     {
         if (!$this->isGranted('create_activity')) {
             throw new AccessDeniedHttpException('User cannot create activities');
@@ -173,14 +180,15 @@ class ActivityController extends BaseApiController
 
         $activity = new Activity();
 
+        $event = new ActivityMetaDefinitionEvent($activity);
+        $this->dispatcher->dispatch($event);
+
         $form = $this->createForm(ActivityApiEditForm::class, $activity);
 
         $form->submit($request->request->all());
 
         if ($form->isValid()) {
-            $entityManager = $this->getDoctrine()->getManager();
-            $entityManager->persist($activity);
-            $entityManager->flush();
+            $this->repository->saveActivity($activity);
 
             $view = new View($activity, 200);
             $view->getContext()->setGroups(['Default', 'Entity', 'Activity']);
@@ -219,11 +227,10 @@ class ActivityController extends BaseApiController
      *      required=true,
      * )
      *
-     * @param Request $request
-     * @param string $id
-     * @return Response
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
      */
-    public function patchAction(Request $request, string $id)
+    public function patchAction(Request $request, int $id): Response
     {
         $activity = $this->repository->find($id);
 
@@ -235,6 +242,9 @@ class ActivityController extends BaseApiController
             throw new AccessDeniedHttpException('User cannot update activity');
         }
 
+        $event = new ActivityMetaDefinitionEvent($activity);
+        $this->dispatcher->dispatch($event);
+
         $form = $this->createForm(ActivityApiEditForm::class, $activity);
 
         $form->setData($activity);
@@ -247,13 +257,64 @@ class ActivityController extends BaseApiController
             return $this->viewHandler->handle($view);
         }
 
-        $entityManager = $this->getDoctrine()->getManager();
-        $entityManager->persist($activity);
-        $entityManager->flush();
+        $this->repository->saveActivity($activity);
 
         $view = new View($activity, Response::HTTP_OK);
         $view->getContext()->setGroups(['Default', 'Entity', 'Activity']);
 
         return $this->viewHandler->handle($view);
     }
+
+    /**
+     * Sets the value of a meta-field for an existing activity.
+     *
+     * @SWG\Response(
+     *      response=200,
+     *      description="Sets the value of an existing/configured meta-field. You cannot create unknown meta-fields, if the given name is not a configured meta-field, this will return an exception.",
+     *      @SWG\Schema(ref="#/definitions/ActivityEntity")
+     * )
+     * @SWG\Parameter(
+     *      name="id",
+     *      in="path",
+     *      type="integer",
+     *      description="Activity record ID to set the meta-field value for",
+     *      required=true,
+     * )
+     * @Rest\RequestParam(name="name", strict=true, nullable=false, description="The meta-field name")
+     * @Rest\RequestParam(name="value", strict=true, nullable=false, description="The meta-field value")
+     *
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
+     */
+    public function metaAction(int $id, ParamFetcherInterface $paramFetcher): Response
+    {
+        $activity = $this->repository->find($id);
+
+        if (null === $activity) {
+            throw new NotFoundException();
+        }
+
+        if (!$this->isGranted('edit', $activity)) {
+            throw new AccessDeniedHttpException('You are not allowed to update this activity');
+        }
+
+        $event = new ActivityMetaDefinitionEvent($activity);
+        $this->dispatcher->dispatch($event);
+
+        $name = $paramFetcher->get('name');
+        $value = $paramFetcher->get('value');
+
+        if (null === ($meta = $activity->getMetaField($name))) {
+            throw new \InvalidArgumentException('Unknown meta-field requested');
+        }
+
+        $meta->setValue($value);
+
+        $this->repository->saveActivity($activity);
+
+        $view = new View($activity, 200);
+        $view->getContext()->setGroups(['Default', 'Entity', 'Project']);
+
+        return $this->viewHandler->handle($view);
+    }
 }

src/API/BaseApiController.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace App\API;
 
+use App\Entity\User;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 
@@ -18,4 +19,12 @@ abstract class BaseApiController extends AbstractController
 {
     public const DATE_FORMAT = DateTimeType::HTML5_FORMAT;
     public const DATE_FORMAT_PHP = 'Y-m-d\TH:m:s';
+
+    /**
+     * @return User|null
+     */
+    protected function getUser()
+    {
+        return parent::getUser();
+    }
 }

src/API/ConfigurationController.php

@@ -12,36 +12,46 @@ declare(strict_types=1);
 namespace App\API;
 
 use App\API\Model\I18n;
+use App\API\Model\TimesheetConfig;
 use App\Configuration\LanguageFormattings;
+use App\Configuration\TimesheetConfiguration;
 use App\Entity\User;
 use FOS\RestBundle\Controller\Annotations as Rest;
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
+use Nelmio\ApiDocBundle\Annotation\Security as ApiSecurity;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Swagger\Annotations as SWG;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
- * @Security("is_granted('ROLE_USER')")
+ * @Security("is_granted('IS_AUTHENTICATED_REMEMBERED')")
  */
-class ConfigurationController extends BaseApiController
+final class ConfigurationController extends BaseApiController
 {
     /**
      * @var ViewHandlerInterface
      */
-    protected $viewHandler;
+    private $viewHandler;
     /**
      * @var LanguageFormattings
      */
-    protected $formats;
+    private $formats;
+    /**
+     * @var TimesheetConfiguration
+     */
+    private $timesheetConfiguration;
 
     /**
      * @param ViewHandlerInterface $viewHandler
      * @param LanguageFormattings $formats
+     * @param TimesheetConfiguration $timesheetConfiguration
      */
-    public function __construct(ViewHandlerInterface $viewHandler, LanguageFormattings $formats)
+    public function __construct(ViewHandlerInterface $viewHandler, LanguageFormattings $formats, TimesheetConfiguration $timesheetConfiguration)
     {
         $this->viewHandler = $viewHandler;
         $this->formats = $formats;
+        $this->timesheetConfiguration = $timesheetConfiguration;
     }
 
     /**
@@ -54,8 +64,11 @@ class ConfigurationController extends BaseApiController
      * )
      *
      * @Rest\Get(path="/config/i18n")
+     *
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
      */
-    public function i18nAction()
+    public function i18nAction(): Response
     {
         /** @var User $user */
         $user = $this->getUser();
@@ -77,4 +90,35 @@ class ConfigurationController extends BaseApiController
 
         return $this->viewHandler->handle($view);
     }
+
+    /**
+     * Returns the instance specific timesheet configuration
+     *
+     * @SWG\Response(
+     *      response=200,
+     *      description="Returns the instance specific timesheet configuration",
+     *      @SWG\Schema(ref="#/definitions/TimesheetConfig")
+     * )
+     *
+     * @Rest\Get(path="/config/timesheet")
+     *
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
+     */
+    public function timesheetConfigAction(): Response
+    {
+        $model = new TimesheetConfig();
+        $model
+            ->setTrackingMode($this->timesheetConfiguration->getTrackingMode())
+            ->setDefaultBeginTime($this->timesheetConfiguration->getDefaultBeginTime())
+            ->setActiveEntriesHardLimit($this->timesheetConfiguration->getActiveEntriesHardLimit())
+            ->setActiveEntriesSoftLimit($this->timesheetConfiguration->getActiveEntriesSoftLimit())
+            ->setIsAllowFutureTimes($this->timesheetConfiguration->isAllowFutureTimes())
+        ;
+
+        $view = new View($model, 200);
+        $view->getContext()->setGroups(['Default', 'Config']);
+
+        return $this->viewHandler->handle($view);
+    }
 }

src/API/CustomerController.php

@@ -12,16 +12,20 @@ declare(strict_types=1);
 namespace App\API;
 
 use App\Entity\Customer;
+use App\Event\CustomerMetaDefinitionEvent;
 use App\Form\API\CustomerApiEditForm;
 use App\Repository\CustomerRepository;
 use App\Repository\Query\CustomerQuery;
+use App\Utils\SearchTerm;
 use FOS\RestBundle\Controller\Annotations as Rest;
 use FOS\RestBundle\Controller\Annotations\RouteResource;
 use FOS\RestBundle\Request\ParamFetcherInterface;
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
+use Nelmio\ApiDocBundle\Annotation\Security as ApiSecurity;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Swagger\Annotations as SWG;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -29,23 +33,28 @@ use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 /**
  * @RouteResource("Customer")
  *
- * @Security("is_granted('ROLE_USER')")
+ * @Security("is_granted('IS_AUTHENTICATED_REMEMBERED')")
  */
 class CustomerController extends BaseApiController
 {
     /**
      * @var CustomerRepository
      */
-    protected $repository;
+    private $repository;
     /**
      * @var ViewHandlerInterface
      */
-    protected $viewHandler;
+    private $viewHandler;
+    /**
+     * @var EventDispatcherInterface
+     */
+    private $dispatcher;
 
-    public function __construct(ViewHandlerInterface $viewHandler, CustomerRepository $repository)
+    public function __construct(ViewHandlerInterface $viewHandler, CustomerRepository $repository, EventDispatcherInterface $dispatcher)
     {
         $this->viewHandler = $viewHandler;
         $this->repository = $repository;
+        $this->dispatcher = $dispatcher;
     }
 
     /**
@@ -62,16 +71,15 @@ class CustomerController extends BaseApiController
      * @Rest\QueryParam(name="visible", requirements="\d+", strict=true, nullable=true, description="Visibility status to filter activities (1=visible, 2=hidden, 3=both)")
      * @Rest\QueryParam(name="order", requirements="ASC|DESC", strict=true, nullable=true, description="The result order. Allowed values: ASC, DESC (default: ASC)")
      * @Rest\QueryParam(name="orderBy", requirements="id|name", strict=true, nullable=true, description="The field by which results will be ordered. Allowed values: id, name (default: name)")
+     * @Rest\QueryParam(name="term", requirements="[a-zA-Z0-9 \-,:]+", strict=true, nullable=true, description="Free search term")
      *
-     * @return Response
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
      */
-    public function cgetAction(ParamFetcherInterface $paramFetcher)
+    public function cgetAction(ParamFetcherInterface $paramFetcher): Response
     {
         $query = new CustomerQuery();
-        $query
-            ->setResultType(CustomerQuery::RESULT_TYPE_OBJECTS)
-            ->setOrderBy('name')
-        ;
+        $query->setCurrentUser($this->getUser());
 
         if (null !== ($order = $paramFetcher->get('order'))) {
             $query->setOrder($order);
@@ -85,7 +93,11 @@ class CustomerController extends BaseApiController
             $query->setVisibility($visible);
         }
 
-        $data = $this->repository->findByQuery($query);
+        if (!empty($term = $paramFetcher->get('term'))) {
+            $query->setSearchTerm(new SearchTerm($term));
+        }
+
+        $data = $this->repository->getCustomersForQuery($query);
         $view = new View($data, 200);
         $view->getContext()->setGroups(['Default', 'Collection', 'Customer']);
 
@@ -101,12 +113,11 @@ class CustomerController extends BaseApiController
      *      @SWG\Schema(ref="#/definitions/CustomerEntity"),
      * )
      *
-     * @param int $id
-     * @return Response
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
      */
-    public function getAction($id)
+    public function getAction(int $id): Response
     {
-        /** @var Customer $data */
         $data = $this->repository->find($id);
 
         if (null === $data) {
@@ -137,13 +148,10 @@ class CustomerController extends BaseApiController
      *      @SWG\Schema(ref="#/definitions/CustomerEditForm")
      * )
      *
-     * @param Request $request
-     * @return Response
-     * @throws \App\Repository\RepositoryException
-     * @throws \Doctrine\ORM\ORMException
-     * @throws \Doctrine\ORM\OptimisticLockException
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
      */
-    public function postAction(Request $request)
+    public function postAction(Request $request): Response
     {
         if (!$this->isGranted('create_customer')) {
             throw new AccessDeniedHttpException('User cannot create customers');
@@ -151,14 +159,15 @@ class CustomerController extends BaseApiController
 
         $customer = new Customer();
 
+        $event = new CustomerMetaDefinitionEvent($customer);
+        $this->dispatcher->dispatch($event);
+
         $form = $this->createForm(CustomerApiEditForm::class, $customer);
 
         $form->submit($request->request->all());
 
         if ($form->isValid()) {
-            $entityManager = $this->getDoctrine()->getManager();
-            $entityManager->persist($customer);
-            $entityManager->flush();
+            $this->repository->saveCustomer($customer);
 
             $view = new View($customer, 200);
             $view->getContext()->setGroups(['Default', 'Entity', 'Customer']);
@@ -197,11 +206,10 @@ class CustomerController extends BaseApiController
      *      required=true,
      * )
      *
-     * @param Request $request
-     * @param string $id
-     * @return Response
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
      */
-    public function patchAction(Request $request, string $id)
+    public function patchAction(Request $request, int $id): Response
     {
         $customer = $this->repository->find($id);
 
@@ -213,6 +221,9 @@ class CustomerController extends BaseApiController
             throw new AccessDeniedHttpException('User cannot update customer');
         }
 
+        $event = new CustomerMetaDefinitionEvent($customer);
+        $this->dispatcher->dispatch($event);
+
         $form = $this->createForm(CustomerApiEditForm::class, $customer);
 
         $form->setData($customer);
@@ -225,13 +236,64 @@ class CustomerController extends BaseApiController
             return $this->viewHandler->handle($view);
         }
 
-        $entityManager = $this->getDoctrine()->getManager();
-        $entityManager->persist($customer);
-        $entityManager->flush();
+        $this->repository->saveCustomer($customer);
 
         $view = new View($customer, Response::HTTP_OK);
         $view->getContext()->setGroups(['Default', 'Entity', 'Customer']);
 
         return $this->viewHandler->handle($view);
     }
+
+    /**
+     * Sets the value of a meta-field for an existing customer.
+     *
+     * @SWG\Response(
+     *      response=200,
+     *      description="Sets the value of an existing/configured meta-field. You cannot create unknown meta-fields, if the given name is not a configured meta-field, this will return an exception.",
+     *      @SWG\Schema(ref="#/definitions/CustomerEntity")
+     * )
+     * @SWG\Parameter(
+     *      name="id",
+     *      in="path",
+     *      type="integer",
+     *      description="Customer record ID to set the meta-field value for",
+     *      required=true,
+     * )
+     * @Rest\RequestParam(name="name", strict=true, nullable=false, description="The meta-field name")
+     * @Rest\RequestParam(name="value", strict=true, nullable=false, description="The meta-field value")
+     *
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
+     */
+    public function metaAction(int $id, ParamFetcherInterface $paramFetcher): Response
+    {
+        $customer = $this->repository->find($id);
+
+        if (null === $customer) {
+            throw new NotFoundException();
+        }
+
+        if (!$this->isGranted('edit', $customer)) {
+            throw new AccessDeniedHttpException('You are not allowed to update this customer');
+        }
+
+        $event = new CustomerMetaDefinitionEvent($customer);
+        $this->dispatcher->dispatch($event);
+
+        $name = $paramFetcher->get('name');
+        $value = $paramFetcher->get('value');
+
+        if (null === ($meta = $customer->getMetaField($name))) {
+            throw new \InvalidArgumentException('Unknown meta-field requested');
+        }
+
+        $meta->setValue($value);
+
+        $this->repository->saveCustomer($customer);
+
+        $view = new View($customer, 200);
+        $view->getContext()->setGroups(['Default', 'Entity', 'Customer']);
+
+        return $this->viewHandler->handle($view);
+    }
 }

src/API/Model/I18n.php

@@ -11,49 +11,49 @@ declare(strict_types=1);
 
 namespace App\API\Model;
 
-class I18n
+final class I18n
 {
     /**
      * Format used for 'begin' and 'end'
      *
      * @var string
      */
-    protected $formDateTime = '';
+    private $formDateTime = '';
     /**
      * Format used for toolbar queries
      *
      * @var string
      */
-    protected $formDate = '';
+    private $formDate = '';
     /**
      * Format used to display date-time values (see PHP function date_format)
      *
      * @var string
      */
-    protected $dateTime = '';
+    private $dateTime = '';
     /**
      * Format used to display date values (see PHP function date_format)
      *
      * @var string
      */
-    protected $date = '';
+    private $date = '';
     /**
      * Format used to display times (see PHP function date_format)
      *
      * @var string
      */
-    protected $time = '';
+    private $time = '';
     /**
      * Format used to display durations (replace: %h with hours, %m with minutes, %s with seconds)
      *
      * @var string
      */
-    protected $duration = '';
+    private $duration = '';
     /**
      * Whether a twenty-four hour format is used (true) or 12-hours AM/PM format (false)
      * @var bool
      */
-    protected $is24hours = true;
+    private $is24hours = true;
 
     /**
      * @return string

src/API/Model/TimesheetConfig.php

@@ -0,0 +1,101 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\API\Model;
+
+final class TimesheetConfig
+{
+    /**
+     * See here: https://www.kimai.org/documentation/timesheet.html#tracking-modes
+     *
+     * @var string
+     */
+    private $trackingMode = 'default';
+    /**
+     * @var string
+     */
+    private $defaultBeginTime = 'now';
+    /**
+     * @var int
+     */
+    private $activeEntriesHardLimit = 1;
+    /**
+     * @var int
+     */
+    private $activeEntriesSoftLimit = 1;
+    /**
+     * @var bool
+     */
+    private $isAllowFutureTimes = true;
+
+    /**
+     * @return string
+     */
+    public function getTrackingMode(): string
+    {
+        return $this->trackingMode;
+    }
+
+    public function setTrackingMode(string $trackingMode): TimesheetConfig
+    {
+        $this->trackingMode = $trackingMode;
+
+        return $this;
+    }
+
+    public function getDefaultBeginTime(): string
+    {
+        return $this->defaultBeginTime;
+    }
+
+    public function setDefaultBeginTime(string $defaultBeginTime): TimesheetConfig
+    {
+        $this->defaultBeginTime = $defaultBeginTime;
+
+        return $this;
+    }
+
+    public function getActiveEntriesHardLimit(): int
+    {
+        return $this->activeEntriesHardLimit;
+    }
+
+    public function setActiveEntriesHardLimit(int $activeEntriesHardLimit): TimesheetConfig
+    {
+        $this->activeEntriesHardLimit = $activeEntriesHardLimit;
+
+        return $this;
+    }
+
+    public function getActiveEntriesSoftLimit(): int
+    {
+        return $this->activeEntriesSoftLimit;
+    }
+
+    public function setActiveEntriesSoftLimit(int $activeEntriesSoftLimit): TimesheetConfig
+    {
+        $this->activeEntriesSoftLimit = $activeEntriesSoftLimit;
+
+        return $this;
+    }
+
+    public function isAllowFutureTimes(): bool
+    {
+        return $this->isAllowFutureTimes;
+    }
+
+    public function setIsAllowFutureTimes(bool $isAllowFutureTimes): TimesheetConfig
+    {
+        $this->isAllowFutureTimes = $isAllowFutureTimes;
+
+        return $this;
+    }
+}

src/API/ProjectController.php

@@ -12,44 +12,60 @@ declare(strict_types=1);
 namespace App\API;
 
 use App\Entity\Project;
+use App\Event\ProjectMetaDefinitionEvent;
 use App\Form\API\ProjectApiEditForm;
 use App\Repository\ProjectRepository;
 use App\Repository\Query\ProjectQuery;
+use App\Timesheet\UserDateTimeFactory;
+use App\Utils\SearchTerm;
 use FOS\RestBundle\Controller\Annotations as Rest;
 use FOS\RestBundle\Controller\Annotations\RouteResource;
 use FOS\RestBundle\Request\ParamFetcherInterface;
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
+use Nelmio\ApiDocBundle\Annotation\Security as ApiSecurity;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Swagger\Annotations as SWG;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Validator\Constraints;
 
 /**
  * @RouteResource("Project")
  *
- * @Security("is_granted('ROLE_USER')")
+ * @Security("is_granted('IS_AUTHENTICATED_REMEMBERED')")
  */
 class ProjectController extends BaseApiController
 {
     /**
      * @var ProjectRepository
      */
-    protected $repository;
+    private $repository;
     /**
      * @var ViewHandlerInterface
      */
-    protected $viewHandler;
+    private $viewHandler;
+    /**
+     * @var EventDispatcherInterface
+     */
+    private $dispatcher;
+    /**
+     * @var UserDateTimeFactory
+     */
+    private $dateTime;
 
-    public function __construct(ViewHandlerInterface $viewHandler, ProjectRepository $repository)
+    public function __construct(ViewHandlerInterface $viewHandler, ProjectRepository $repository, EventDispatcherInterface $dispatcher, UserDateTimeFactory $dateTime)
     {
         $this->viewHandler = $viewHandler;
         $this->repository = $repository;
+        $this->dispatcher = $dispatcher;
+        $this->dateTime = $dateTime;
     }
 
     /**
-     * Returns a collection of projects
+     * Returns a collection of projects.
      *
      * @SWG\Response(
      *      response=200,
@@ -60,20 +76,21 @@ class ProjectController extends BaseApiController
      *      )
      * )
      * @Rest\QueryParam(name="customer", requirements="\d+", strict=true, nullable=true, description="Customer ID to filter projects")
-     * @Rest\QueryParam(name="visible", requirements="\d+", strict=true, nullable=true, description="Visibility status to filter projects (1=visible, 2=hidden, 3=both)")
+     * @Rest\QueryParam(name="visible", requirements="\d+", strict=true, nullable=true, description="Visibility status to filter projects. Allowed values: 1=visible, 2=hidden, 3=both (default; 1)")
+     * @Rest\QueryParam(name="start", requirements=@Constraints\DateTime(format="Y-m-d\TH:i:s"), strict=true, nullable=true, description="Only projects that started before this date will be included. Allowed format: HTML5 (default: now, if end is also empty)")
+     * @Rest\QueryParam(name="end", requirements=@Constraints\DateTime(format="Y-m-d\TH:i:s"), strict=true, nullable=true, description="Only projects that ended after this date will be included. Allowed format: HTML5 (default: now, if start is also empty)")
+     * @Rest\QueryParam(name="ignoreDates", requirements="1", strict=true, nullable=true, description="If set, start and end are completely ignored. Allowed values: 1 (default: off)")
      * @Rest\QueryParam(name="order", requirements="ASC|DESC", strict=true, nullable=true, description="The result order. Allowed values: ASC, DESC (default: ASC)")
      * @Rest\QueryParam(name="orderBy", requirements="id|name|customer", strict=true, nullable=true, description="The field by which results will be ordered. Allowed values: id, name, customer (default: name)")
+     * @Rest\QueryParam(name="term", requirements="[a-zA-Z0-9 \-,:]+", strict=true, nullable=true, description="Free search term")
      *
-     * @param ParamFetcherInterface $paramFetcher
-     * @return Response
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
      */
-    public function cgetAction(ParamFetcherInterface $paramFetcher)
+    public function cgetAction(ParamFetcherInterface $paramFetcher): Response
     {
         $query = new ProjectQuery();
-        $query
-            ->setResultType(ProjectQuery::RESULT_TYPE_OBJECTS)
-            ->setOrderBy('name')
-        ;
+        $query->setCurrentUser($this->getUser());
 
         if (null !== ($order = $paramFetcher->get('order'))) {
             $query->setOrder($order);
@@ -91,7 +108,32 @@ class ProjectController extends BaseApiController
             $query->setVisibility($visible);
         }
 
-        $data = $this->repository->findByQuery($query);
+        $ignoreDates = false;
+        if (null !== $paramFetcher->get('ignoreDates')) {
+            $ignoreDates = intval($paramFetcher->get('ignoreDates')) === 1;
+        }
+
+        if (!$ignoreDates) {
+            if (null !== ($begin = $paramFetcher->get('start')) && !empty($begin)) {
+                $query->setProjectStart($this->dateTime->createDateTime($begin));
+            }
+
+            if (null !== ($end = $paramFetcher->get('end')) && !empty($end)) {
+                $query->setProjectEnd($this->dateTime->createDateTime($end));
+            }
+
+            if (empty($begin) && empty($end)) {
+                $now = $this->dateTime->createDateTime();
+                $query->setProjectStart($now);
+                $query->setProjectEnd($now);
+            }
+        }
+
+        if (!empty($term = $paramFetcher->get('term'))) {
+            $query->setSearchTerm(new SearchTerm($term));
+        }
+
+        $data = $this->repository->getProjectsForQuery($query);
         $view = new View($data, 200);
         $view->getContext()->setGroups(['Default', 'Collection', 'Project']);
 
@@ -107,12 +149,11 @@ class ProjectController extends BaseApiController
      *      @SWG\Schema(ref="#/definitions/ProjectEntity"),
      * )
      *
-     * @param int $id
-     * @return Response
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
      */
-    public function getAction($id)
+    public function getAction(int $id): Response
     {
-        /** @var Project $data */
         $data = $this->repository->find($id);
 
         if (null === $data) {
@@ -143,13 +184,10 @@ class ProjectController extends BaseApiController
      *      @SWG\Schema(ref="#/definitions/ProjectEditForm")
      * )
      *
-     * @param Request $request
-     * @return Response
-     * @throws \App\Repository\RepositoryException
-     * @throws \Doctrine\ORM\ORMException
-     * @throws \Doctrine\ORM\OptimisticLockException
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
      */
-    public function postAction(Request $request)
+    public function postAction(Request $request): Response
     {
         if (!$this->isGranted('create_project')) {
             throw new AccessDeniedHttpException('User cannot create projects');
@@ -157,14 +195,15 @@ class ProjectController extends BaseApiController
 
         $project = new Project();
 
+        $event = new ProjectMetaDefinitionEvent($project);
+        $this->dispatcher->dispatch($event);
+
         $form = $this->createForm(ProjectApiEditForm::class, $project);
 
         $form->submit($request->request->all());
 
         if ($form->isValid()) {
-            $entityManager = $this->getDoctrine()->getManager();
-            $entityManager->persist($project);
-            $entityManager->flush();
+            $this->repository->saveProject($project);
 
             $view = new View($project, 200);
             $view->getContext()->setGroups(['Default', 'Entity', 'Project']);
@@ -203,11 +242,10 @@ class ProjectController extends BaseApiController
      *      required=true,
      * )
      *
-     * @param Request $request
-     * @param string $id
-     * @return Response
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
      */
-    public function patchAction(Request $request, string $id)
+    public function patchAction(Request $request, int $id): Response
     {
         $project = $this->repository->find($id);
 
@@ -219,6 +257,9 @@ class ProjectController extends BaseApiController
             throw new AccessDeniedHttpException('User cannot update project');
         }
 
+        $event = new ProjectMetaDefinitionEvent($project);
+        $this->dispatcher->dispatch($event);
+
         $form = $this->createForm(ProjectApiEditForm::class, $project);
 
         $form->setData($project);
@@ -231,13 +272,64 @@ class ProjectController extends BaseApiController
             return $this->viewHandler->handle($view);
         }
 
-        $entityManager = $this->getDoctrine()->getManager();
-        $entityManager->persist($project);
-        $entityManager->flush();
+        $this->repository->saveProject($project);
 
         $view = new View($project, Response::HTTP_OK);
         $view->getContext()->setGroups(['Default', 'Entity', 'Project']);
 
         return $this->viewHandler->handle($view);
     }
+
+    /**
+     * Sets the value of a meta-field for an existing project.
+     *
+     * @SWG\Response(
+     *      response=200,
+     *      description="Sets the value of an existing/configured meta-field. You cannot create unknown meta-fields, if the given name is not a configured meta-field, this will return an exception.",
+     *      @SWG\Schema(ref="#/definitions/ProjectEntity")
+     * )
+     * @SWG\Parameter(
+     *      name="id",
+     *      in="path",
+     *      type="integer",
+     *      description="Project record ID to set the meta-field value for",
+     *      required=true,
+     * )
+     * @Rest\RequestParam(name="name", strict=true, nullable=false, description="The meta-field name")
+     * @Rest\RequestParam(name="value", strict=true, nullable=false, description="The meta-field value")
+     *
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
+     */
+    public function metaAction(int $id, ParamFetcherInterface $paramFetcher): Response
+    {
+        $project = $this->repository->find($id);
+
+        if (null === $project) {
+            throw new NotFoundException();
+        }
+
+        if (!$this->isGranted('edit', $project)) {
+            throw new AccessDeniedHttpException('You are not allowed to update this project');
+        }
+
+        $event = new ProjectMetaDefinitionEvent($project);
+        $this->dispatcher->dispatch($event);
+
+        $name = $paramFetcher->get('name');
+        $value = $paramFetcher->get('value');
+
+        if (null === ($meta = $project->getMetaField($name))) {
+            throw new \InvalidArgumentException('Unknown meta-field requested');
+        }
+
+        $meta->setValue($value);
+
+        $this->repository->saveProject($project);
+
+        $view = new View($project, 200);
+        $view->getContext()->setGroups(['Default', 'Entity', 'Project']);
+
+        return $this->viewHandler->handle($view);
+    }
 }

src/API/StatusController.php

@@ -16,7 +16,9 @@ use FOS\RestBundle\Controller\Annotations as Rest;
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
 use Nelmio\ApiDocBundle\Annotation\Model;
+use Nelmio\ApiDocBundle\Annotation\Security as ApiSecurity;
 use Swagger\Annotations as SWG;
+use Symfony\Component\HttpFoundation\Response;
 
 class StatusController extends BaseApiController
 {
@@ -43,8 +45,11 @@ class StatusController extends BaseApiController
      * )
      *
      * @Rest\Get(path="/ping")
+     *
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
      */
-    public function pingAction()
+    public function pingAction(): Response
     {
         $view = new View(['message' => 'pong'], 200);
 
@@ -61,8 +66,11 @@ class StatusController extends BaseApiController
      * )
      *
      * @Rest\Get(path="/version")
+     *
+     * @ApiSecurity(name="apiUser")
+     * @ApiSecurity(name="apiToken")
      */
-    public function versionAction()
+    public function versionAction(): Response
     {
         return $this->viewHandler->handle(new View(new Version(), 200));
     }