prepare release 1.5 (#1214)

* fix missing translation for preset datatable headers
* better dependency check for avatar service
* show only own teams to teamleads

.codecov.yml

@@ -0,0 +1,33 @@
+codecov:
+  notify:
+    require_ci_to_pass: yes
+
+coverage:
+  precision: 2
+  round: down
+  range: "80...100"
+
+  status:
+    project:
+      default:
+        threshold: 0.5%
+    patch:
+      default:
+        threshold: 50%
+    changes: no
+
+parsers:
+  gcov:
+    branch_detection:
+      conditional: yes
+      loop: yes
+      method: no
+      macro: no
+
+comment:
+  layout: "diff, flags, files"
+  behavior: default
+  require_changes: yes
+  require_base: no
+  require_head: yes
+  branches: null

.editorconfig

@@ -7,4 +7,12 @@ end_of_line = LF
 
 [*.php]
 indent_style = space
-indent_size = 4
+indent_size = 4
+
+[*.yaml]
+indent_style = space
+indent_size = 4
+
+[*.yml]
+indent_style = space
+indent_size = 4

.env.dist

@@ -2,8 +2,6 @@
 # Copy this file to .env file for development, create environment variables when deploying to production
 # https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
 
-# KIMAI DEFAULT ENV VARS
-DATABASE_PREFIX=kimai2_
 MAILER_FROM=kimai@example.com
 
 ###> symfony/framework-bundle ###
@@ -27,3 +25,7 @@ DATABASE_URL=sqlite:///%kernel.project_dir%/var/data/kimai.sqlite
 # Delivery is disabled by default via "null://localhost"
 MAILER_URL=null://localhost
 ###< symfony/swiftmailer-bundle ###
+
+###> nelmio/cors-bundle ###
+CORS_ALLOW_ORIGIN=^https?://localhost(:[0-9]+)?$
+###< nelmio/cors-bundle ###

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+#github: [kevinpapst]
+custom: https://www.kimai.org/donate/

.github/ISSUE_TEMPLATE.md

@@ -1,22 +0,0 @@
-## Description
-
-
-## Expected Behavior
-
-
-## Actual Behavior
-
-
-## Possible Fix
-
-
-## Steps to Reproduce
-1.
-2.
-3.
-4.
-
-## Your Environment
-* Version:
-* Browser Name and version:
-* Operating System and version (desktop or mobile):

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Create a report to help us improve Kimai
 
 ---
 
@@ -11,25 +11,24 @@ A clear and concise description of what the bug is.
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
-3. Scroll down to '....'
-4. See error
+3. See error
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+**Logfile**
+```
+Add the last lines from your logfile at var/log/prod.log, around the time when the problem happened.
+```
 
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
+**Desktop/Smartphone**
+Please complete the following information if this seems to be a frontend issue:
+ - Device: [e.g. iPhone6s]
  - OS: [e.g. iOS]
  - Browser [e.g. chrome, safari]
  - Version [e.g. 22]
 
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
 **Additional context**
 Add any other context about the problem here.
+ - Kimai version
+ - PHP version

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest an idea for this project
+about: Suggest an idea to make Kimai better
 
 ---
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,5 @@
 ## Description
-
+A clear and concise description of what this pull request adds or changes.
 
 ## Types of changes
 - [ ] Bug fix (non-breaking change which fixes an issue)
@@ -7,8 +7,6 @@
 - [ ] Breaking change (fix or feature that would cause existing functionality to change)
 
 ## Checklist
-- [ ] My code follows the code style
-- [ ] All files have a license header 
-- [ ] All methods have a doc header with type declarations
-- [ ] I have updated the documentation accordingly
-- [ ] I have added tests to cover my changes
+- [ ] I verified that my code applies to the guidelines (`composer kimai:code-check`)
+- [ ] I updated the documentation (see [here](https://github.com/kimai/www.kimai.org/tree/master/_documentation))
+- [ ] I agree that this code is used in Kimai and will be published under the [MIT license](https://github.com/kevinpapst/kimai2/blob/master/LICENSE)

.github/lock.yml

@@ -14,6 +14,8 @@ lockComment: >
   This thread has been automatically locked since there has not been
   any recent activity after it was closed. Please open a new issue for
   related bugs.
+  If you use Kimai on a daily basis, please [consider donating](https://www.kimai.org/donate/) to
+  support further development of Kimai.
 
 # Assign `resolved` as the reason for locking. Set to `false` to disable
 setLockReason: false

.github_changelog_generator

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

.gitignore

@@ -1,4 +1,3 @@
-
 # ========== KIMAI ==========
 # IDE
 .idea/
@@ -6,12 +5,24 @@
 /bin/*
 !bin/console
 /config/packages/local.yaml
+/config/packages/*/local.yaml
 
-/var/data/kimai.sqlite
+public/avatars/*.png
+
+templates/invoice/renderer/.~lock*
+
+/var/data/*
+!/var/data/.gitkeep
+!/var/data/kimai_test.sqlite
 /var/coverage/
 /var/cache/*
 !var/cache/.gitkeep
 
+/var/invoices/*
+
+/var/plugins/*
+!var/plugins/.gitkeep
+
 /var/log/*
 !var/log/.gitkeep
 
@@ -39,11 +50,13 @@
 .php_cs.cache
 ###< friendsofphp/php-cs-fixer ###
 
-###> symfony/webpack-encore-pack ###
-/node_modules/
-###< symfony/webpack-encore-pack ###
-
 ###> symfony/phpunit-bridge ###
 .phpunit
 /phpunit.xml
 ###< symfony/phpunit-bridge ###
+
+###> symfony/webpack-encore-bundle ###
+/node_modules/
+npm-debug.log
+yarn-error.log
+###< symfony/webpack-encore-bundle ###

.scrutinizer.yml

@@ -1,35 +0,0 @@
-build:
-    environment:
-        node: v8.11.2
-    nodes:
-        analysis:
-            tests:
-                override:
-                    - js-scrutinizer-run
-                    - php-scrutinizer-run
-        tests:
-            tests:
-                override:
-                    -
-                        command: 'vendor/bin/phpunit --coverage-clover=clover.xml tests/'
-                        coverage:
-                            file: 'clover.xml'
-                            format: 'clover'
-                    -
-                        command: 'bin/console kimai:phpcs --checkstyle=checkstyle'
-                        analysis:
-                            file: 'checkstyle'
-                            format: 'php-cs-checkstyle'
-
-filter:
-    excluded_paths:
-        - '.github/'
-        - 'bin/'
-        - 'config/'
-        - 'public/'
-        - 'templates/'
-        - 'translations/'
-        - 'var/'
-    dependency_paths:
-        - 'node_modules/'
-        - 'vendor/'

.travis.yml

@@ -1,34 +1,78 @@
+dist: xenial
 language: php
-sudo: false
 
 cache:
   directories:
     - $HOME/.composer/cache/files
 
-addons:
-  mariadb: '10.2'
-
-services:
-  - mysql
-
 matrix:
-  fast_finish: true
   include:
-    - php: 7.1
-    - php: 7.2
+    - stage: Code quality
+      env: CODECOVERAGE=0 DB=sqlite
+      php: '7.2'
+      script:
+          - composer validate --no-check-all --strict
+          - composer kimai:codestyle
+          - composer kimai:phpstan
+    - 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.2'
+      env: CODECOVERAGE=0 DB=sqlite
+    - stage: Test
+      #php: '7.4snapshot'
+      php: '7.3'
+      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: 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:
-  - if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi
+  - if [[ $CODECOVERAGE == 0 ]]; then phpenv config-rm xdebug.ini; fi;
   - composer self-update
+  - php -i
+  - php -m
 
 install:
   - composer install
+  - composer require zendframework/zend-ldap
 
 script:
-  - vendor/bin/phpunit tests/
-  - cp tests/.env.dist.sqlite .env
-  - bin/console doctrine:database:create -n
-  - bin/console doctrine:migrations:migrate -n
-  - cp tests/.env.dist.mysql .env
+  - if [[ $CODECOVERAGE == 1 ]]; then 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
+

CHANGELOG.md

@@ -1,274 +1,92 @@
 # Change Log
 
+## [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)
+
+## [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)
+
+## [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)
+
+## [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)
+
+## [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)
+
+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)
+
+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)
+
+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)
+
+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)
+
+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)
+
+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)
+
+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)
+
+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)
 
-**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:**
-
-- Improve dashboard display [\#280](https://github.com/kevinpapst/kimai2/issues/280)
-- CSV export [\#263](https://github.com/kevinpapst/kimai2/issues/263)
-- 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)
-- Delete user [\#225](https://github.com/kevinpapst/kimai2/issues/225)
-- 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)
 
-**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)
-- 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)
-- 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)
-- 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)
-
-**Merged pull requests:**
-
-- prepare release 0.3 [\#231](https://github.com/kevinpapst/kimai2/pull/231) ([kevinpapst](https://github.com/kevinpapst))
-- 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))
-- added dynamic column filter \#174 [\#184](https://github.com/kevinpapst/kimai2/pull/184) ([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)
 
-**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 english translation [\#8](https://github.com/kevinpapst/kimai2/issues/8)
-- Add configurable system configuration [\#6](https://github.com/kevinpapst/kimai2/issues/6)
-- Add CHANGELOG.md [\#177](https://github.com/kevinpapst/kimai2/issues/177)
-- Hide notifications after some seconds [\#169](https://github.com/kevinpapst/kimai2/issues/169)
-- Add preview blog message and info text on old website [\#162](https://github.com/kevinpapst/kimai2/issues/162)
-- 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)
-- 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)
-- Add help text to form elements [\#138](https://github.com/kevinpapst/kimai2/issues/138)
-- Duration mode: creating new timesheet records prefills duration with some seconds [\#137](https://github.com/kevinpapst/kimai2/issues/137)
-- Add duration-only mode [\#131](https://github.com/kevinpapst/kimai2/issues/131)
-- Add help controller [\#129](https://github.com/kevinpapst/kimai2/issues/129)
-- \[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)
-- Secure create-user command [\#123](https://github.com/kevinpapst/kimai2/issues/123)
-- Setup travis to run phpunit tests [\#120](https://github.com/kevinpapst/kimai2/issues/120)
-- 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)
-- Add russian translation [\#95](https://github.com/kevinpapst/kimai2/issues/95)
-- 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)
-
-**Merged pull requests:**
-
-- \[WIP\] Translations [\#173](https://github.com/kevinpapst/kimai2/pull/173) ([simonschaufi](https://github.com/simonschaufi))
-- prepare v0.2 release \#177 [\#178](https://github.com/kevinpapst/kimai2/pull/178) ([kevinpapst](https://github.com/kevinpapst))
-- 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))
-- 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))
-- 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)
-**Closed issues:**
 
-- 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)

CONTRIBUTING.md

@@ -1,17 +1,18 @@
 # Contributing
 
 Kimai is an open source project, contributions made by the community are welcome. 
-Send us your ideas, code reviews, pull requests and feature requests to help us improve this project.
+Send your ideas, code reviews, pull requests and feature requests to help improving this project.
 
 ## Pull request rules
 
-- We use PSR-2 with some additional code-style checks (see our [php-cs-fixer config](.php_cs.dist)). You can run `bin/console kimai:phpcs` to check and `bin/console kimai:phpcs --fix` to fix violations.
-- Add PHPUnit tests for your changes, verify everything still works and execute our test-suites `bin/console kimai:test-unit` and `bin/console kimai:test-integration`.
-- If you contribute new files, please add them with the file-header template from below (our chode-style fixer can do that for you).
-- With sending in a PR, you accept that your contributions/code will be published under MIT license (see the [LICENSE](LICENSE) file as well).
-- If one of the PR checks fails, please fix them before asking us for a review.
+- Use the [pre-configured codesniffer](.php_cs.dist)) to check for `composer kimai:codestyle` and fix `composer kimai:codestyle-fix` violations
+- Add PHPUnit tests for your changes!
+- Verify everything still works with `composer kimai:tests-unit` and `composer kimai:tests-integration`
+- If you contribute new files, add them with the file-header template from below (the code-style fixer can do that for you)
+- When sending in a PR, you must accept that your contributions/code will be published under MIT license (see the [LICENSE](LICENSE) file as well), otherwise your PR will be closed
+- If one of the PR checks/builds fails, fix it before asking for a review
 
-Further documentation can be found in the [developer documentation](var/docs/developers.md).
+Further documentation can be found in the [developer documentation](https://www.kimai.org/documentation/developers.html).
 
 ### File-header template 
 ```

Dockerfile

@@ -0,0 +1,55 @@
+# 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.
+FROM php:7.2.9-apache-stretch AS tmp_kimai2_base
+
+RUN apt update && \
+    apt install -y --allow-unauthenticated \
+        git \
+        haveged \
+        libicu-dev \
+        libjpeg-dev \
+        libldap2-dev \
+        libldb-dev \
+        libpng-dev \
+        mysql-client \
+        unzip \
+        wget \
+        zip \
+        && \
+    EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)" && \
+    php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
+    ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" && \
+    if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then >&2 echo 'ERROR: Invalid installer signature'; rm composer-setup.php; exit 1; fi && \
+    php composer-setup.php --quiet && \
+    rm composer-setup.php && \
+    mv /var/www/html/composer.phar /usr/bin/composer && \
+    docker-php-ext-install \
+        gd \
+        intl \
+        ldap \
+        pdo_mysql \
+        zip && \
+    apt remove -y wget && \
+    apt -y autoremove && \
+    apt clean && \
+    cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
+
+FROM tmp_kimai2_base
+
+RUN git clone https://github.com/kevinpapst/kimai2.git /opt/kimai && \
+    sed "s/prod/dev/g" /opt/kimai/.env.dist > /opt/kimai/.env && \
+    composer install --working-dir=/opt/kimai --dev --optimize-autoloader && \
+    /opt/kimai/bin/console doctrine:database:create && \
+    /opt/kimai/bin/console doctrine:schema:create && \
+    /opt/kimai/bin/console doctrine:migrations:version --add --all && \
+    /opt/kimai/bin/console cache:warmup && \
+    chown -R www-data:www-data /opt/kimai/var && \
+    chown www-data:www-data /opt/kimai/vendor/mpdf/mpdf/tmp
+
+WORKDIR /opt/kimai
+
+EXPOSE 8001
+USER www-data
+CMD /opt/kimai/bin/console server:run 0.0.0.0:8001

LICENSE

@@ -1,11 +1,13 @@
-Copyright (c) 2017-2018 Kevin Papst
+MIT License
+
+Copyright (c) 2017-2019 Kevin Papst @ https://www.kevinpapst.de
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
@@ -15,5 +17,5 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,165 +1,74 @@
-# Kimai v2 - Time Tracking
-
-Kimai v2 - the open source time-tracking application with a mobile-first approach, read more at the [official website](http://v2.kimai.org).
+# Kimai 2 - online time-tracker
 
 [![Latest Stable Version](https://poser.pugx.org/kevinpapst/kimai2/v/stable)](https://packagist.org/packages/kevinpapst/kimai2)
 [![License](https://poser.pugx.org/kevinpapst/kimai2/license)](https://packagist.org/packages/kevinpapst/kimai2)
 [![Travis Status](https://travis-ci.org/kevinpapst/kimai2.svg?branch=master)](https://travis-ci.org/kevinpapst/kimai2)
-[![Code Quality](https://scrutinizer-ci.com/g/kevinpapst/kimai2/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/kevinpapst/kimai2/?branch=master)
-[![Code Coverage](https://scrutinizer-ci.com/g/kevinpapst/kimai2/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/kevinpapst/kimai2/?branch=master)
-[![Scrutinizer Status](https://scrutinizer-ci.com/g/kevinpapst/kimai2/badges/build.png?b=master)](https://scrutinizer-ci.com/g/kevinpapst/kimai2/build-status/master)
+[![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.
 
 ## Introduction
 
-This is the reloaded version of the open source timetracker Kimai.
-The new version has not much in common with its predecessor [Kimai v1](http://www.kimai.org) besides the basic ideas of time-tracking and the current development team.
-
-Right now its in an early development phase, its usable but some advanced features from Kimai v1 are missing by now (like export and ODT invoices). 
-But we already support to [import your timesheets](migration_v1.md) from Kimai v1.
-
-It is developed with modern frameworks like [Symfony v4](https://github.com/symfony/symfony), [Doctrine](https://github.com/doctrine/),
-[AdminLTE](https://github.com/kevinpapst/AdminLTEBundle/) and [many](composer.json) [more](package.json).
-
-Kimai is a multi-language application and already translated to English. German, Italian, Frensh, Spanish and Russian.
-If you want to support us in translating Kimai, please [read this documentation](var/docs/translations.md). 
+- [Home](https://www.kimai.org) - The house of Kimai
+- [Blog](https://www.kimai.org/blog/) - Get the latest news
+- [Documentation](https://www.kimai.org/documentation/) - Learn how to use
+- [Translations](https://www.kimai.org/documentation/translations.html) - Kimai in your language
+- [Migration](https://www.kimai.org/documentation/migration-v1.html) - Import data from v1 
 
 ### Requirements
 
-- PHP 7.1.3 or higher
-- One PHP extension of [PDO-SQLite](https://php.net/manual/en/ref.pdo-sqlite.php) or [PDO-MySQL](https://php.net/manual/en/ref.pdo-mysql.php) enabled (it might work with PostgreSQL and Oracle as well, but that wasn't tested and is not officially supported)
-- The PHP extension [intl](https://php.net/manual/en/book.intl.php)
-- The [usual Symfony application requirements](http://symfony.com/doc/current/reference/requirements.html)
-- If you use MariaDB, make sure its at least v10.7.2 (see [FAQ](var/docs/faq.md))
-- Kimai needs to be installed in the root directory of a domain or you need to [recompile the frontend assets](var/docs/developers.md)
-- A modern browser, Kimai v2 might be broken on old browsers like IE 10
+- PHP 7.2 or higher
+- Database (MySQL, MariaDB, SQLite)
+- Webserver (nginx, Apache)
+- A modern browser
+- [Other libraries](https://www.kimai.org/download/)
 
-## Documentation & Roadmap
+### About
 
-Looking for more information about using Kimai? Check out our more detailed [documentation](var/docs/).
+This is 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: 
 
-You can see our development roadmap for the future in the [Milestones](milestones/) sections.
-
-Our roadmap is open for changes and input from the community, please [sent us](issues/) your ideas and questions.
+JSON API, invoicing, data exports, multi-timer and punch-in punch-out mode, tagging, multi-user and multi-timezones, 
+LDAP and built-in authentication, customizable role permissions, responsive and ready for your mobile device, 
+hourly and fixed rates, advanced filtering, money and time budgets with report, support for plugins and many more.
 
 ## Installation
 
-There are [further infos about installation](var/docs/installation.md) if you have to use FTP or want to develop with Kimai. 
+- [Recommended setup](https://www.kimai.org/documentation/installation.html#recommended-setup) - with Git and Composer
+- [Docker](https://www.kimai.org/documentation/docker.html) - containerized
+- [Development](https://www.kimai.org/documentation/installation.html#development-installation) - on your local machine 
+- [1-click installer](https://www.kimai.org/documentation/installation.html#hosting-and-1-click-installations) - hosted environments 
+- [FTP](https://www.kimai.org/documentation/installation.html#ftp-installation) - unfortunately still widely used ;-)
 
-If you want to install Kimai 2 in your production environment, then SSH into your server and change to your webserver root.
-You need to install Git and [Composer](https://getcomposer.org/doc/00-intro.md) if you haven't already. 
+### Updating Kimai
 
-First clone this repo:
+- [Update Kimai](https://www.kimai.org/documentation/updates.html) - the documentation
+- [UPGRADING guide](UPGRADING.md) - version specific steps
 
-```bash
-git clone https://github.com/kevinpapst/kimai2.git
-cd kimai2/
-```
+### Plugins
 
-Make sure the [file permissions are correct](https://symfony.com/doc/current/setup/file_permissions.html):
-```bash
-chown -R www-data var/
-chmod -R 777 var/
-```
+- [Plugin marketplace](https://www.kimai.org/store/) - find existing plugins here
+- [Developer documentation](https://www.kimai.org/documentation/developers.html) - how to create a plugin
 
-It's up to you which database server you want to use, Kimai v2 supports MySQL/MariaDB and SQLite.
-Configure the database connection string in your the `.env` file:
-```
-# adjust all settings in .env to your needs
-APP_ENV=prod
-DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name
-```
+## Roadmap and releases
 
-Now install all dependencies for Kimai 2:
+You can see a rough development roadmap in the [Milestones](https://github.com/kevinpapst/kimai2/milestones) sections.
+It is open for changes and input from the community, your [ideas and questions](https://github.com/kevinpapst/kimai2/issues) are welcome.
 
-```bash
-sudo -u www-data composer install --no-dev --optimize-autoloader
-```
+> 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.
 
-Optionally create the database:
-```bash
-bin/console doctrine:database:create
-```
+Release versions will be created on a regular base (approx. one release per month) and you can use these tags if you are 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. 
 
-Create all schema tables:
-```bash
-bin/console doctrine:schema:create
-```
+## Credits
 
-Make sure that upcoming updates can be correctly applied by setting the initial database version:
-```bash
-bin/console doctrine:migrations:version --add --all
-```
-
-Warm up the cache (as webserver user):
-```bash
-sudo -u www-data bin/console cache:warmup --env=prod
-```
-
-Create your first user with the following command. You will be asked to enter a password afterwards:
-```bash
-bin/console kimai:create-user username admin@example.com ROLE_SUPER_ADMIN
-```
-_Tip: You can skip the "create user" step, if you are going to [import data from Kimai v1](var/docs/migration_v1.md)._
-
-For available roles, please refer to the [user documentation](var/docs/users.md).
-
-> **NOTE**
->
-> If you want to use a fully-featured web server (like Nginx or Apache) to run
-> Kimai, configure it to point at the `public/` directory of the project.
-> For more details, see:
-> http://symfony.com/doc/current/cookbook/configuration/web_server_configuration.html
-
-Installation complete: enjoy time-tracking :-)
-
-## Updating Kimai
-
-**STOP** 
-
-1. It's important that you don't execute the Installation steps before or after your upgrade
-2. Make sure that you have a working database backup before you start the update
-3. Read the [UPGRADING](UPGRADING.md) guide and [release information](https://github.com/kevinpapst/kimai2/releases) to check if there a further steps required
-
-Get the latest code and install dependencies:
-```bash
-cd kimai2/
-git pull origin master
-sudo -u www-data composer install --no-dev --optimize-autoloader
-```
-
-Refresh your cache:
-```bash
-sudo -u www-data bin/console cache:clear --env=prod
-sudo -u www-data bin/console cache:warmup --env=prod
-```
-
-And upgrade your database:
-```bash
-bin/console doctrine:migrations:migrate
-```
-
-Done! You can use the latest version of Kimai 2. 
-
-## Rolling releases & Git
-
-Please note: Kimai 2 uses a rolling release concept for delivering updates.
-Release versions will be created on a regular base and you can use these tags if you are familiar with Git, but we 
-will not provide support for any specific version (whether its bugs or installation/update docu).
-
-Every code change, whether it's a new features or bug fixes, will be targeted against the master branch and 
-intensively tested before merging. We have to go this way, as we develop Kimai in our free time and want to put our 
-effort into the software instead of installation scripts and complicated upgrade processes. 
-
-## Extensions for Kimai 2
-
-As Kimai 2 was built on top of Symfony, it can be extended like every other Symfony application.
-We call these extensions bundles, but you might also know them as add-ons, extensions or plugins.
-
-All available Kimai 2 bundles can be found at the [Kimai recipes](https://github.com/kimai/recipes) repository.
-
-## Developer
-
-If you want to develop with and for Kimai 2 please read the following documentation:
-
-- an example on how to extend Kimai 2 can be found in this [GitHub repository](https://github.com/kevinpapst/kimai2-invoice)
-- the [developer documentation](var/docs/developers.md) is available both on GitHub and your local installation
+Kimai 2 is developed with modern frameworks like 
+[Symfony v4](https://github.com/symfony/symfony), 
+[Doctrine](https://github.com/doctrine/),
+[AdminLTEBundle](https://github.com/kevinpapst/AdminLTEBundle/) (based on [AdminLTE theme](https://github.com/almasaeed2010/AdminLTE)) and 
+[many](composer.json) [more](package.json).

SECURITY.md

@@ -0,0 +1,23 @@
+# Security Policy
+
+## Supported Versions
+
+As announced in the [README](README.md) I only support the latest available release and master.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| master  | :white_check_mark: |
+| 1.5     | :white_check_mark: |
+| < 1.5   | :x:                |
+
+## Reporting a Vulnerability
+
+Please report any security related vulnerability in the [advisories section at GitHub](https://github.com/kevinpapst/kimai2/security/advisories) or via email to info@keleo.de or kpapst@gmx.net.
+
+I will work as fast as I can to fix the problem and publish a bugfix release / security update. 
+Depending on the size of the required fixes, this might take a couple of hours or a couple of days.
+
+You can expect that your message will be answered ASAP, but please take into account that I am living in the timezone Europe/Berlin. 
+
+If your issue is valid and I verified and fixed it, you will be mentioned in the release notes within the Security section at the top of the release. 
+I am grateful for any (discrete) disclosure of vulnerabilities!

UPGRADING.md

@@ -1,25 +1,172 @@
 # Upgrading Kimai 2
 
-Database upgrades are currently ONLY provided for MySQL/MariaDB and SQLite. 
+_Make sure to create a backup before you start!_ 
 
-If you plan on using e.g. PostgreSQL, please read more about the `bin/console doctrine:migrations:diff` and 
-`bin/console doctrine:migrations:migrate` commands and contact us, so we can integrate them into the official releases.
+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.
 
+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.
 
-A normal upgrade can be executed with these commands: 
+## [1.5](https://github.com/kevinpapst/kimai2/releases/tag/1.5)
 
-```bash
-git pull origin master
-sudo -u www-data composer install --no-dev --optimize-autoloader
-sudo -u www-data bin/console cache:clear --env=prod
-sudo -u www-data bin/console cache:warmup --env=prod
-bin/console doctrine:migrations:migrate
+[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)
+
+This release contains several changes, as I still have the goal to stabilize the code base to prevent 
+such "challenges" after 1.0 for a while.
+
+### Changes for your local.yaml
+ 
+New permissions are available. You have to add them to your `local.yaml` ONLY if you use a custom permission structure, 
+otherwise you can't use the new features: 
+- `view_tag` - view all tags
+- `delete_tag` - delete tags
+- `edit_exported_timesheet` - allows to edit records which were exported
+- `role_permissions` - view calculated permissions for user roles
+- `budget_activity` - view and edit budgets for activities
+- `budget_project` - view and edit budgets for projects
+- `budget_customer` - view and edit budgets for customers
+
+Removed permission:
+- `system_actions` - removed experimental feature to flush app cache from the about screen
+
+### BC BREAKS
+
+- API: Format for queries including a datetime object fixed to use HTML5 format (previously `2019-03-02 14:23` - now `2019-03-02T14:23:00`)
+- **Permission config**: the `permissions` definition in your `local.yaml` needs to be verified/changed, as the internal structure was highly optimized to simplify the definition. 
+Thanks to the new structure, you should be able to remove almost everything from your `local.yaml` (tip: start over from scratch!). Please read [the updated permission docu](https://www.kimai.org/documentation/permissions.html). 
+- default widgets were removed from `kimai.yaml`, that shouldn't cause any issues ... but if something is odd: [look here for help](https://www.kimai.org/documentation/dashboard.html)
+
+## [0.9](https://github.com/kevinpapst/kimai2/releases/tag/0.9)
+
+Remember to execute the necessary timezone conversion script, if you haven't updated to 0.8 before (see below)!
+
+### BC BREAKS
+
+This release contains some BC breaks which were necessary before 1.0 will be released (_now or never_), to prevent those BC breaks after 1.0. 
+
+- **Kimai requires PHP 7.2 now => [PHP 7.1 expired 4 month ago](https://www.php.net/supported-versions.php)**
+- The `.env` variable `DATABASE_PREFIX` was removed and the table prefix is now hardcoded to `kimai2_`. If you used another prefix, 
+you have to rename your tables manually before starting the update process. You can delete the row `DATABASE_PREFIX` from your `.env` file.
+- API: Format for DateTime objects changed, now including timezone identifier (previously `2019-03-02 14:23` - now `2019-03-02T14:23:00+00:00`), see [#718](https://github.com/kevinpapst/kimai2/pull/718)
+- API: changed from snake_case to camelCase (affected fields: hourlyRate vs hourly_rate / fixedRate vs fixed_rate / orderNumber vs order_number / i18n config object)
+- Plugin mechanism changed: existing Plugins have to be deleted or updated
+
+### Apply necessary changes to your `local.yaml`: 
+
+New permissions are available: 
+- `system_configuration` - for accessing the new system configuration screen
+- `system_actions` - for the experimental feature to flush your cache from the about screen
+- `plugins` - for accessing the new plugins screen
+
+The setting `kimai.timesheet.mode` replaces the setting `kimai.timesheet.duration_only`. If you used the duration_only mode, you need to change your config:
+```yaml
+# Before
+kimai:
+    timesheet:
+        duration_only: true
+        
+# After
+kimai:
+    timesheet:
+        mode: duration_only
 ```
+Or switch the mode directly in the new System configuration screen within Kimai.  
 
-There might be version specific tasks that need to be executed before or after these steps, please see below 
-if your updated version is mentioned below.
+## [0.8.1](https://github.com/kevinpapst/kimai2/releases/tag/0.8.1)
 
-## [0.4](https://github.com/kevinpapst/kimai2/releases/tag/0.4) (2018-09-01)
+A bug fixing release. Remember to execute the necessary timezone conversion script, if you haven't updated to 0.8 before (see below)!
+
+## [0.8](https://github.com/kevinpapst/kimai2/releases/tag/0.8)
+
+After you followed the normal update and database migration process (see above), you need to execute a bash command to convert your timesheet data for timezone support:
+
+- Read this [pull request](https://github.com/kevinpapst/kimai2/pull/372) BEFORE you follow the instructions to convert the 
+timezones in your existing time records with `bin/console kimai:convert-timezone`. Without that, you will end up with wrong times in your database.
+
+### Apply necessary changes to your `local.yaml`: 
+
+- A new boolean setting `kimai.timesheet.rules.allow_future_times` was introduced
+- New permissions are available: 
+  - `view_export` - for the new export feature
+  - `create_export` - for the new export feature
+  - `edit_export_own_timesheet` - for the new export feature
+  - `edit_export_other_timesheet` - for the new export feature
+  - `system_information` - to see the new about screen
+
+## [0.7](https://github.com/kevinpapst/kimai2/releases/tag/0.7)
+
+The configuration `kimai.theme.active_warning` was deprecated and should be replaced in your local.yaml, 
+[read config docs for more information](https://www.kimai.org/documentation/timesheet.html#limit-active-entries).
+
+## [0.6.1](https://github.com/kevinpapst/kimai2/releases/tag/0.6.1)
+
+A bugfix release to address database compatibility issues with older MySQL/MariaDB versions.
+
+## [0.6](https://github.com/kevinpapst/kimai2/releases/tag/0.6)
+
+The API has some minor BC breaks: some fields were renamed and entities have a larger attribute set than collections. 
+Be aware that the API is still is development mode and shouldn't be considered stable for now.
+
+## [0.5](https://github.com/kevinpapst/kimai2/releases/tag/0.5)
+
+Some configuration nodes were removed, if you have one of them in your `local.yaml` you need to delete them before you start the update:
+- `kimai.invoice.calculator`
+- `kimai.invoice.renderer`
+- `kimai.invoice.number_generator`
+
+The new config `kimai.invoice.documents` was introduced, holding a list of directories ([read more](https://www.kimai.org/documentation/invoices.html)).
+
+**BC break:** InvoiceTemplate name was changed from 255 characters to 60. If you used longer invoice-template names, they will be truncated when upgrading the database.
+Please make sure that they are unique in the first 60 character before you upgrade your database with `doctrine:migrations:migrate`. 
+
+## [0.4](https://github.com/kevinpapst/kimai2/releases/tag/0.4)
 
 In the time between 0.3 and 0.4 there was a release of composer that introduced a BC break, 
 which leads to problems between Composer and Symfony Flex, resulting in an error like this when running it:
@@ -32,24 +179,12 @@ which leads to problems between Composer and Symfony Flex, resulting in an error
 This can be fixed by updating Composer and Flex before executing the Kimai update:
 ```
 sudo composer self-update
-sudo -u www-data composer update symfony/flex --no-plugins
+sudo -u www-data composer update symfony/flex --no-plugins --no-scripts
 ```
 
-Then the full update can be executed as usual:
+## [0.3](https://github.com/kevinpapst/kimai2/releases/tag/0.3)
 
-```bash
-git pull origin master
-sudo -u www-data composer install --no-dev --optimize-autoloader
-sudo -u www-data bin/console cache:clear --env=prod
-sudo -u www-data bin/console cache:warmup --env=prod
-bin/console doctrine:migrations:migrate
-```
-
-## [0.3](https://github.com/kevinpapst/kimai2/releases/tag/0.3) (2018-07-22)
-
-**Update from 0.2:**
-
-You need to adjust your `.env` file and add your `from` address for [all emails](https://github.com/kevinpapst/kimai2/blob/master/var/docs/emails.md) generated by Kimai 2:
+You need to adjust your `.env` file and add your `from` address for [all emails](https://www.kimai.org/documentation/emails.html) generated by Kimai 2:
 ```
 MAILER_FROM=kimai@example.com
 ```

assets/app.js

@@ -0,0 +1,67 @@
+// ------------------- INLINED ADMIN-LTE DEFINITIONS -------------------
+// require('../vendor/kevinpapst/adminlte-bundle/Resources/assets/admin-lte');
+// this was replaced to save around 300kb by:
+// - removing moment locales which are not used
+// - removing fullcalendar locales which are not used
+// - removing icheck which is not used
+// - removing jquery-ui which is not used
+
+const $ = require('jquery');
+global.$ = global.jQuery = $;
+
+require('bootstrap-sass');
+require('jquery-slimscroll');
+require('select2');
+require('select2/dist/js/i18n/ar');
+require('select2/dist/js/i18n/cs');
+require('select2/dist/js/i18n/de');
+require('select2/dist/js/i18n/es');
+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/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');
+
+const Moment = require('moment');
+global.moment = Moment;
+require('moment/locale/ar');
+require('moment/locale/cs');
+require('moment/locale/de');
+require('moment/locale/es');
+require('moment/locale/fr');
+require('moment/locale/hu');
+require('moment/locale/it');
+require('moment/locale/ja');
+require('moment/locale/ko');
+require('moment/locale/pt-br');
+require('moment/locale/ru');
+require('moment/locale/sk');
+require('moment/locale/sv');
+require('moment/locale/tr');
+
+require('daterangepicker');
+
+// ------ AdminLTE framework ------
+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');
+
+global.$.AdminLTE = {};
+global.$.AdminLTE.options = {};
+require('admin-lte/dist/js/adminlte.min');
+// ------------------- INLINED ADMIN-LTE DEFINITIONS -------------------
+// ---------------------------------------------------------------------
+
+require('./sass/app.scss');
+
+// ------ Kimai itself ------
+require('./js/KimaiWebLoader.js');
+
+// ------ Autocomplete for tags only ------
+require('jquery-ui/ui/widgets/autocomplete');

assets/calendar.js

@@ -0,0 +1,20 @@
+
+require('fullcalendar');
+require('fullcalendar/dist/gcal.min');
+
+require('fullcalendar/dist/locale/ar');
+require('fullcalendar/dist/locale/cs');
+require('fullcalendar/dist/locale/de');
+require('fullcalendar/dist/locale/es');
+require('fullcalendar/dist/locale/fr');
+require('fullcalendar/dist/locale/hu');
+require('fullcalendar/dist/locale/it');
+require('fullcalendar/dist/locale/ja');
+require('fullcalendar/dist/locale/ko');
+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/fullcalendar.min.css');

assets/chart.js

@@ -0,0 +1,2 @@
+
+require('chart.js/dist/Chart.min');

assets/css/app.scss

@@ -1,39 +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 "~bootstrap-sass/assets/stylesheets/bootstrap/variables";
-
-.error-page {
-    margin-bottom: 50px;
-}
-
-@media print{
-    .sf-toolbar, .control-sidebar {display: none !important;}
-}
-
-@import 'content';
-@import 'toolbar';
-
-/* ================================ SIDEBAR ================================ */
-
-/* Used for the Sidebar UserPanel (which is deactivated right now) */
-.user-panel>.info {
-    left: 80px;
-}
-
-/* ================================ FOOTER ================================ */
-
-footer.main-footer {
-    padding: 5px;
-    font-size: 80%;
-}
-
-@import 'invoice';
-@import 'datatable';
-@import 'calendar';
-@import 'dashboard';
-@import 'navbar';

assets/css/content.scss

@@ -1,30 +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.
- */
-
-.content {
-    padding: 15px 0;
-}
-.content-header {
-    h1 {
-        small {
-            display: none;
-        }
-    }
-}
-
-@media (min-width: $screen-sm-min) {
-    .content-header {
-        h1 {
-            small {
-                display: inline-block;
-            }
-        }
-    }
-    .content {
-        padding: 15px;
-    }
-}

assets/css/invoice.scss

@@ -1,36 +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.
- */
-
-.invoice {
-    margin: 0;
-}
-
-@media (min-width: $screen-sm-min) {
-    .invoice {
-        margin: 10px 25px;
-    }
-}
-
-.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;
-}

assets/css/navbar.scss

@@ -1,46 +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.
- */
-
-.navbar-nav > li > a.ddt-large {
-    padding-top: 12px;
-    padding-bottom: 9px;
-}
-
-li.messages-menu ul.menu li .pull-left i {
-    color: #dd4b39;
-}
-
-.navbar-nav>.messages-menu>.dropdown-menu>li .menu>li>a>p {
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.navbar-nav .start_record {
-    text-align: center;
-}
-
-/*
-.ticktac:hover i.running{
-    color: #4ff131;
-}
-
-li.open .ticktac i.running{
-    color: #4ff131;
-}
-
-.ticktac i.stopped{
-    color: #fff;
-}
-
-.ticktac:hover i.stopped{
-    color: #4ff131;
-}
-.user-panel>.info {
-    left: 40px;
-    padding-top: 0px;
-}
-*/

assets/js/KimaiConfiguration.js

@@ -0,0 +1,26 @@
+/*
+ * 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] KimaiConfiguration: handling all configuration and runtime settings
+ */
+
+export default class KimaiConfiguration {
+
+    constructor(configurations) {
+        this._configurations = configurations;
+    }
+
+    get(name) {
+        return this._configurations[name];
+    }
+
+    has(name) {
+        return name in this._configurations;
+    }
+
+}

assets/js/KimaiContainer.js

@@ -0,0 +1,91 @@
+/*
+ * 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] KimaiContainer
+ *
+ * ServiceContainer for Kimai
+ */
+
+import KimaiConfiguration from './KimaiConfiguration';
+import KimaiTranslation from './KimaiTranslation';
+import KimaiPlugin from './KimaiPlugin';
+
+export default class KimaiContainer {
+
+    /**
+     * Create a new Container with the given configurations and translations.
+     *
+     * @param {Object} configuration
+     * @param {Object} translation
+     */
+    constructor(configuration, translation) {
+        if (!(configuration instanceof KimaiConfiguration)) {
+            throw new Error('Configuration needs to a KimaiConfiguration instance');
+        }
+        this._configuration = configuration;
+
+        if (!(translation instanceof KimaiTranslation)) {
+            throw new Error('Configuration needs to a KimaiTranslation instance');
+        }
+        this._translation = translation;
+        this._plugins = [];
+    }
+
+    /**
+     * Register a new Plugin.
+     *
+     * @param {KimaiPlugin} plugin
+     * @returns {KimaiPlugin}
+     */
+    registerPlugin(plugin) {
+        if (!(plugin instanceof KimaiPlugin)) {
+            throw new Error('Invalid plugin given, needs to be a KimaiPlugin instance');
+        }
+
+        plugin.setContainer(this);
+
+        this._plugins.push(plugin);
+
+        return plugin;
+    }
+
+    /**
+     * @param {string} name
+     * @returns {KimaiPlugin}
+     */
+    getPlugin(name) {
+        for (let plugin of this._plugins) {
+            if (plugin.getId() !== null && plugin.getId() === name) {
+                return plugin;
+            }
+        }
+        throw new Error('Unknown plugin: ' + name);
+    }
+
+    /**
+     * @returns {Array<KimaiPlugin>}
+     */
+    getPlugins() {
+        return this._plugins;
+    }
+
+    /**
+     * @returns {KimaiTranslation}
+     */
+    getTranslation() {
+        return this._translation;
+    }
+
+    /**
+     * @returns {KimaiConfiguration}
+     */
+    getConfiguration() {
+        return this._configuration;
+    }
+
+}

assets/js/KimaiLoader.js

@@ -0,0 +1,86 @@
+/*
+ * 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] KimaiLoader: bootstrap the application and all plugins
+ */
+
+import moment from 'moment';
+import KimaiTranslation from "./KimaiTranslation";
+import KimaiConfiguration from "./KimaiConfiguration";
+import KimaiContainer from "./KimaiContainer";
+import KimaiActiveRecordsDuration from './plugins/KimaiActiveRecordsDuration.js';
+import KimaiDatatableColumnView from './plugins/KimaiDatatableColumnView.js';
+import KimaiThemeInitializer from "./plugins/KimaiThemeInitializer";
+import KimaiDateRangePicker from "./plugins/KimaiDateRangePicker";
+import KimaiDatatable from "./plugins/KimaiDatatable";
+import KimaiToolbar from "./plugins/KimaiToolbar";
+import KimaiAPI from "./plugins/KimaiAPI";
+import KimaiSelectDataAPI from "./plugins/KimaiSelectDataAPI";
+import KimaiDateTimePicker from "./plugins/KimaiDateTimePicker";
+import KimaiAlternativeLinks from "./plugins/KimaiAlternativeLinks";
+import KimaiAjaxModalForm from "./plugins/KimaiAjaxModalForm";
+import KimaiActiveRecords from "./plugins/KimaiActiveRecords";
+import KimaiRecentActivities from "./plugins/KimaiRecentActivities";
+import KimaiEvent from "./plugins/KimaiEvent";
+import KimaiAPILink from "./plugins/KimaiAPILink";
+import KimaiAlert from "./plugins/KimaiAlert";
+import KimaiAutocomplete from "./plugins/KimaiAutocomplete";
+import KimaiFormSelect from "./plugins/KimaiFormSelect";
+import KimaiForm from "./plugins/KimaiForm";
+import KimaiDatePicker from "./plugins/KimaiDatePicker";
+
+export default class KimaiLoader {
+
+    constructor(configurations, translations) {
+        // set the current locale for all javascript components
+        moment.locale(configurations['locale']);
+
+        const kimai = new KimaiContainer(
+            new KimaiConfiguration(configurations),
+            new KimaiTranslation(translations)
+        );
+
+        kimai.registerPlugin(new KimaiEvent());
+        kimai.registerPlugin(new KimaiAPI());
+        kimai.registerPlugin(new KimaiAlert());
+        kimai.registerPlugin(new KimaiFormSelect('.selectpicker'));
+        kimai.registerPlugin(new KimaiActiveRecordsDuration('[data-since]'));
+        kimai.registerPlugin(new KimaiDatatableColumnView('data-column-visibility'));
+        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'));
+        kimai.registerPlugin(new KimaiRecentActivities('li.notifications-menu'));
+        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 KimaiForm());
+        kimai.registerPlugin(new KimaiThemeInitializer());
+        //kimai.registerPlugin(new KimaiPauseRecord('li.messages-menu ul.menu li'));
+
+        // notify all listeners that Kimai plugins can now be registered
+        kimai.getPlugin('event').trigger('kimai.pluginRegister', {'kimai': kimai});
+
+        // initialize all plugins
+        kimai.getPlugins().map(plugin => { plugin.init(); });
+
+        // notify all listeners that Kimai is now ready to be used
+        kimai.getPlugin('event').trigger('kimai.initialized', {'kimai': kimai});
+
+        this.kimai = kimai;
+    }
+
+    getKimai() {
+        return this.kimai;
+    }
+
+}

assets/js/KimaiPlugin.js

@@ -0,0 +1,53 @@
+/*
+ * 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] KimaiPlugin: base class for all plugins
+ */
+
+import KimaiContainer from "./KimaiContainer";
+
+export default class KimaiPlugin {
+
+    /**
+     * Overwrite this method to initialize your plugin.
+     *
+     * It is called AFTER setContainer() and AFTER DOMContentLoaded was fired.
+     * You don't have access to the container before this method!
+     */
+    init() {
+    }
+
+    /**
+     * If you return an ID, you indicate that your plugin can be used by other plugins.
+     *
+     * @returns {string|null}
+     */
+    getId() {
+        return null;
+    }
+
+    /**
+     * @param {KimaiContainer} core
+     */
+    setContainer(core) {
+        if (!(core instanceof KimaiContainer)) {
+            throw new Error('Plugin was given an invalid KimaiContainer');
+        }
+        this._core = core;
+    }
+
+    /**
+     * This function returns null, if xou call it BEFORE init().
+     *
+     * @returns {KimaiContainer}
+     */
+    getContainer() {
+        return this._core;
+    }
+
+}

assets/js/KimaiTranslation.js

@@ -0,0 +1,26 @@
+/*
+ * 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] KimaiTranslation: handling translation strings
+ */
+
+export default class KimaiTranslation {
+
+    constructor(translations) {
+        this._translations = translations;
+    }
+
+    get(name) {
+        return this._translations[name];
+    }
+
+    has(name) {
+        return name in this._translations;
+    }
+
+}

assets/js/KimaiWebLoader.js

@@ -0,0 +1,33 @@
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * Main JS application file for Kimai 2. This file should be included in all pages.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*!
+ * [KIMAI] Wrapper class for loading Kimai app in browser script scope
+ */
+
+import KimaiLoader from "./KimaiLoader";
+
+(function (root, factory) {
+    if (typeof define === 'function' && define.amd) {
+        define([], function () {
+            return (root.KimaiWebLoader = factory());
+        });
+    } else if (typeof module === 'object' && module.exports) {
+        module.exports = factory();
+    } else {
+        root.KimaiWebLoader = factory();
+    }
+}(typeof self !== 'undefined' ? self : this, function () {
+
+    class KimaiWebLoader extends KimaiLoader {
+    }
+
+    return KimaiWebLoader;
+
+}));

assets/js/app.js

@@ -1,19 +0,0 @@
-require('../../vendor/kevinpapst/adminlte-bundle/Resources/assets/admin-lte');
-
-require('../css/app.scss');
-require('../css/datatable.scss');
-require('../css/calendar.scss');
-
-require('fullcalendar');
-require('fullcalendar/dist/gcal.min');
-require('fullcalendar/dist/locale-all');
-require('fullcalendar/dist/fullcalendar.min.css');
-
-// ------ for charts ------
-require('chart.js/dist/Chart.min');
-
-// ------ Kimai itself ------
-require('./kimai.js');
-require('./datatable.js');
-require('./toolbar.js');
-require('../images/default_avatar.png');

assets/js/datatable.js

@@ -1,66 +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.
- */
-
-/** global: Cookies */
-global.Cookies = require('js-cookie');
-
-if (typeof jQuery === 'undefined') {
-    throw new Error('Kimai requires jQuery');
-}
-
-/* datatable
- *
- * @type Object
- * @description $.datatable is the main object for views with data-tables.
- *              It's used for implementing functions and options related
- *              to the datatables.
- */
-$.datatable = {};
-
-$(function() {
-"use strict";
-
-    $.datatable = {
-        saveVisibility: function (modalSelector) {
-            var settings = {};
-            var cookieName = $(modalSelector).find('form').attr('name');
-            $(modalSelector).find('form').find('input:checkbox:not(:checked)').each(
-                function () {
-                    settings[$(this).attr('name')] = $(this).is(':checked');
-                }
-            );
-            if (jQuery.isEmptyObject(settings)) {
-                Cookies.remove(cookieName);
-            } else {
-                Cookies.set(cookieName, JSON.stringify(settings), {expires: 365});
-            }
-            $(modalSelector).modal('toggle');
-            location.reload();
-        },
-        changeVisibility: function (column) {
-            var tbl = $('table.dataTable');
-            var amount = tbl.find('th').length -1;
-            if (column < 0 || column >= amount) {
-                return;
-            }
-            var header = $(tbl.find('th').get(column));
-            if (header.css("display") === "none") {
-                header.show();
-                tbl.find('tr').each(function(){
-                    $($(this).find('td').get(column)).show('ease');
-                });
-            } else {
-                header.hide();
-                tbl.find('tr').each(function(){
-                    $($(this).find('td').get(column)).hide('ease');
-                });
-            }
-        }
-
-    };
-
-});

assets/js/kimai.js

@@ -1,110 +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.
- */
-
-if (typeof jQuery === 'undefined') {
-    throw new Error('Kimai requires jQuery');
-}
-
-/* kimai
- *
- * @type Object
- * @description $.kimai is the main object for the template's app.
- *              It's used for implementing functions and options related
- *              to the template. Keeping everything wrapped in an object
- *              prevents conflict with other plugins and is a better
- *              way to organize our code.
- */
-$.kimai = {};
-
-$(function() {
-"use strict";
-
-    $.kimai = {
-        init: function(options) {
-            if (typeof options !== 'undefined') {
-                $.kimai.settings = $.extend({}, $.kimai.defaults, options);
-            }
-
-            // ask before a delete call is executed
-            $('a.btn-trash').click(function (event) {
-                return confirm($.kimai.settings['confirmDelete']);
-            });
-
-            // activate the dropdown functionality
-            $('.dropdown-toggle').dropdown();
-
-            // auto hide success message after x seconds, as they are just meant as quick feedback and
-            // not as a permanent source of information
-            if ($.kimai.settings['alertSuccessAutoHide'] > 0) {
-                setTimeout(
-                    function() {
-                        $('div.alert-success').alert('close');
-                    },
-                    $.kimai.settings['alertSuccessAutoHide']
-                );
-            }
-
-            $('input[data-datepicker="on"]').daterangepicker({
-                singleDatePicker: true,
-                showDropdowns: true,
-                locale: {
-                    format: "YYYY-MM-DD",
-                    firstDay: 1
-                }
-            });
-
-            $('input[data-datetimepicker="on"]').daterangepicker({
-                singleDatePicker: true,
-                timePicker: true,
-                timePicker24Hour: true,
-                showDropdowns: true,
-                autoUpdateInput: false,
-                locale: {
-                    cancelLabel: 'Clear',
-                    format: "YYYY-MM-DD HH:mm",
-                    firstDay: 1
-                }
-            });
-            $('input[data-datetimepicker="on"]').on('apply.daterangepicker', function(ev, picker) {
-                $(this).val(picker.startDate.format('YYYY-MM-DD HH:mm'));
-            });
-
-            /*
-            $('input').iCheck({
-                checkboxClass: 'icheckbox_square-blue',
-                radioClass: 'iradio_square-blue',
-                increaseArea: '20%' // optional
-            });
-            */
-
-            // $.AdminLTE.pushMenu.expandOnHover();
-        },
-        pauseRecord: function(selector) {
-            $(selector + ' .pull-left i').hover(function () {
-                var link = $(this).parents('a');
-                link.attr('href', link.attr('href').replace('/stop', '/pause'));
-                $(this).removeClass('fa-stop-circle').addClass('fa-pause-circle').addClass('text-orange');
-            },function () {
-                var link = $(this).parents('a');
-                link.attr('href', link.attr('href').replace('/pause', '/stop'));
-                $(this).removeClass('fa-pause-circle').removeClass('text-orange').addClass('fa-stop-circle');
-            });
-        }
-    };
-
-    // default values
-    $.kimai.defaults = {
-        baseUrl: '/',
-        imagePath: '/images',
-        confirmDelete: 'Really delete?',
-        alertSuccessAutoHide: 5000
-    };
-
-    // once initialized, here are all values
-    $.kimai.settings = {};
-
-});

assets/js/plugins/KimaiAPI.js

@@ -0,0 +1,65 @@
+/*
+ * 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] KimaiAPI: easy access to API methods
+ */
+
+import jQuery from 'jquery';
+import KimaiPlugin from "../KimaiPlugin";
+
+export default class KimaiAPI extends KimaiPlugin {
+
+    getId() {
+        return 'api';
+    }
+
+    get(url, data, callbackSuccess, callbackError) {
+        jQuery.ajax({
+            url: url,
+            headers: {
+                'X-AUTH-SESSION': true,
+                'Content-Type':'application/json'
+            },
+            method: 'GET',
+            data: data,
+            dataType: 'json',
+            success: callbackSuccess,
+            error: callbackError
+        });
+    }
+
+    patch(url, data, callbackSuccess, callbackError) {
+        jQuery.ajax({
+            url: url,
+            headers: {
+                'X-AUTH-SESSION': true,
+                'Content-Type':'application/json'
+            },
+            method: 'PATCH',
+            data: data,
+            dataType: 'json',
+            success: callbackSuccess,
+            error: callbackError
+        });
+    }
+
+    delete(url, callbackSuccess, callbackError) {
+        jQuery.ajax({
+            url: url,
+            headers: {
+                'X-AUTH-SESSION': true,
+                'Content-Type':'application/json'
+            },
+            method: 'DELETE',
+            dataType: 'json',
+            success: callbackSuccess,
+            error: callbackError
+        });
+    }
+
+}

assets/js/plugins/KimaiAPILink.js

@@ -0,0 +1,95 @@
+/*
+ * 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 KimaiClickHandlerReducedInTableRow from "./KimaiClickHandlerReducedInTableRow";
+
+/**
+ * Needs to be initialized with a class name.
+ *
+ * A link like <a href=# class=remoteLink> can be activated with:
+ * new KimaiAPILink('remoteLink')
+ *
+ * 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 KimaiAPILink extends KimaiClickHandlerReducedInTableRow {
+
+    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;
+
+                    let url = attributes['href'];
+                    if (!url) {
+                        url = target.getAttribute('href');
+                    }
+
+                    if (attributes.question !== undefined) {
+                        self.getContainer().getPlugin('alert').question(attributes.question, function(value) {
+                            if (value) {
+                                self._callApi(url, attributes);
+                            }
+                        });
+                    } else {
+                        self._callApi(url, attributes);
+                    }
+
+                    event.preventDefault();
+                    event.stopPropagation();
+                }
+
+                target = target.parentNode;
+            }
+        });
+    }
+
+    _callApi(url, attributes)
+    {
+        const method = attributes['method'];
+        const eventName = attributes['event'];
+        const API = this.getContainer().getPlugin('api');
+        const eventing = this.getContainer().getPlugin('event');
+        const alert = this.getContainer().getPlugin('alert');
+        const successHandle = function(result) {
+            eventing.trigger(eventName);
+            if (attributes.msgSuccess) {
+                alert.success(attributes.msgSuccess);
+            }
+        };
+        const errorHandle = function(xhr, err) {
+            let message = 'action.update.error';
+            if (attributes.msgError) {
+                message = attributes.msgError;
+            }
+            if (xhr.responseJSON && xhr.responseJSON.message) {
+                err = xhr.responseJSON.message;
+            }
+            alert.error(message, err);
+        };
+
+        if (method === 'PATCH') {
+            let data = {};
+            if (attributes.payload) {
+                data  = attributes.payload;
+            }
+            API.patch(url, data, successHandle, errorHandle);
+        } else if (method === 'DELETE') {
+            API.delete(url, successHandle, errorHandle);
+        }
+    }
+
+}

assets/js/plugins/KimaiActiveRecords.js

@@ -0,0 +1,113 @@
+/*
+ * 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] KimaiActiveRecords: responsible to display the users active records
+ */
+
+import KimaiPlugin from '../KimaiPlugin';
+
+export default class KimaiActiveRecords extends KimaiPlugin {
+
+    constructor(selector, selectorEmpty) {
+        super();
+        this.selector = selector;
+        this.selectorEmpty = selectorEmpty;
+    }
+
+    getId() {
+        return 'active-records';
+    }
+
+    init() {
+        const menu = document.querySelector(this.selector);
+
+        // the menu can be hidden if user has no permissions to see it
+        if (menu === null) {
+            return;
+        }
+
+        const dropdown = menu.querySelector('ul.dropdown-menu');
+
+        this.attributes = dropdown.dataset;
+        this.itemList = dropdown.querySelector('li > ul.menu');
+        this.label = menu.querySelector('a > span.label');
+
+        const self = this;
+        const handle = function() { self.reloadActiveRecords(); };
+
+        document.addEventListener('kimai.timesheetUpdate', handle);
+        document.addEventListener('kimai.activityUpdate', handle);
+        document.addEventListener('kimai.projectUpdate', handle);
+        document.addEventListener('kimai.customerUpdate', handle);
+    }
+
+    emptyList() {
+        this.itemList.innerHTML = '';
+    }
+
+    _toggleMenu(hasEntries) {
+        const menu = document.querySelector(this.selector);
+        const menuEmpty = document.querySelector(this.selectorEmpty);
+
+        menu.style.display = hasEntries ? 'inline-block' : 'none';
+        if (menuEmpty !== null) {
+            menuEmpty.style.display = !hasEntries ? 'inline-block' : 'none';
+        }
+    }
+
+    setEntries(entries) {
+        this._toggleMenu(entries.length > 0);
+
+        if (entries.length === 0) {
+            this.label.innerText = '';
+            this.emptyList();
+            return;
+        }
+
+        let htmlToInsert = '';
+        const durations = this.getContainer().getPlugin('timesheet-duration');
+
+        for (let timesheet of entries) {
+            htmlToInsert +=
+                    `<li>` +
+                        `<a href="${ this.attributes['href'].replace('000', timesheet.id) }" data-event="kimai.timesheetStop kimai.timesheetUpdate" class="api-link" data-method="PATCH" data-msg-error="timesheet.stop.error" data-msg-success="timesheet.stop.success">` +
+                            `<div class="pull-left">` +
+                                `<i class="${ this.attributes['icon'] } fa-2x"></i>` +
+                            `</div>` +
+                            `<h4>` +
+                                `<span>${ timesheet.activity.name }</span>` +
+                                `<small>` +
+                                    `<span data-title="true" data-since="${ timesheet.begin }" data-format="${ this.attributes['format'] }">${ durations.formatDuration(timesheet.duration, this.attributes['format']) }</span>` +
+                                `</small>` +
+                            `</h4>` +
+                            `<p>${ timesheet.project.name } (${ timesheet.project.customer.name })</p>` +
+                        `</a>` +
+                    `</li>`;
+        }
+
+        if (this.label.dataset.warning < entries.length) {
+            this.label.classList = 'label label-danger';
+        } else {
+            this.label.classList = 'label label-warning';
+        }
+        this.label.innerText = entries.length;
+        this.itemList.innerHTML = htmlToInsert;
+
+        durations.updateRecords();
+    }
+
+    reloadActiveRecords() {
+        const self = this;
+        const API= this.getContainer().getPlugin('api');
+
+        API.get(this.attributes['api'], {}, function(result) {
+            self.setEntries(result);
+        });
+    }
+
+}

assets/js/plugins/KimaiActiveRecordsDuration.js

@@ -0,0 +1,85 @@
+/*
+ * 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] KimaiActiveRecordsDuration: activate the updates for all active timesheet records on this page
+ */
+
+import moment from 'moment';
+import KimaiPlugin from '../KimaiPlugin';
+
+export default class KimaiActiveRecordsDuration extends KimaiPlugin {
+
+    constructor(selector) {
+        super();
+        this.selector = selector;
+    }
+
+    getId() {
+        return 'timesheet-duration';
+    }
+
+    init() {
+        this.updateRecords();
+        const self = this;
+        const handle = function() { self.updateRecords(); };
+        this._updatesHandler = setInterval(handle, 10000);
+        // this will probably not work as expected, as other event-handler might need longer to update the DOM
+        document.addEventListener('kimai.timesheetUpdate', handle);
+    }
+
+    unregisterUpdates() {
+        clearInterval(this._updatesHandler);
+    }
+
+    updateRecords() {
+        let durations = [];
+        const activeRecords = document.querySelectorAll(this.selector);
+
+        if (activeRecords.length === 0) {
+            document.title = document.querySelector('body').dataset['title'];
+            return;
+        }
+
+        for(let record of activeRecords) {
+            const since = record.getAttribute('data-since');
+            const format = record.getAttribute('data-format');
+            const duration = this.formatDuration(since, format);
+            if (record.getAttribute('data-title') !== null) {
+                durations.push(duration);
+            }
+            record.textContent = duration;
+        }
+
+        if (durations.length === 0) {
+            return;
+        }
+
+        let title = durations.shift();
+        let prefix = ' | ';
+
+        for (let duration of durations.slice(0, 2)) {
+            title += prefix + duration;
+        }
+        document.title = title;
+    }
+
+    formatDuration(since, format) {
+        const duration = moment.duration(moment(new Date()).diff(moment(since)));
+
+        let hours = parseInt(duration.asHours()).toString();
+        let minutes = duration.minutes();
+        let seconds = duration.seconds();
+
+        // special case for hours, as they can overflow the 24h barrier - Kimai does not support days as duration unit
+        if (hours.length === 1) {
+            hours = '0' + hours;
+        }
+
+        return format.replace('%h', hours).replace('%m', ('0'+minutes).substr(-2)).replace('%s', ('0'+seconds).substr(-2));
+    }
+}

assets/js/plugins/KimaiAjaxModalForm.js

@@ -0,0 +1,205 @@
+/*
+ * 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] KimaiAjaxModalForm
+ *
+ * allows to assign the given selector to any element, which then is used as click-handler:
+ * opening a modal with the content from the URL given in the elements 'data-href' or 'href' attribute
+ */
+
+import jQuery from 'jquery';
+import KimaiClickHandlerReducedInTableRow from "./KimaiClickHandlerReducedInTableRow";
+
+export default class KimaiAjaxModalForm extends KimaiClickHandlerReducedInTableRow {
+
+    constructor(selector) {
+        super();
+        this.selector = selector;
+    }
+
+    getId() {
+        return 'modal';
+    }
+
+    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);
+        });
+    }
+
+    openUrlInModal(url, errorHandler) {
+        const self = this;
+
+        if (errorHandler === undefined) {
+            errorHandler = function(xhr, err) {
+                if (xhr.status === undefined || xhr.status !== 403) {
+                    window.location = url;
+                }
+            };
+        }
+
+        jQuery.ajax({
+            url: url,
+            success: function(html) {
+                self._openFormInModal(html);
+            },
+            error: errorHandler
+        });
+    }
+
+    /**
+     * Returns the CSS selector for the modal form.
+     * 
+     * @returns {string}
+     * @private
+     */
+    _getFormIdentifier() {
+        return '#remote_form_modal .modal-content form';
+    }
+
+    _openFormInModal(html) {
+        const self = this;
+
+        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 = this.modal;
+
+        // will be (re-)activated later
+        form.off('submit');
+
+        // load new form from given content
+        if (jQuery(html).find('#form_modal .modal-content').length > 0 ) {
+            // switch classes, in case the modal type changed
+            remoteModal.on('hidden.bs.modal', function () {
+                if (remoteModal.hasClass('modal-danger')) {
+                    remoteModal.removeClass('modal-danger');
+                }
+            });
+
+            if (jQuery(html).find('#form_modal').hasClass('modal-danger')) {
+                remoteModal.addClass('modal-danger');
+            }
+
+            jQuery('#remote_form_modal .modal-content').replaceWith(
+                jQuery(html).find('#form_modal .modal-content')
+            );
+
+            // activate new loaded widgets
+            self.getContainer().getPlugin('form').activateForm(formIdentifier);
+        }
+
+        // show error flash messages
+        let flashMessages = jQuery(html).find(flashMessageIdentifier);
+        if (flashMessages.length > 0) {
+            jQuery('#remote_form_modal .modal-body').prepend(flashMessages);
+        }
+
+        // -----------------------------------------------------------------------
+        // a fix for firefox focus problems with datepicker in modal
+        // see https://github.com/kevinpapst/kimai2/issues/618
+        let enforceModalFocusFn = jQuery.fn.modal.Constructor.prototype.enforceFocus;
+        jQuery.fn.modal.Constructor.prototype.enforceFocus = function() {};
+        remoteModal.on('hidden.bs.modal', function () {
+            jQuery.fn.modal.Constructor.prototype.enforceFocus = enforceModalFocusFn;
+        });
+        // -----------------------------------------------------------------------
+
+        this.getContainer().getPlugin('toolbar').hide();
+        remoteModal.modal('show');
+
+        // the new form that was loaded via ajax
+        form = jQuery(formIdentifier);
+
+        // click handler for modal save button, to send forms via ajax
+        form.on('submit', function(event){
+            const btn = jQuery(formIdentifier + ' button[type=submit]').button('loading');
+            const eventName = form.attr('data-form-event');
+            const events = self.getContainer().getPlugin('event');
+            const alert = self.getContainer().getPlugin('alert');
+
+            event.preventDefault();
+            event.stopPropagation();
+
+            jQuery.ajax({
+                url: form.attr('action'),
+                type: form.attr('method'),
+                data: form.serialize(),
+                success: function(html) {
+                    btn.button('reset');
+                    let hasFieldError = jQuery(html).find('#form_modal .modal-content .has-error').length > 0;
+                    let hasFormError = jQuery(html).find('#form_modal .modal-content ul.list-unstyled li.text-danger').length > 0;
+                    let hasFlashError = jQuery(html).find(flashErrorIdentifier).length > 0;
+
+                    if (hasFieldError || hasFormError || hasFlashError) {
+                        self._openFormInModal(html);
+                    } else {
+                        events.trigger(eventName);
+
+                        // try to find form defined messages first ...
+                        let msg = form.attr('data-msg-success');
+                        if (msg === null || msg === undefined) {
+                            // ... but if none was available, check the response to find server rendered flash-message
+                            let flashMessage = jQuery(html).find('section.content div.row div.alert.alert-success');
+                            if (flashMessage.length > 0) {
+                                let flashContent = flashMessage.contents();
+                                if (flashContent.length === 3) {
+                                    msg = flashContent[2].textContent;
+                                }
+                            }
+                        }
+
+                        // ... and if even that is not available, we use a generic fallback message
+                        if (msg === null || msg === undefined) {
+                            msg = 'action.update.success';
+                        }
+                        remoteModal.modal('hide');
+                        alert.success(msg);
+                    }
+                    return false;
+                },
+                error: function(xhr, err) {
+                    let message = form.attr('data-msg-error');
+                    if (message === null || message === undefined) {
+                        message = 'action.update.error';
+                    }
+                    if (xhr.responseJSON && xhr.responseJSON.message) {
+                        err = xhr.responseJSON.message;
+                    } else if (xhr.status && xhr.statusText) {
+                        err = '[' + xhr.status +'] ' + xhr.statusText;
+                    }
+                    alert.error(message, err);
+                }
+            });
+        });
+    }
+
+}

assets/js/plugins/KimaiAlert.js

@@ -0,0 +1,77 @@
+/*
+ * 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] KimaiAlert: notifications for Kimai
+ */
+
+import Swal from 'sweetalert2'
+import KimaiPlugin from "../KimaiPlugin";
+
+export default class KimaiAlert extends KimaiPlugin {
+
+    getId() {
+        return 'alert';
+    }
+
+    error(title, message) {
+        const translation = this.getContainer().getTranslation();
+        if (translation.has(title)) {
+            title = translation.get(title);
+        }
+        if (translation.has(message)) {
+            message = translation.get(message);
+        }
+        Swal.fire({
+            type: 'error',
+            title: title.replace('%reason%', ''),
+            text: message,
+        });
+    }
+
+    success(message) {
+        const translation = this.getContainer().getTranslation();
+
+        if (translation.has(message)) {
+            message = translation.get(message);
+        }
+
+        Swal.fire({
+            timer: 2000,
+            toast: true,
+            position: 'top-end',
+            showConfirmButton: false,
+            type: 'success',
+            title: message,
+        });
+    }
+
+    /**
+     * Callback receives a value and needs to decide what should happen with it
+     *
+     * @param message
+     * @param callback
+     */
+    question(message, callback) {
+        const translation = this.getContainer().getTranslation();
+
+        if (translation.has(message)) {
+            message = translation.get(message);
+        }
+
+        Swal.fire({
+            title: message,
+            type: 'question',
+            showCancelButton: true,
+            confirmButtonText: translation.get('confirm'),
+            cancelButtonText: translation.get('cancel')
+        }).then((result) => {
+            callback(result.value);
+        });
+    }
+
+}

assets/js/plugins/KimaiAlternativeLinks.js

@@ -0,0 +1,31 @@
+/*
+ * 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] KimaiAlternativeLinks
+ *
+ * allows to assign the given selector to any element, which then is used as click-handler
+ * redirecting to the URL given in the elements 'data-href' or 'href' attribute
+ */
+
+import jQuery from 'jquery';
+import KimaiClickHandlerReducedInTableRow from "./KimaiClickHandlerReducedInTableRow";
+
+export default class KimaiAlternativeLinks extends KimaiClickHandlerReducedInTableRow {
+
+    constructor(selector) {
+        super();
+        this.selector = selector;
+    }
+
+    init() {
+        this._addClickHandlerReducedInTableRow(this.selector, function(href) {
+            window.location = href;
+        });
+    }
+
+}

assets/js/plugins/KimaiAutocomplete.js

@@ -0,0 +1,106 @@
+/*
+ * 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 jQuery from 'jquery';
+import KimaiPlugin from "../KimaiPlugin";
+
+/**
+ * Supporting auto-complete fields via API.
+ * Currently used for timesheet tagging in toolbar and edit dialogs.
+ */
+export default class KimaiAutocomplete extends KimaiPlugin {
+
+    constructor(selector) {
+        super();
+        this.selector = selector;
+    }
+
+    init() {
+        this.minChars = this.getContainer().getConfiguration().get('autoComplete');
+    }
+
+    getId() {
+        return 'autocomplete';
+    }
+
+    splitTagList(val) {
+        return val.split(/,\s*/);
+    }
+
+    extractLastTag(term) {
+        return this.splitTagList(term).pop();
+    }
+
+    activateAutocomplete(selector) {
+        const self = this;
+        
+        jQuery(selector + ' ' + this.selector).each(function(index) {
+            const currentField = jQuery(this);
+            const apiUrl = currentField.attr('data-autocomplete-url');
+            const API = self.getContainer().getPlugin('api');
+
+            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();
+                    }
+                })
+                .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();
+
+                            // 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;
+                        }
+                    }
+                )
+            ;
+        });
+    }
+
+    destroyAutocomplete(selector) {
+        jQuery(selector + ' ' + this.selector).each(function(index) {
+            const currentField = jQuery(this);
+            currentField.autocomplete("destroy");
+            currentField.removeData('autocomplete');
+        });
+    }
+
+}

assets/js/plugins/KimaiClickHandlerReducedInTableRow.js

@@ -0,0 +1,49 @@
+/*
+ * 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] KimaiClickHandlerReducedInTableRow: abstract class
+ */
+
+import jQuery from 'jquery';
+import KimaiPlugin from "../KimaiPlugin";
+
+export default class KimaiClickHandlerReducedInTableRow extends KimaiPlugin {
+
+    _addClickHandlerReducedInTableRow(selector, callback)  {
+        jQuery('body').on('click', selector, function(event) {
+            // just in case an inner element is editable, than this should not be triggered
+            if (event.target.parentNode.isContentEditable || event.target.isContentEditable) {
+                return;
+            }
+
+            // 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')) {
+                    // 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;
+                }
+            }
+
+            event.preventDefault();
+            event.stopPropagation();
+
+            let href = jQuery(this).attr('data-href');
+            if (!href) {
+                href = jQuery(this).attr('href');
+            }
+
+            callback(href);
+        });
+    }
+
+}

assets/js/plugins/KimaiDatatable.js

@@ -0,0 +1,89 @@
+/*
+ * 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] KimaiDatatable: handles functionality for the datatable
+ */
+
+import jQuery from 'jquery';
+import KimaiPlugin from "../KimaiPlugin";
+
+export default class KimaiDatatable extends KimaiPlugin {
+
+    constructor(contentAreaSelector, tableSelector) {
+        super();
+        this.contentArea = contentAreaSelector;
+        this.selector = tableSelector;
+    }
+
+    getId() {
+        return 'datatable';
+    }
+
+    init() {
+        const dataTable = document.querySelector(this.selector);
+
+        // not every page contains a dataTable
+        if (dataTable === null) {
+            return;
+        }
+
+        const attributes = dataTable.dataset;
+        const events = attributes['reloadEvent'];
+
+        if (events === undefined) {
+            return;
+        }
+
+        const self = this;
+        const handle = function() { self.reloadDatatable(); };
+
+        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() {
+        const contentArea = this.contentArea;
+        const durations = this.getContainer().getPlugin('timesheet-duration');
+        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(contentArea).append(loading);
+
+        // remove the empty fields to prevent errors
+        let formData = jQuery(toolbarSelector + ' :input')
+            .filter(function(index, element) {
+                return jQuery(element).val() != '';
+            })
+            .serialize();
+
+        jQuery.ajax({
+            url: form.attr('action'),
+            type: form.attr('method'),
+            data: formData,
+            success: function(html) {
+                jQuery(contentArea).replaceWith(
+                    jQuery(html).find(contentArea)
+                );
+                durations.updateRecords();
+            },
+            error: function(xhr, err) {
+                form.submit();
+            }
+        });
+
+    }
+}

assets/js/plugins/KimaiDatatableColumnView.js

@@ -0,0 +1,94 @@
+/*
+ * 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] KimaiDatatableColumnView: manages the visibility of data-table columns in cookies
+ */
+
+import Cookies from 'js-cookie';
+import jQuery from 'jquery';
+import KimaiPlugin from "../KimaiPlugin";
+
+export default class KimaiDatatableColumnView extends KimaiPlugin {
+
+    constructor(dataAttribute) {
+        super();
+        this.dataAttribute = dataAttribute;
+    }
+
+    getId() {
+        return 'datatable-column-visibility';
+    }
+
+    init() {
+        let dataTable = document.querySelector('[' + this.dataAttribute + ']');
+        if (dataTable === null) {
+            return;
+        }
+        this.id = dataTable.getAttribute(this.dataAttribute);
+        this.modal = document.getElementById('modal_' + this.id);
+        this.bindButtons();
+    }
+
+    bindButtons() {
+        let self = this;
+        this.modal.querySelector('button[data-type=save]').addEventListener('click', function() {
+            self.saveVisibility();
+        });
+        this.modal.querySelector('button[data-type=reset]').addEventListener('click', function() {
+            self.resetVisibility();
+        });
+        for (let checkbox of this.modal.querySelectorAll('form input[type=checkbox]')) {
+            checkbox.addEventListener('click', function () {
+                self.changeVisibility(checkbox.getAttribute('name'));
+            });
+        }
+    }
+
+    saveVisibility() {
+        const form = this.modal.getElementsByTagName('form')[0];
+        let settings = {};
+        for (let checkbox of form.querySelectorAll('input[type=checkbox]')) {
+            settings[checkbox.getAttribute('name')] = checkbox.checked;
+        }
+        Cookies.set(form.getAttribute('name'), JSON.stringify(settings), {expires: 365});
+        jQuery(this.modal).modal('toggle');
+    }
+
+    resetVisibility() {
+        const form = this.modal.getElementsByTagName('form')[0];
+        Cookies.remove(form.getAttribute('name'));
+        for (let checkbox of form.querySelectorAll('input[type=checkbox]')) {
+            if (!checkbox.checked) {
+                checkbox.click();
+            }
+        }
+        jQuery(this.modal).modal('toggle');
+    }
+
+    changeVisibility(columnName) {
+        const table = document.getElementById('datatable_' + this.id).getElementsByClassName('dataTable')[0];
+        let column = 0;
+        let foundColumn = false;
+        for (let columnElement of table.getElementsByTagName('th')) {
+            if (columnElement.getAttribute('data-field') === columnName) {
+                foundColumn = true;
+                break;
+            }
+            column++;
+        }
+
+        if (!foundColumn) {
+            return;
+        }
+
+        for (let rowElement of table.getElementsByTagName('tr')) {
+            rowElement.children[column].classList.toggle('hidden');
+        }
+    }
+
+}

assets/js/plugins/KimaiDatePicker.js

@@ -0,0 +1,62 @@
+/*
+ * 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] KimaiDatePicker: single date selects (currently unused)
+ */
+
+import jQuery from 'jquery';
+import KimaiPlugin from '../KimaiPlugin';
+import moment from 'moment';
+
+export default class KimaiDatePicker extends KimaiPlugin {
+
+    constructor(selector) {
+        super();
+        this.selector = selector;
+    }
+
+    getId() {
+        return 'date-picker';
+    }
+
+    activateDatePicker(selector) {
+        const TRANSLATE = this.getContainer().getTranslation();
+        jQuery(selector + ' ' + this.selector).each(function(index) {
+            let localeFormat = jQuery(this).data('format');
+            jQuery(this).daterangepicker({
+                singleDatePicker: true,
+                showDropdowns: true,
+                autoUpdateInput: false,
+                locale: {
+                    format: localeFormat,
+                    firstDay: 1,
+                    applyLabel: TRANSLATE.get('confirm'),
+                    cancelLabel: TRANSLATE.get('cancel'),
+                    customRangeLabel: TRANSLATE.get('customRange'),
+                    daysOfWeek: moment.weekdaysShort(),
+                    monthNames: moment.months(),
+                }
+            });
+
+            jQuery(this).on('apply.daterangepicker', function(ev, picker) {
+                jQuery(this).val(picker.startDate.format(localeFormat));
+                jQuery(this).trigger("change");
+            });
+        });
+    }
+
+    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

@@ -0,0 +1,78 @@
+/*
+ * 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] KimaiDateRangePicker: activate the (daterange picker) compound field in toolbar
+ */
+
+import jQuery from 'jquery';
+import KimaiPlugin from '../KimaiPlugin';
+import moment from 'moment';
+
+export default class KimaiDateRangePicker extends KimaiPlugin {
+
+    constructor(selector) {
+        super();
+        this.selector = selector;
+    }
+
+    getId() {
+        return 'date-range-picker';
+    }
+
+    activateDateRangePicker(selector) {
+        let translator = this.getContainer().getTranslation();
+        jQuery(selector + ' ' + this.selector).each(function(index) {
+            let localeFormat = jQuery(this).data('format');
+            let separator = jQuery(this).data('separator');
+            let rangesList = {};
+
+            rangesList[translator.get('today')] = [moment(), moment()];
+            rangesList[translator.get('yesterday')] = [moment().subtract(1, 'days'), moment().subtract(1, 'days')];
+            rangesList[translator.get('thisWeek')] = [moment().startOf('week'), moment().endOf('week')];
+            rangesList[translator.get('lastWeek')] = [moment().subtract(1, 'week').startOf('week'), moment().subtract(1, 'week').endOf('week')];
+            rangesList[translator.get('thisMonth')] = [moment().startOf('month'), moment().endOf('month')];
+            rangesList[translator.get('lastMonth')] = [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')];
+            rangesList[translator.get('thisYear')] = [moment().startOf('year'), moment().endOf('year')];
+            rangesList[translator.get('lastYear')] = [moment().subtract(1, 'year').startOf('year'), moment().subtract(1, 'year').endOf('year')];
+
+            jQuery(this).daterangepicker({
+                showDropdowns: true,
+                autoUpdateInput: false,
+                autoApply: false,
+                linkedCalendars: false,
+                locale: {
+                    separator: separator,
+                    format: localeFormat,
+                    firstDay: 1,
+                    applyLabel: translator.get('confirm'),
+                    cancelLabel: translator.get('cancel'),
+                    customRangeLabel: translator.get('customRange'),
+                    daysOfWeek: moment.weekdaysShort(),
+                    monthNames: moment.months(),
+                },
+                ranges: rangesList,
+                alwaysShowCalendars: true
+            });
+
+            jQuery(this).on('apply.daterangepicker', function(ev, picker) {
+                jQuery(this).val(picker.startDate.format(localeFormat) + ' - ' + 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

@@ -0,0 +1,66 @@
+/*
+ * 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] KimaiDateTimePicker: activate the (datetime picker) field in timesheet edit dialog
+ */
+
+import jQuery from 'jquery';
+import KimaiPlugin from '../KimaiPlugin';
+import moment from 'moment';
+
+export default class KimaiDateTimePicker extends KimaiPlugin {
+
+    constructor(selector) {
+        super();
+        this.selector = selector;
+    }
+
+    getId() {
+        return 'date-time-picker';
+    }
+
+    activateDateTimePicker(selector) {
+        let translator = this.getContainer().getTranslation();
+        let configuration = this.getContainer().getConfiguration();
+
+        jQuery(selector + ' ' + this.selector).each(function(index) {
+            let localeFormat = jQuery(this).data('format');
+            jQuery(this).daterangepicker({
+                singleDatePicker: true,
+                timePicker: true,
+                timePicker24Hour: configuration.get('twentyFourHours'),
+                showDropdowns: true,
+                autoUpdateInput: false,
+                locale: {
+                    format: localeFormat,
+                    firstDay: 1,
+                    applyLabel: translator.get('confirm'),
+                    cancelLabel: translator.get('cancel'),
+                    customRangeLabel: translator.get('customRange'),
+                    daysOfWeek: moment.weekdaysShort(),
+                    monthNames: moment.months(),
+                }
+            });
+
+            jQuery(this).on('apply.daterangepicker', function(ev, picker) {
+                jQuery(this).val(picker.startDate.format(localeFormat));
+                jQuery(this).trigger("change");
+            });
+        });
+    }
+
+    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/KimaiEvent.js

@@ -0,0 +1,33 @@
+/*
+ * 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] KimaiEvent: helper to trigger events
+ */
+
+import KimaiPlugin from "../KimaiPlugin";
+
+export default class KimaiEvent extends KimaiPlugin {
+
+    getId() {
+        return 'event';
+    }
+
+    trigger(name, details) {
+        if (name === null || name === undefined) {
+            return;
+        }
+
+        for(let event of name.split(' ')) {
+            let triggerEvent = new Event(event);
+            if (details !== undefined) {
+                triggerEvent = new CustomEvent(name, {detail: details});
+            }
+            document.dispatchEvent(triggerEvent);
+        }
+    }
+}

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,83 @@
+/*
+ * 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) {
+        let options = {};
+        if (container !== undefined) {
+            options = {
+                dropdownParent: $(container),
+            };
+        }
+        options = {...options, ...{
+            language: this.getContainer().getConfiguration().get('locale'),
+            theme: "bootstrap"
+        }};
+        jQuery(selector + ' ' + this.selector).select2(options);
+    }
+    
+    destroySelectPicker(selector) {
+        jQuery(selector + ' ' + this.selector).select2('destroy');
+    }
+    
+    updateOptions(selectIdentifier, data) {
+        let select = jQuery(selectIdentifier);
+        let emptyOption = jQuery(selectIdentifier + ' option[value=""]');
+
+        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 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/KimaiPauseRecord.js

@@ -0,0 +1,41 @@
+/*
+ * 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] KimaiPauseRecord
+ *
+ * allows to pause records
+ * THIS IS JUST A DRAFT FOR THE DOM, IT IS NOT SUPPORTED IN KIMAI ITSELF!
+ */
+
+import jQuery from 'jquery';
+import KimaiPlugin from '../KimaiPlugin';
+
+export default class KimaiPauseRecord extends KimaiPlugin {
+
+    constructor(selector) {
+        super();
+        this.selector = selector;
+    }
+
+    init() {
+        this.activate(this.selector);
+    }
+
+    activate(selector) {
+        jQuery(selector + ' .pull-left i').hover(function () {
+            let link = jQuery(this).parents('a');
+            link.attr('href', link.attr('href').replace('/stop', '/pause'));
+            jQuery(this).removeClass('fa-stop-circle').addClass('fa-pause-circle').addClass('text-orange');
+        },function () {
+            let link = jQuery(this).parents('a');
+            link.attr('href', link.attr('href').replace('/pause', '/stop'));
+            jQuery(this).removeClass('fa-pause-circle').removeClass('text-orange').addClass('fa-stop-circle');
+        });
+    }
+
+}

assets/js/plugins/KimaiRecentActivities.js

@@ -0,0 +1,87 @@
+/*
+ * 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] KimaiRecentActivities: responsible to reload the users recent activities
+ */
+
+import KimaiPlugin from '../KimaiPlugin';
+
+export default class KimaiRecentActivities extends KimaiPlugin {
+
+    constructor(selector) {
+        super();
+        this.selector = selector;
+    }
+
+    getId() {
+        return 'recent-activities';
+    }
+
+    init() {
+        const menu = document.querySelector(this.selector);
+        // the menu can be hidden if user has no permissions to see it
+        if (menu === null) {
+            return;
+        }
+
+        const dropdown = menu.querySelector('ul.dropdown-menu');
+
+        this.attributes = dropdown.dataset;
+        this.itemList = dropdown.querySelector('li > ul.menu');
+
+        const self = this;
+        const handle = function() { self.reloadRecentActivities(); };
+
+        // don't block initial browser rendering
+        setTimeout(handle, 500);
+
+        document.addEventListener('kimai.timesheetStop', handle);
+        document.addEventListener('kimai.activityUpdate', handle);
+        document.addEventListener('kimai.projectUpdate', handle);
+        document.addEventListener('kimai.customerUpdate', handle);
+    }
+
+    emptyList() {
+        this.itemList.innerHTML = '';
+    }
+
+    setEntries(entries) {
+        if (entries.length === 0) {
+            this.emptyList();
+            return;
+        }
+
+        let htmlToInsert = '';
+
+        for (let timesheet of entries) {
+            let label = this.attributes['template']
+                .replace('%customer%', timesheet.project.customer.name)
+                .replace('%project%', timesheet.project.name)
+                .replace('%activity%', timesheet.activity.name);
+
+            htmlToInsert +=
+                `<li>` +
+                    `<a href="${ this.attributes['href'].replace('000', timesheet.id) }" data-event="kimai.timesheetStart kimai.timesheetUpdate" class="api-link" data-method="PATCH" data-msg-error="timesheet.start.error" data-msg-success="timesheet.start.success">` +
+                        `<i class="${ this.attributes['icon'] }"></i> ${ label }` +
+                    `</a>` +
+                `</li>`;
+        }
+
+        this.itemList.innerHTML = htmlToInsert;
+    }
+
+    reloadRecentActivities() {
+        const self = this;
+        const API = this.getContainer().getPlugin('api');
+
+        API.get(this.attributes['api'], {}, function(result) {
+            self.setEntries(result);
+        });
+    }
+
+}

assets/js/plugins/KimaiSelectDataAPI.js

@@ -0,0 +1,81 @@
+/*
+ * 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] KimaiSelectDataAPI: <select> boxes with dynamic data from API
+ */
+
+import jQuery from 'jquery';
+import KimaiPlugin from "../KimaiPlugin";
+
+export default class KimaiSelectDataAPI extends KimaiPlugin {
+
+    constructor(selector) {
+        super();
+        this.selector = selector;
+    }
+
+    getId() {
+        return 'select-data-api';
+    }
+
+    init() {
+        this.activateApiSelects(this.selector);
+    }
+
+    activateApiSelects(selector) {
+        const self = this;
+        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');
+
+            // if the related target select does not exist, we do not need to load the related data
+            if (jQuery(targetSelect).length === 0) {
+                return;
+            }
+
+            if (jQuery(this).val() === '') {
+                if (jQuery(this).attr('data-empty-url') === undefined) {
+                    self._updateSelect(targetSelect, {});
+                    jQuery(targetSelect).attr('disabled', 'disabled');
+                    return;
+                }
+                apiUrl = jQuery(this).attr('data-empty-url').replace('-s-', jQuery(this).val());
+            }
+
+            jQuery(targetSelect).removeAttr('disabled');
+
+            API.get(apiUrl, {}, function(data){
+                self._updateSelect(targetSelect, data);
+            });
+        });
+    }
+
+    _updateSelect(selectName, data) {
+        const options = {};
+        for (const apiData of data) {
+            let title = apiData.parentTitle;
+            if (title === null) {
+                title = '__empty__';
+            }
+            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

@@ -0,0 +1,76 @@
+/*
+ * 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] KimaiThemeInitializer: initialize theme functionality
+ */
+
+import jQuery from 'jquery';
+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);
+                        }
+                    });
+                }
+            }
+        });
+    }
+
+    /**
+     * auto hide success messages, as they are just meant as user feedback and not as a permanent information
+     *
+     * @param {string} selector
+     * @param {integer} interval
+     */
+    registerAutomaticAlertRemove(selector, interval) {
+        const self = this;
+        this._alertRemoveHandler = setInterval(
+            function() {
+                self.hideAlert(selector);
+            },
+            interval
+        );
+    }
+
+    unregisterAutomaticAlertRemove() {
+        clearInterval(this._alertRemoveHandler);
+    }
+
+    /**
+     * @param {string} selector
+     */
+    hideAlert(selector) {
+        jQuery(selector).alert('close');
+    }
+
+}

assets/js/plugins/KimaiToolbar.js

@@ -0,0 +1,232 @@
+/*
+ * 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] KimaiToolbar: some event listener to handle the toolbar/data-table filter, toolbar and navigation
+ */
+
+import jQuery from 'jquery';
+import KimaiPlugin from "../KimaiPlugin";
+
+export default class KimaiToolbar extends KimaiPlugin {
+
+    constructor(formSelector, formSubmitActionClass) {
+        super();
+        this.formSelector = formSelector;
+        this.actionClass = formSubmitActionClass;
+    }
+
+    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(formSelector + " input#page");
+            if (pager.length === 0) {
+                return;
+            }
+            event.preventDefault();
+            event.stopPropagation();
+            let urlParts = jQuery(this).attr('href').split('/');
+            let page = urlParts[urlParts.length-1];
+            pager.val(page);
+            pager.trigger('change');
+            EVENT.trigger('pagination-change');
+            return false;
+        });
+
+    }
+    
+    hide() {
+        const toggle = jQuery(this.getSelector() + ' #searchTerm.dropdown-toggle');
+        if (toggle.parent().hasClass('open')) {
+            toggle.dropdown('toggle');
+        }
+    }
+
+    /**
+     * Triggers an event, that everyone can listen for.
+     */
+    triggerChange() {
+        this.getContainer().getPlugin('event').trigger('toolbar-change');
+    }
+
+    /**
+     * Returns the CSS selector to target the toolbar form.
+     * 
+     * @returns {string}
+     */
+    getSelector() {
+        return this.formSelector;
+    }
+
+}

assets/js/toolbar.js

@@ -1,37 +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.
- */
-$(document).ready(function () {
-
-    //$('.navbar-form select').selectpicker({});
-
-    // DateRange - TODO improve me, so users can type without reloading in between
-    $('.toolbar form input').change(function (event) {
-        $('.toolbar form').submit();
-    });
-
-    $('.toolbar form select').change(function (event) {
-        switch (event.target.id) {
-            case 'customer':
-                if ($(this).val() === '') {
-                    $('.toolbar form select#project').parent().remove();
-                } else {
-                    $('.toolbar form select#project').val('');
-                }
-                $('.toolbar form select#activity').parent().remove();
-                break;
-            case 'project':
-                if ($(this).val() === '') {
-                    $('.toolbar form select#activity').parent().remove();
-                } else {
-                    $('.toolbar form select#activity').val('');
-                }
-                break;
-        }
-        $('.toolbar form').submit();
-    });
-
-});

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

@@ -0,0 +1,26 @@
+/*
+ * 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 'variables';
+@import 'error-page';
+@import 'print';
+@import 'content';
+@import 'content-header';
+@import 'toolbar';
+@import 'sidebar';
+@import 'footer';
+@import 'invoice';
+@import 'datatable';
+@import 'datatable-extensions';
+@import 'calendar';
+@import 'dashboard';
+@import 'navbar';
+@import 'daterangepicker';
+@import 'skins';
+@import 'sweetalert';
+@import 'autocomplete';
+@import 'selectpicker';

assets/sass/autocomplete.scss

@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+.ui-widget {
+  font-size: 1em/*{fsDefault}*/;
+}
+
+.ui-widget.ui-widget-content {
+  border: 1px solid #c5c5c5/*{borderColorDefault}*/;
+}
+
+.ui-widget-content {
+  border: 1px solid #dddddd/*{borderColorContent}*/;
+  background: #ffffff/*{bgColorContent}*/ /*{bgImgUrlContent}*/ /*{bgContentXPos}*/ /*{bgContentYPos}*/ /*{bgContentRepeat}*/;
+  color: #333333/*{fcContent}*/;
+}
+
+.ui-menu {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+  display: block;
+  outline: 0;
+}
+
+.ui-menu .ui-menu-item {
+  margin: 0;
+  cursor: pointer;
+}
+
+.ui-autocomplete {
+  position: absolute;
+  top: 0;
+  left: 0;
+  cursor: default;
+}
+
+.ui-front {
+  z-index: 1200;
+}
+
+.ui-menu .ui-menu-item-wrapper {
+  position: relative;
+  padding: 3px 1em 3px .4em;
+}
+.ui-menu .ui-state-focus,
+.ui-menu .ui-state-active {
+  margin: -1px;
+}
+
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active,
+a.ui-button:active,
+.ui-button:active,
+.ui-button.ui-state-active:hover {
+  border: 1px solid #003eff/*{borderColorActive}*/;
+  background: #007fff/*{bgColorActive}*/ /*{bgImgUrlActive}*/ /*{bgActiveXPos}*/ /*{bgActiveYPos}*/ /*{bgActiveRepeat}*/;
+  font-weight: normal/*{fwDefault}*/;
+  color: #ffffff/*{fcActive}*/;
+}
+.ui-icon-background,
+.ui-state-active .ui-icon-background {
+  border: #003eff/*{borderColorActive}*/;
+  background-color: #ffffff/*{fcActive}*/;
+}
+.ui-state-active a,
+.ui-state-active a:link,
+.ui-state-active a:visited {
+  color: #ffffff/*{fcActive}*/;
+  text-decoration: none;
+}

assets/sass/calendar.scss

@@ -1,7 +1,8 @@
 .popover-content {
     .calendar-entry {
         ul {
-            padding: 0 0 0 10px;
+            padding: 0;
+            list-style-type: none;
         }
     }
 }

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

@@ -0,0 +1,51 @@
+/*
+ * 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 {
+    padding: 15px 0;
+}
+
+@media (min-width: $screen-sm-min) {
+    .content {
+        padding: 15px;
+    }
+}
+
+td {
+    &.timesheet-description {
+        ul {
+            padding-left: 15px;
+        }
+        p {
+            margin: 0;
+        }
+    }
+}
+
+/* ABOUT SCREEN */
+.box-body .menu-icon {
+    width: 35px;
+    height: 35px;
+    border-radius: 50%;
+    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;
+}

assets/sass/datatable-extensions.scss

@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+
+span.label-color,
+span.label-meta,
+span.label-activity,
+span.label-project,
+span.label-customer {
+    display: inline-block;
+    .dot {
+        height: 10px;
+        width: 10px;
+        background-color: $gray-lte;
+        border-radius: 50%;
+        display: inline-block;
+    }
+}
+
+table.dataTable {
+    /* action column */
+    .actions {
+        width: 90px;
+        li.delete a {
+            color: #dd4b39;
+        }
+    }
+    tr {
+        /* summary row - provided in the users own timesheet table */
+        &.summary td {
+            font-weight: bold;
+            border-bottom: 1px solid #ccc;
+        }
+        &.open-edit {
+            cursor: pointer;
+        }
+    }
+    td {
+        /*
+            Make sure that the action buttons do not line-break if another column takes all available space
+            See https://github.com/twbs/bootstrap/issues/9939#issuecomment-37682952
+         */
+        .btn-group {
+            display: flex;
+        }
+        .label {
+            font-size: 85%;
+            font-weight: 500;
+            padding: .3em .6em .3em;
+            line-height: 24px;
+        }
+        span.label-activity,
+        span.label-project,
+        span.label-customer {
+            a {
+                color: unset;
+                padding-bottom: 2px;
+                border-bottom: 1px dotted $gray-lte;
+                &:hover {
+                    border-bottom: 1px dotted darken($gray-lte, 20);
+                }
+            }
+        }
+        span.label-invisible {
+            opacity: 0.8;
+        }
+    }
+}

assets/sass/datatable.scss

@@ -5,6 +5,43 @@
  * file that was distributed with this source code.
  */
 
+/* Loading indicator: overwritten from AdminLTE for positioning and supporting fas classes */
+.box .overlay > .fas,
+section.content .overlay > .fas,
+.overlay-wrapper .overlay > .fas {
+    position: absolute;
+    top: 50vh;
+    left: 50vw;
+    margin-left: -15px;
+    margin-top: -15px;
+    color: #000;
+    font-size: 30px;
+}
+
+.box > .overlay,
+.overlay-wrapper > .overlay,
+section.content > .overlay,
+.box > .loading-img,
+.overlay-wrapper > .loading-img {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+.box .overlay,
+section.content .overlay,
+.overlay-wrapper .overlay {
+    z-index: 50;
+    background: rgba(255, 255, 255, 0.7);
+    border-radius: $box-border-radius;
+}
+.box .overlay.dark,
+section.content .overlay.dark,
+.overlay-wrapper .overlay.dark {
+    background: rgba(0, 0, 0, 0.5);
+}
+
 /*
 dataTables.bootstrap.css
 */
@@ -88,41 +125,47 @@ 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;
 }
 
 table.dataTable thead > tr > th {
-    padding-right: 30px;
+    white-space: nowrap;
 }
 
+/*
+table.dataTable thead > tr > th {
+    padding-right: 30px;
+}
+*/
 table.dataTable th:active {
     outline: none;
 }
@@ -133,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;
 }
@@ -222,3 +265,19 @@ 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;
+    }
+}

assets/sass/daterangepicker.scss

@@ -0,0 +1,12 @@
+
+.drp-calendar {
+    .calendar-table {
+        td.today:not(.active) {
+            background-color: lighten(#357ebd, 40);
+            color: #357ebd;
+        }
+        select.yearselect{
+            width: unset;
+        }
+    }
+}

assets/sass/error-page.scss

@@ -0,0 +1,10 @@
+/*
+ * 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.
+ */
+
+.error-page {
+    margin-bottom: 50px;
+}

assets/sass/footer.scss

@@ -0,0 +1,11 @@
+/*
+ * 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.
+ */
+
+footer.main-footer {
+    padding: 5px;
+    font-size: 80%;
+}

assets/sass/invoice.scss

@@ -0,0 +1,305 @@
+/*
+ * 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.
+ */
+
+.invoice {
+    margin: 0;
+    border: none;
+}
+
+@media (min-width: $screen-sm-min) {
+    .invoice {
+        margin: 25px;
+    }
+}
+
+.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;
+    }
+
+    h2 {
+        font: bold 1.5em sans-serif;
+        margin-bottom: 1em;
+    }
+
+    /* table */
+
+    table {
+        table-layout: fixed;
+        width: 100%;
+    }
+
+    table {
+        border-collapse: separate;
+        border-spacing: 0;
+    }
+
+    /* 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) {
+        text-align: right;
+        width: 20%;
+    }
+
+    /* footer */
+
+    footer {
+        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;
+    }
+
+    #freelancer-invoice {
+        margin: 1em 2em;
+
+        span:empty {
+            display: none;
+        }
+
+        .add, .cut {
+            display: none;
+        }
+    }
+
+    .invoice {
+        width: unset;
+    }
+}

assets/sass/navbar.scss

@@ -0,0 +1,96 @@
+/*
+ * 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.
+ */
+
+.navbar-nav {
+    img.img-circle {
+        max-height: 26px;
+        margin-top: -2px;
+    }
+    li>a.ddt-large {
+        padding: 15px 12px 11px 10px;
+        font-size: 10px;
+    }
+    li.messages-menu ul.menu li {
+        a:hover .pull-left i {
+            color: #dd4b39;
+        }
+        a .pull-left i {
+            color: #444;
+        }
+    }
+    .messages-menu>.dropdown-menu>li .menu>li>a>p {
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+    .messages-menu>.dropdown-menu>li .menu>li>a>h4>span {
+        margin-right: 55px;
+    }
+    .dropdown-menu {
+        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;
+        width: unset !important;
+    }
+    .user-menu {
+        margin-right: 10px;
+        ul {
+            li {
+                a {
+                    &:hover {
+                        background-color: #f4f4f4;
+                        i {
+                            color: $blue;
+                        }
+                    }
+                    color: #444;
+                    i {
+                        padding-right: 10px;
+                    }
+                }
+                hr {
+                    margin: 0;
+                }
+            }
+        }
+    }
+    .notifications-menu>.dropdown-menu>li .menu>li>a:hover i {
+        color: $green;
+    }
+}
+
+@media (max-width: $screen-sm-min) {
+    .navbar-custom-menu>.navbar-nav>li>.dropdown-menu {
+        right: 0;
+    }
+    .navbar-nav .user-menu {
+        margin-right: 0;
+    }
+    .navbar-nav .user-menu.open .dropdown-menu > li > a {
+        padding: 5px 25px 5px 25px
+    }
+}
+
+/*
+.ticktac:hover i.running{
+    color: #4ff131;
+}
+
+li.open .ticktac i.running{
+    color: #4ff131;
+}
+
+.ticktac i.stopped{
+    color: #fff;
+}
+
+.ticktac:hover i.stopped{
+    color: #4ff131;
+}
+.user-panel>.info {
+    left: 40px;
+    padding-top: 0px;
+}
+*/

assets/sass/print.scss

@@ -0,0 +1,10 @@
+/*
+ * 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.
+ */
+
+@media print{
+    .sf-toolbar, .control-sidebar {display: none !important;}
+}

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

@@ -5,13 +5,15 @@
  * 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;
+/* UserPanel is deactivated right now */
+/*
+.user-panel>.info {
+    left: 80px;
 }
+*/
+
 /* Right sidebar with additional tabs for personal settings and "About Kimai" section */
+/*
 .control-sidebar {
     select {
         color: $input-color;
@@ -23,7 +25,17 @@
         }
     }
 }
-/* The filter form available on most pages above the datatable */
-.toolbar form {
-    font-size: $font-size-base;
+*/
+
+@media (min-width: $screen-sm-min) {
+    .sidebar-mini.sidebar-collapse .sidebar-menu li.header {
+        border-top-width: 1px;
+        border-top-style: solid;
+        display: block !important;
+        margin-top: 16px;
+        opacity: 0.4;
+        span {
+            display: none !important;
+        }
+    }
 }

assets/sass/skins.scss

@@ -0,0 +1,26 @@
+
+$skins: blue, blue, black, green, purple, red, yellow;
+
+@each $skinColor in $skins {
+    @media (max-width: $screen-sm-min) {
+        .skin-#{$skinColor} .main-header .navbar .dropdown-menu li.divider {
+            background-color: #ccc;
+        }
+        .skin-#{$skinColor} .main-header .navbar .dropdown-menu li a {
+            color: #444;
+        }
+        .skin-#{$skinColor} .main-header .navbar .dropdown-menu li a:hover {
+            background: #fff;
+        }
+
+        .skin-#{$skinColor}-light .main-header .navbar .dropdown-menu li.divider {
+            background-color: #ccc;
+        }
+        .skin-#{$skinColor}-light .main-header .navbar .dropdown-menu li a {
+            color: #444;
+        }
+        .skin-#{$skinColor}-light .main-header .navbar .dropdown-menu li a:hover {
+            background: #fff;
+        }
+    }
+}

assets/sass/sweetalert.scss

@@ -0,0 +1,3 @@
+.swal2-popup {
+    font-size: unset;
+}

assets/sass/toolbar.scss

@@ -0,0 +1,90 @@
+/*
+ * 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.
+ */
+
+.toolbar-pad {
+    padding: 10px;
+}
+
+/* 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 {
+                display: inline-block;
+                width: 100%;
+                vertical-align: middle;
+            }
+            .control-label {
+                width: 100%;
+            }
+            .input-group {
+                width: 100%;
+            }
+        }
+    }
+    .toolbar-pad {
+        padding: 10px 0;
+    }
+}
+
+/* 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

@@ -0,0 +1,128 @@
+/*
+ * 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 "~bootstrap-sass/assets/stylesheets/bootstrap/variables";
+
+/**
+ * A simple one to one clone of /node_modules/admin-lte/build/less/variables.less
+ */
+
+// COLORS
+// --------------------------------------------------------
+// Primary
+//$light-blue: #3c8dbc;
+// Danger
+$red: #dd4b39;
+// Success
+$green: #00a65a;
+// Info
+//$aqua: #00c0ef;
+// Warning
+//$yellow: #f39c12;
+$blue: #0073b7;
+//$navy: #001F3F;
+//$teal: #39CCCC;
+//$olive: #3D9970;
+//$lime: #01FF70;
+//$orange: #FF851B;
+//$fuchsia: #F012BE;
+//$purple: #605ca8;
+//$maroon: #D81B60;
+//$black: #111;
+$gray-lte: #d2d6de;
+
+// LAYOUT
+// --------------------------------------------------------
+//
+// Side bar and logo width
+//$sidebar-width: 230px;
+//
+// Link colors (Aka: <a> tags)
+//$link-color: $light-blue;
+//$link-hover-color: lighten($link-color, 15%);
+//
+// Body background (Affects main content background only)
+//$body-bg: #ecf0f5; // DEPRECATED
+//$content-bg: #ecf0f5;
+//
+// SIDEBAR SKINS
+// --------------------------------------------------------
+//
+// Dark sidebar
+//$sidebar-dark-bg: #222d32;
+//$sidebar-dark-hover-bg: darken($sidebar-dark-bg, 2%);
+//$sidebar-dark-color: lighten($sidebar-dark-bg, 60%);
+//$sidebar-dark-hover-color: #fff;
+//$sidebar-dark-submenu-bg: lighten($sidebar-dark-bg, 5%);
+//$sidebar-dark-submenu-color: lighten($sidebar-dark-submenu-bg, 40%);
+//$sidebar-dark-submenu-hover-color: #fff;
+//
+// Light sidebar
+//$sidebar-ligh//t-bg: #f9fafc;
+//$sidebar-light-hover-bg: lighten(#f0f0f1, 1.5%);
+//$sidebar-light-color: #444;
+//$sidebar-light-hover-color: #000;
+//$sidebar-light-submenu-bg: $sidebar-light-hover-bg;
+//$sidebar-light-submenu-color: #777;
+//$sidebar-light-submenu-hover-color: #000;
+//
+// sidebar-expanded-on-hover
+//$sidebar-expanded-shadow: 3px 0 8px rgba(0,0,0,.125);
+//
+// CONTROL SIDEBAR
+// --------------------------------------------------------
+//$control-sidebar-width: $sidebar-width;
+//
+// BOXES
+// --------------------------------------------------------
+//$box-border-color: #f4f4f4;
+$box-border-radius: 3px;
+//$box-footer-bg: #fff;
+//$box-boxshadow: 0 1px 1px rgba(0, 0, 0, .1);
+//$box-padding: 10px;
+//
+// Box variants
+//$box-default-border-top-color: #d2d6de;
+//
+// BUTTONS
+// --------------------------------------------------------
+//$btn-boxshadow: none;
+//
+// PROGRESS BARS
+// --------------------------------------------------------
+//$progress-bar-border-radius: 1px;
+//$progress-bar-sm-border-radius: 1px;
+//$progress-bar-xs-border-radius: 1px;
+//
+// FORMS
+// --------------------------------------------------------
+//$input-radius: 0;
+//
+// BUTTONS
+// --------------------------------------------------------
+//
+// Border radius for non flat buttons
+//$btn-border-radius: 3px;
+//
+// DIRECT CHAT
+// --------------------------------------------------------
+//$direct-chat-height: 250px;
+//$direct-chat-default-msg-bg: $gray-lte;
+//$direct-chat-default-font-color: #444;
+//$direct-chat-default-msg-border-color: $gray-lte;
+//
+// CHAT WIDGET
+// --------------------------------------------------------
+//$attachment-border-radius: 3px;
+//
+// TRANSITIONS SETTINGS
+// --------------------------------------------------------
+//
+// Transition global options
+//$transition-speed: .3s;
+//$transition-fn: ease-in-out;
+//

bin/console

@@ -19,7 +19,7 @@ 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');
 }
 
 $input = new ArgvInput();

composer.json

@@ -3,59 +3,83 @@
     "license": "MIT",
     "type": "project",
     "description": "Kimai Time-Tracking 2",
+    "authors": [
+        {
+            "name": "Kevin Papst",
+            "homepage": "https://www.kevinpapst.de"
+        }
+    ],
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.2",
+        "ext-gd": "*",
         "ext-intl": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*",
         "ext-pdo": "*",
-        "ext-pdo_sqlite": "*",
-        "beberlei/DoctrineExtensions": "^1.0",
+        "ext-zip": "*",
+        "beberlei/doctrineextensions": "^1.2",
         "erusev/parsedown": "^1.6",
-        "friendsofsymfony/rest-bundle": "^2.3",
-        "friendsofsymfony/user-bundle": "~2.0",
-        "jms/serializer-bundle": "^2.4",
-        "kevinpapst/adminlte-bundle": "^2.0",
+        "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": "~3.0",
+        "kimai/kimai2-composer": "^0.1",
+        "laravolt/avatar": "^3.0",
+        "mpdf/mpdf": "^7.1",
         "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",
+        "psr/log": "^1.1",
         "sensio/framework-extra-bundle": "^5.2",
         "symfony/asset": "^4.0",
         "symfony/console": "^4.0",
+        "symfony/debug-pack": "^1.0",
         "symfony/dotenv": "^4.0",
         "symfony/expression-language": "^4.0",
         "symfony/flex": "^1.0",
         "symfony/form": "^4.0",
         "symfony/framework-bundle": "^4.0",
-        "symfony/lts": "^4@dev",
-        "symfony/monolog-bundle": "^3.1",
+        "symfony/intl": "^4.0",
+        "symfony/monolog-bundle": "^3.4",
         "symfony/orm-pack": "^1.0",
-        "symfony/profiler-pack": "^1.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/webpack-encore-pack": "^1.0",
+        "symfony/webpack-encore-bundle": "^1.5",
         "symfony/yaml": "^4.0",
         "twig/extensions": "^1.5",
         "white-october/pagerfanta-bundle": "^1.1"
     },
     "require-dev": {
         "dama/doctrine-test-bundle": "^5.0",
-        "doctrine/doctrine-fixtures-bundle": "^3.0",
+        "doctrine/doctrine-fixtures-bundle": "^3.2",
         "friendsofphp/php-cs-fixer": "^2.10",
         "fzaninotto/faker": "^1.8",
-        "phpunit/phpunit": "^7.0",
-        "squizlabs/php_codesniffer": "^3.2",
+        "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": "^8.0",
         "symfony/browser-kit": "^4.0",
         "symfony/css-selector": "^4.0",
-        "symfony/debug-pack": "^1.0",
-        "symfony/maker-bundle": "^1.0",
+        "symfony/maker-bundle": "^1.12",
         "symfony/phpunit-bridge": "^4.0",
+        "symfony/profiler-pack": "^1.0",
         "symfony/thanks": "^1.0",
         "symfony/web-server-bundle": "^4.0"
     },
     "config": {
+        "platform": {
+            "php": "7.2"
+        },
         "preferred-install": {
             "*": "dist"
         },
@@ -63,7 +87,8 @@
     },
     "autoload": {
         "psr-4": {
-            "App\\": "src/"
+            "App\\": "src/",
+            "KimaiPlugin\\": "var/plugins/"
         }
     },
     "autoload-dev": {
@@ -77,6 +102,10 @@
         "symfony/polyfill-php70": "*",
         "symfony/polyfill-php56": "*"
     },
+    "suggest": {
+        "ext-mbstring": "If ext-mbstring is not available you MUST install symfony/polyfill-mbstring",
+        "zendframework/zend-ldap": "For LDAP authentication with Kimai"
+    },
     "scripts": {
         "auto-scripts": {
             "cache:clear": "symfony-cmd",
@@ -87,7 +116,22 @@
         ],
         "post-update-cmd": [
             "@auto-scripts"
-        ]
+        ],
+        "kimai:code-check":  [
+            "@kimai:codestyle",
+            "@kimai:phpstan",
+            "@kimai:tests-unit",
+            "@kimai:tests-integration"
+        ],
+        "kimai:tests": "vendor/bin/phpunit tests/",
+        "kimai:tests-unit": "vendor/bin/phpunit --exclude-group integration tests/",
+        "kimai:tests-integration": "vendor/bin/phpunit --group integration tests/",
+        "kimai:phpstan": [
+            "vendor/bin/phpstan analyse src -c phpstan.neon --level=3",
+            "vendor/bin/phpstan analyse tests -c tests/phpstan.neon --level=4"
+        ],
+        "kimai:codestyle": "vendor/bin/php-cs-fixer fix --dry-run --verbose --show-progress=none",
+        "kimai:codestyle-fix": "vendor/bin/php-cs-fixer fix"
     },
     "conflict": {
         "symfony/symfony": "*"
@@ -95,7 +139,8 @@
     "extra": {
         "symfony": {
             "id": "01C3FWRDJJEX9K6Y3A4XDFXPBR",
-            "allow-contrib": true
+            "allow-contrib": true,
+            "require": "4.3.*"
         }
     }
 }

config/bundles.php

@@ -18,8 +18,10 @@ return [
     Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true],
     DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true],
     KevinPapst\AdminLTEBundle\AdminLTEBundle::class => ['all' => true],
+    JMS\SerializerBundle\JMSSerializerBundle::class => ['all' => true],
     FOS\UserBundle\FOSUserBundle::class => ['all' => true],
     FOS\RestBundle\FOSRestBundle::class => ['all' => true],
     Nelmio\ApiDocBundle\NelmioApiDocBundle::class => ['all' => true],
-    JMS\SerializerBundle\JMSSerializerBundle::class => ['all' => true],
+    Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
+    Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
 ];

config/packages/admin_lte.yaml

@@ -1,37 +1,31 @@
-
-#
 # Configuration file for the AdminLTE bundle
 #
 # For more information about the settings visit:
 # https://github.com/kevinpapst/AdminLTEBundle/blob/master/Resources/docs/configurations.md
-#
 admin_lte:
     options:
         # default image for missing user avatar images
         default_avatar: build/images/default_avatar.png
         # the color skin
-        skin: skin-blue
+        skin: skin-green
         # if activated, the boxed_layout will be deactivated
-        fixed_layout: false
+        fixed_layout: true
         # boxed layout (true) or full-screen (false)
         boxed_layout: false
         # initial collapsed state of the sidebar
         collapsed_sidebar: false
         # whether the logo collapses or not
-        mini_sidebar: false
-        # tabs in the control_sidebar (right screen) can be configured, see:
-        # https://github.com/kevinpapst/AdminLTEBundle/blob/master/Resources/docs/control_sidebar.md
-        control_sidebar:
-            settings:
-                icon: "fas fa-cogs"
-                controller: 'App\Controller\SidebarController::settingsAction'
-            home:
-                icon: "fas fa-question-circle"
-                template: sidebar/home.html.twig
+        mini_sidebar: true
+
+    theme:
+        widget:
+          use_footer: false
+          type: secondary
+          solid: false
 
     routes:
         adminlte_profile: user_profile
-        adminlte_welcome: dashboard
+        adminlte_welcome: homepage
         adminlte_login: fos_user_security_login
         adminlte_login_check: fos_user_security_check
         adminlte_registration: fos_user_registration_register

config/packages/assets.yaml

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

config/packages/dev/jms_serializer.yaml

@@ -1,6 +1,6 @@
 jms_serializer:
     visitors:
-        json:
+        json_serialization:
             options:
                 - JSON_PRETTY_PRINT
                 - JSON_UNESCAPED_SLASHES

config/packages/dev/swiftmailer.yaml

@@ -1,4 +1,4 @@
 # See https://symfony.com/doc/current/email/dev_environment.html
 swiftmailer:
     #  send all emails to a specific address
-    #delivery_addresses: ['me@example.com']
+    # delivery_addresses: ['me@example.com']

config/packages/doctrine.yaml

@@ -7,24 +7,32 @@ parameters:
 
 doctrine:
     dbal:
-        # configure these for your database server
-        driver: 'pdo_mysql'
-        server_version: '5.7'
-        charset: utf8mb4
-        default_table_options:
-            charset: utf8mb4
-            collate: utf8mb4_unicode_ci
+        default_connection: default
+        connections:
+            default:
+                url: '%env(resolve:DATABASE_URL)%'
+                driver: 'pdo_mysql'
+                # this setting prevents automatic database detection and finds a lot of false-negatives on doctrine:migrations:diff
+                # for null columns with MariaDB. Each migration tries to convert EVERY nullable column.
+                # server_version: '5.7'
+                charset: utf8mb4
+                default_table_options:
+                    charset: utf8mb4
+                    collate: utf8mb4_unicode_ci
 
-        # With Symfony 3.3, remove the `resolve:` prefix
-        url: '%env(resolve:DATABASE_URL)%'
+        types:
+            datetime: App\Doctrine\UTCDateTimeType
     orm:
         auto_generate_proxy_classes: '%kernel.debug%'
-        naming_strategy: doctrine.orm.naming_strategy.underscore
-        auto_mapping: true
-        mappings:
-            App:
-                is_bundle: false
-                type: annotation
-                dir: '%kernel.project_dir%/src/Entity'
-                prefix: 'App\Entity'
-                alias: Kimai
+        default_entity_manager: default
+        entity_managers:
+            default:
+                connection: default
+                naming_strategy: doctrine.orm.naming_strategy.underscore
+                auto_mapping: true
+                mappings:
+                    App:
+                        type: annotation
+                        dir: '%kernel.project_dir%/src/Entity'
+                        prefix: 'App\Entity'
+                        alias: Kimai

config/packages/fos_rest.yaml

@@ -1,16 +1,16 @@
 fos_rest:
-#    disable_csrf_role: ROLE_API
+#    disable_csrf_role: IS_AUTHENTICATED_ANONYMOUSLY
 #    access_denied_listener:
 #        enabled:              false
 #        service:              null
 #        formats:
 #            name:                 ~
 #    unauthorized_challenge:  null
-#    param_fetcher_listener:
-#        enabled:              false
+    param_fetcher_listener:
+        enabled:              true
 #        force:                false
 #        service:              null
-#    cache_dir:            '%kernel.cache_dir%/fos_rest'
+    cache_dir:            '%kernel.cache_dir%/fos_rest'
 #    allowed_methods_listener:
 #        enabled:              false
 #        service:              null
@@ -18,8 +18,8 @@ fos_rest:
         default_format: json
         include_format: true
 #        prefix_methods:       true
-#    body_converter:
-#        enabled:              false
+    body_converter:
+        enabled:              true
 #        validate:             false
 #        validation_errors_argument:  validationErrors
 #    service:
@@ -29,10 +29,10 @@ fos_rest:
 #        view_handler:         fos_rest.view_handler.default
 #        inflector:            fos_rest.inflector.doctrine
 #        validator:            validator
-#    serializer:
+    serializer:
 #        version:              null
 #        groups:               []
-#        serialize_null:       false
+        serialize_null:       true
     view:
         default_engine:       twig
 #        force_redirects:
@@ -46,8 +46,8 @@ fos_rest:
 #            name:                 ~
 #        templating_formats:
 #            name:                 ~
-#        view_response_listener:
-#            enabled:              true
+        view_response_listener:
+            enabled:              true
 #            force:                true
 #            service:              null
         failed_validation:    400
@@ -67,16 +67,16 @@ fos_rest:
         messages:
             'Symfony\Component\Routing\Exception\ResourceNotFoundException': true
             'Symfony\Component\HttpKernel\Exception\NotFoundHttpException': true
-#    body_listener:
-#        enabled:              true
+    body_listener:
+        enabled:              true
 #        service:              null
 #        default_format:       null
 #        throw_exception_on_unsupported_content_type:  false
 #        decoders:
 #            name:                 ~
-#        array_normalizer:
-#            service:              null
-#            forms:                false
+        array_normalizer:
+            service:              fos_rest.normalizer.camel_keys
+            forms:                true
     format_listener:
         enabled: true
 #        service:              null

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/jms_serializer.yaml

@@ -1,6 +1,9 @@
 jms_serializer:
+    handlers:
+        datetime:
+            default_format: 'Y-m-d\TH:i:sO' # DATE_ISO8601
     visitors:
-        xml:
+        xml_serialization:
             format_output: '%kernel.debug%'
     metadata:
         directories:
@@ -10,3 +13,12 @@ jms_serializer:
             App:
                 namespace_prefix: "App"
                 path: "%kernel.root_dir%/../config/serializer/App"
+        warmup:
+            paths:
+                included:
+                    - "%kernel.root_dir%/Entity/"
+                    - "%kernel.root_dir%/API/Model/"
+                    - "%kernel.root_dir%/../vendor/friendsofsymfony/user-bundle/Model"
+                excluded: []
+    property_naming:
+        id: 'jms_serializer.identical_property_naming_strategy'

config/packages/kimai.yaml

@@ -1,112 +1,191 @@
+# ---------------------------------------------------------------------------------------------
+# DO NOT EDIT THIS FILE, INSTEAD CREATE THE FILE "local.yaml" AND ADD YOUR SETTINGS IN THERE.
+# See https://www.kimai.org/documentation/configurations.html
+#
+# Be aware that this file is YAML format and the indentation is important.
+# Each config level needs to be indented with 4 additional spaces.
+# ---------------------------------------------------------------------------------------------
 kimai:
 
-    # Settings for the user management and login forms
-    user:
-        registration: true
-        password_reset: true
+# --------------------------------------------------------------------------------
+# AUTHENTICATION
+# You can disable some user management functions in the authentication screens.
+# Both settings default to "true", see https://www.kimai.org/documentation/users.html
+# --------------------------------------------------------------------------------
+#    user:
+#        registration: false
+#        password_reset: false
+# --------------------------------------------------------------------------------
 
-    # All configs related to timesheet and record management
+
+# --------------------------------------------------------------------------------
+# TIME-TRACKING
+# All configs related to time-tracking, timesheets and record management
+# --------------------------------------------------------------------------------
     timesheet:
 
-        # Whether we display start and end time columns (false) or durations only (true).
-        # Setting this to true will also change the "edit timesheet" forms, more infos available in the configurations docu.
-        duration_only: false
+        # renders timesheet descriptions with markdown
+        markdown_content: false
+
+        # The time-tracking mode that should be used.
+        # See https://www.kimai.org/documentation/timesheet.html#tracking-modes
+        # mode: default
+
+        # The default time to pre-fill the "create timesheet" form (in some cases).
+        # This setting is only respected by some timetracking modes and not in all situations.
+        #
+        # Accepted formats, see
+        # - https://www.php.net/manual/en/datetime.formats.php
+        # - https://www.php.net/manual/en/datetime.formats.time.php
+        # default_begin: now
 
         # 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.
-        # Please read var/docs/configurations.md to find out more about rounding rules
+        # 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
 
-        # 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".
-        # Please read var/docs/configurations.md to find out more about rates rules
-        # rates:
-        #    weekend:
-        #        days: ['saturday','sunday']
-        #        factor: 1.5
+#       # 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
+# --------------------------------------------------------------------------------
 
-    # All configs related to the invoice administration
-    invoice:
-        renderer:
-            default: 'App\Controller\InvoiceController::invoiceAction'
-            timesheet: 'App\Controller\InvoiceController::timesheetAction'
-        calculator:
-            default: 'App\Invoice\DefaultCalculator'
-            short: 'App\Invoice\ShortInvoiceCalculator'
-        number_generator:
-            default: 'App\Invoice\DateNumberGenerator'
 
-    # Language specific settings, like the date formats
-    languages:
-        de:
-            date_short: 'd.m.Y'
-            duration: '%%h:%%m Stunden'
-            duration_short: '%%h:%%m h'
-        en:
-            date_short: 'Y-m-d'
-            duration: '%%h:%%m hours'
-            duration_short: '%%h:%%m h'
-        it:
-            date_short: 'd.m.Y'
-            duration: '%%h:%%m h'
-            duration_short: '%%h:%%m h'
-        fr:
-            date_short: 'd/m/Y'
-            duration: '%%h h %%m min'
-            duration_short: '%%h:%%m h'
-        es:
-            date_short: 'd.m.Y'
-            duration: '%%h:%%m h'
-            duration_short: '%%h:%%m h'
-        ru:
-            date_short: 'd.m.Y'
-            duration: '%%h:%%m Часов'
-            duration_short: '%%h:%%m h'
+# --------------------------------------------------------------------------------
+# PERMISSIONS
+# Find out more about the configurable permission system at:
+# https://www.kimai.org/documentation/permissions.html
+# --------------------------------------------------------------------------------
+    permissions:
+        # 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']
+            ACTIVITIES_TEAM: ['view_activity','create_activity','edit_teamlead_activity','budget_teamlead_activity']
+            PROJECTS: ['view_project','create_project','edit_project','budget_project','delete_project','permissions_project']
+            PROJECTS_TEAM: ['view_project','edit_teamlead_project','budget_teamlead_project','permissions_teamlead_project']
+            CUSTOMERS: ['view_customer','create_customer','edit_customer','budget_customer','delete_customer','permissions_customer']
+            CUSTOMERS_TEAM: ['view_customer','edit_teamlead_customer','budget_teamlead_customer']
+            INVOICE: ['view_invoice','create_invoice']
+            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','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: ['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','delete_own_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_TEAM','@PROJECTS_TEAM','@CUSTOMERS_TEAM','@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']
+        # add or remove single permissions
+        roles:
+            ROLE_USER: []
+            ROLE_TEAMLEAD: []
+            ROLE_ADMIN: []
+            ROLE_SUPER_ADMIN: []
+# --------------------------------------------------------------------------------
 
-    # timesheet calendar configuration
-    calendar:
-        week_numbers: true
-        day_limit: 4
-        businessHours:
-            days: [1, 2, 3, 4, 5]
-            begin: '08:00'
-            end: '20:00'
 
-        # You can configure unlimited google calendars to display events for your company (e.g. holidays)
-        # Please read var/docs/configurations.md to find out more about calendar integration
-        # google:
-        #     api_key: 'your-restricted-google-api-key'
-        #     sources:
-        #         holidays:
-        #             id: 'de.german#holiday@group.v.calendar.google.com'
-        #             color: '#ccc'
+# --------------------------------------------------------------------------------
+# CALENDAR Configuration
+# See documentation at https://www.kimai.org/documentation/calendar.html
+# --------------------------------------------------------------------------------
+#    calendar:
+#        week_numbers: true
+#        weekends: true
+#        day_limit: 4
+#        slot_duration: '00:30:00'
+#        businessHours:
+#            days: [1, 2, 3, 4, 5]
+#            begin: '08:00'
+#            end: '18:00'
+#        visibleHours:
+#            begin: '00:00'
+#            end: '24:00'
+#
+#        # You can configure unlimited google calendars to display events for your company (e.g. holidays)
+#        google:
+#            api_key: 'your-restricted-google-api-key'
+#            sources:
+#                holidays:
+#                    id: 'de.german#holiday@group.v.calendar.google.com'
+#                    color: '#ccc'
+# --------------------------------------------------------------------------------
 
-    # theme related settings, will be available as twig globals at "kimai_context.*"
-    # please see documentation at var/docs/theme.md
-    theme:
-        # display a warning color if the user has at least X active recordings
-        active_warning: 3
-        # fallback color for all widgets that don't have a dedicated color
-        # possible options: blue, black, purple, yellow, red, green
-        box_color: 'green'
 
-    # Dashboard widget sections, please see documentation at var/docs/dashboard.md
+# --------------------------------------------------------------------------------
+# INVOICES
+# --------------------------------------------------------------------------------
+#    invoice:
+#        # all files in these directories will be used as invoice documents (if supported by a renderer)
+#        documents:
+#            - 'var/invoices/'
+#            - 'templates/invoice/renderer/'
+# --------------------------------------------------------------------------------
+
+
+# --------------------------------------------------------------------------------
+# DASHBOARD
+# Using the configurable widget sections.
+# See documentation at https://www.kimai.org/documentation/dashboard.html
+# --------------------------------------------------------------------------------
     dashboard:
         user_duration:
-            title: dashboard.you
+            title: stats.yourWorkingHours
             order: 10
             permission: ROLE_USER
-            widgets: [userDurationToday, userDurationWeek, userDurationMonth, userDurationYear]
+            type: '\App\Widget\Type\CompoundChart'
+            widgets: [DailyWorkingTimeChart, userDurationToday, userDurationWeek, userDurationMonth, userDurationYear]
         user_rates:
             title: ~
             order: 20
-            permission: ROLE_USER
+            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
@@ -120,34 +199,113 @@ kimai:
         rates:
             title: ~
             order: 50
-            permission: ROLE_ADMIN
+            permission: view_rate_other_timesheet
             widgets: [amountToday, amountWeek, amountMonth, amountYear]
+# --------------------------------------------------------------------------------
 
-    # All available widgets, please see documentation at var/docs/dashboard.md
-    widgets:
-        userDurationToday: { title: stats.durationToday, query: duration, user: true, begin: '00:00:00', end: '23:59:59', icon: duration, color: green }
-        userDurationWeek: { title: stats.durationWeek, query: duration, user: true, begin: 'monday this week 00:00:00', end: 'sunday this week 23:59:59', icon: duration, color: blue }
-        userDurationMonth: { title: stats.durationMonth, query: duration, user: true, begin: 'first day of this month 00:00:00', end: 'last day of this month 23:59:59', icon: duration, color: purple }
-        userDurationYear: { title: stats.durationYear, query: duration, user: true, begin: '01 january this year 00:00:00', end: '31 december this year 23:59:59', icon: duration, color: yellow }
-        userDurationTotal: { title: stats.durationTotal, query: duration, user: true, icon: duration, color: red }
-        userAmountToday: { title: stats.amountToday, query: rate, user: true, begin: '00:00:00', end: '23:59:59', icon: money, color: green }
-        userAmountWeek: { title: stats.amountWeek, query: rate, user: true, begin: 'monday this week 00:00:00', end: 'sunday this week 23:59:59', icon: money, color: blue }
-        userAmountMonth: { title: stats.amountMonth, query: rate, user: true, begin: 'first day of this month 00:00:00', end: 'last day of this month 23:59:59', icon: money, color: purple }
-        userAmountYear: { title: stats.amountYear, query: rate, user: true, begin: '01 january this year 00:00:00', end: '31 december this year 23:59:59', icon: money, color: yellow }
-        userAmountTotal: { title: stats.amountTotal, query: rate, user: true, icon: money, color: red }
-        durationToday: { title: stats.durationToday, query: duration, begin: '00:00:00', end: '23:59:59', icon: duration, color: green }
-        durationWeek: { title: stats.durationWeek, query: duration, begin: 'monday this week 00:00:00', end: 'sunday this week 23:59:59', icon: duration, color: blue }
-        durationMonth: { title: stats.durationMonth, query: duration, begin: 'first day of this month 00:00:00', end: 'last day of this month 23:59:59', icon: duration, color: purple }
-        durationYear: { title: stats.durationYear, query: duration, begin: '01 january this year 00:00:00', end: '31 december this year 23:59:59', icon: duration, color: yellow }
-        durationTotal: { title: stats.durationTotal, query: duration, icon: duration, color: red }
-        amountToday: { title: stats.amountToday, query: rate, begin: '00:00:00', end: '23:59:59', icon: money, color: green }
-        amountWeek: { title: stats.amountWeek, query: rate, begin: 'monday this week 00:00:00', end: 'sunday this week 23:59:59', icon: money, color: blue }
-        amountMonth: { title: stats.amountMonth, query: rate, begin: 'first day of this month 00:00:00', end: 'last day of this month 23:59:59', icon: money, color: purple }
-        amountYear: { title: stats.amountYear, query: rate, begin: '01 january this year 00:00:00', end: '31 december this year 23:59:59', icon: money, color: yellow }
-        amountTotal: { title: stats.amountTotal, query: rate, icon: money, color: red }
-        activeUsersToday: { title: stats.userActiveToday, query: users, begin: '00:00:00', end: '23:59:59', icon: user, color: green }
-        activeUsersWeek: { title: stats.userActiveWeek, query: users, begin: 'monday this week 00:00:00', end: 'sunday this week 23:59:59', icon: user, color: blue }
-        activeUsersMonth: { title: stats.userActiveMonth, query: users, begin: 'first day of this month 00:00:00', end: 'last day of this month 23:59:59', icon: user, color: purple }
-        activeUsersYear: { title: stats.userActiveYear, query: users, begin: '01 january this year 00:00:00', end: '31 december this year 23:59:59', icon: user, color: yellow }
-        activeUsersTotal: { title: stats.userActiveTotal, query: users, icon: user, color: red }
-        activeRecordings: { title: stats.activeRecordings, query: active, icon: duration, color: red }
+
+# --------------------------------------------------------------------------------
+# LANGUAGES
+# Locale specific settings, like date formats
+# --------------------------------------------------------------------------------
+    languages:
+        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'
+        cs:
+            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:
+            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'
+        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'
+        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'
+        fr:
+            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 h %%m'
+        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'
+            duration: '%%h:%%m h'
+        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'
+        ko:
+            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'
+        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'
+        sk:
+            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'
+        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'
+        tr:
+            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'
+# --------------------------------------------------------------------------------
+
+
+# --------------------------------------------------------------------------------
+# STORAGE
+# If you want to use directories outside the Kimai directory, change these
+# --------------------------------------------------------------------------------
+    data_dir: '%kernel.project_dir%/var/data'
+    plugin_dir: '%kernel.project_dir%/var/plugins'
+# --------------------------------------------------------------------------------

config/packages/nelmio_api_doc.yaml

@@ -1,23 +1,52 @@
 nelmio_api_doc:
     models:
         use_jms: true
+        names:
+            - { alias: CustomerEditForm,          type: App\Form\API\CustomerApiEditForm,         groups: [Default, Entity, Customer] }
+            - { alias: CustomerEntity,            type: App\Entity\Customer,                      groups: [Default, Entity, Customer] }
+            - { alias: CustomerMetaField,         type: App\Entity\CustomerMeta,                  groups: [Default, Customer] }
+            - { alias: CustomerCollection,        type: App\Entity\Customer,                      groups: [Default, Collection, Customer] }
+            - { alias: ProjectEditForm,           type: App\Form\API\ProjectApiEditForm,          groups: [Default, Entity, Project] }
+            - { alias: ProjectEntity,             type: App\Entity\Project,                       groups: [Default, Entity, Project] }
+            - { alias: ProjectMetaField,          type: App\Entity\ProjectMeta,                   groups: [Default, Project] }
+            - { alias: ProjectCollection,         type: App\Entity\Project,                       groups: [Default, Collection, Project] }
+            - { alias: ActivityEditForm,          type: App\Form\API\ActivityApiEditForm,         groups: [Default, Entity, Activity] }
+            - { 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: UserCollection,            type: App\Entity\User,                          groups: [Default, Collection, User] }
+            - { alias: TeamEntity,                type: App\Entity\Team,                          groups: [Default, Entity, Team] }
+            - { alias: TeamCollection,            type: App\Entity\Team,                          groups: [Default, Collection, Team] }
+            - { alias: I18nConfig,                type: App\API\Model\I18n,                       groups: [Default] }
     areas:
         path_patterns:
             - ^/api(?!/doc)
     documentation:
         #host: '{{hostname}}'
-        schemes: [http, https]
+        host: '%router.request_context.host%'
+        basePath: '%router.request_context.base_url%'
+        schemes: ['%router.request_context.scheme%']
         info:
             title: Kimai 2 - API Docs
-            description: REST API description for the Kimai 2 time-tracking software
-            version: 0.1
+            description: |
+                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'
         securityDefinitions:
-            X-AUTH-USER:
+            apiUser:
                 type: apiKey
                 description: 'Value: {Username}'
                 name: X-AUTH-USER
                 in: header
-            X-AUTH-TOKEN:
+            apiToken:
                 type: apiKey
                 description: 'Value: {API Token}'
                 name: X-AUTH-TOKEN

config/packages/nelmio_cors.yaml

@@ -0,0 +1,25 @@
+parameters:
+    env(CORS_ALLOW_ORIGIN): 'localhost'
+
+nelmio_cors:
+    defaults:
+        allow_credentials: false
+#        allow_origin: ['%env(CORS_ALLOW_ORIGIN)%']
+#        allow_headers: ['Content-Type', 'Authorization', 'X-AUTH-USER', 'X-AUTH-TOKEN']
+#        allow_methods: ['GET', 'OPTIONS', 'POST', 'PUT', 'PATCH', 'DELETE']
+#        expose_headers: ['Link']
+#        max_age: 3600
+        allow_origin: []
+        allow_headers: []
+        allow_methods: []
+        expose_headers: []
+        max_age: 0
+        hosts: []
+        origin_regex: true
+        forced_allow_origin_value: ~
+    paths:
+        '^/api/':
+            allow_origin: ['*']
+            allow_headers: ['X-AUTH-USER', 'X-AUTH-TOKEN', 'Content-Type']
+            allow_methods: ['GET', 'OPTIONS', 'POST', 'PUT', 'PATCH', 'DELETE']
+            max_age: 3600

config/packages/prod/jms_serializer.yaml

@@ -1,6 +1,6 @@
 jms_serializer:
     visitors:
-        json:
+        json_serialization:
             options:
                 - JSON_UNESCAPED_SLASHES
                 - JSON_PRESERVE_ZERO_FRACTION

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/prod/webpack_encore.yaml

@@ -0,0 +1,4 @@
+webpack_encore:
+    # Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes)
+    # Available in version 1.2
+    cache: true

config/packages/security.yaml

@@ -1,8 +1,13 @@
 security:
     encoders:
-        App\Entity\User: bcrypt
+        App\Entity\User: auto
 
     providers:
+        chain_provider:
+            chain:
+                providers: [fos_userbundle]
+        kimai_ldap:
+            id: App\Ldap\LdapUserProvider
         fos_userbundle:
             id: fos_user.user_provider.username_email
 
@@ -26,8 +31,10 @@ security:
                 lifetime: 604800
                 path:     /
 
+            # activate all configured user provider
+            provider: chain_provider
+
             form_login:
-                provider: fos_userbundle
                 check_path: fos_user_security_check
                 login_path: fos_user_security_login
                 csrf_token_generator: security.csrf.token_manager
@@ -36,8 +43,11 @@ security:
                 path: fos_user_security_logout
                 target: homepage
 
+    access_decision_manager:
+        strategy: unanimous
+        allow_if_all_abstain: false
+
     role_hierarchy:
-        ROLE_USER:        ROLE_CUSTOMER
         ROLE_TEAMLEAD:    ROLE_USER
         ROLE_ADMIN:       ROLE_TEAMLEAD
         ROLE_SUPER_ADMIN: ROLE_ADMIN
@@ -47,5 +57,5 @@ security:
         - { path: '^/(%app_locales%)/login', role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: '^/(%app_locales%)/register', role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: '^/(%app_locales%)/resetting', role: IS_AUTHENTICATED_ANONYMOUSLY }
-        - { path: '^/(%app_locales%)/admin', roles: ROLE_ADMIN }
+        - { path: '^/(%app_locales%)/', roles: ROLE_USER }
         - { path: '^/api', roles: IS_AUTHENTICATED_REMEMBERED }