jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
1,674 Commits 1 Branch 0 Tags
main
Commit Graph

1068 Commits

Author SHA1 Message Date
root
c0f03bc64d Fix Revenue null currency crash on user profile
Some checks failed
Frontend / Frontend verification (push) Has been cancelled
Details
Lint PHP / Linting (8.2) (push) Has been cancelled
Details
Check .lock files / Verify lock file integrity (push) Has been cancelled
Details
Release Drafter / Verify repository (push) Has been cancelled
Details
Tests / Integration (8.2) (push) Has been cancelled
Details
Tests / Integration (8.3) (push) Has been cancelled
Details
Tests / Integration (8.4) (push) Has been cancelled
Details
Tests / Integration (8.5) (push) Has been cancelled
Details
Actions Security Analysis / Scan workflows (push) Has been cancelled
Details
Release Drafter / Draft next release (push) Has been cancelled
Details
Lock Threads / Lock inactive issues (push) Has been cancelled
Details
Renovate / renovate (push) Has been cancelled
Details 
- TimesheetRepository::getRevenue(): default to ZAR when currency is null
- Set all customer currencies to ZAR (was EUR from old K1 DB)
 2026-06-20 17:53:05 +00:00
root
86f3e3c9f3 Include zero-hour users in Time Analysis table
Some checks failed
Lock Threads / Lock inactive issues (push) Has been cancelled
Details
Frontend / Frontend verification (push) Has been cancelled
Details
Lint PHP / Linting (8.2) (push) Has been cancelled
Details
Check .lock files / Verify lock file integrity (push) Has been cancelled
Details
Release Drafter / Verify repository (push) Has been cancelled
Details
Tests / Integration (8.2) (push) Has been cancelled
Details
Tests / Integration (8.3) (push) Has been cancelled
Details
Tests / Integration (8.4) (push) Has been cancelled
Details
Tests / Integration (8.5) (push) Has been cancelled
Details
Actions Security Analysis / Scan workflows (push) Has been cancelled
Details
Release Drafter / Draft next release (push) Has been cancelled
Details
Renovate / renovate (push) Has been cancelled
Details 
- Remove HAVING total_hours > 0 filter from SQL
- Table always renders even when all users have 0 hours
- Matches old Kimai 1 behavior
 2026-06-18 23:14:31 +00:00
root
3cd198c12c Fix billable mapping (0=billable, 1=non-billable, 2=unproductive)
Some checks failed
Frontend / Frontend verification (push) Has been cancelled
Details
Lint PHP / Linting (8.2) (push) Has been cancelled
Details
Check .lock files / Verify lock file integrity (push) Has been cancelled
Details
Release Drafter / Verify repository (push) Has been cancelled
Details
Release Drafter / Draft next release (push) Has been cancelled
Details
Tests / Integration (8.2) (push) Has been cancelled
Details
Tests / Integration (8.3) (push) Has been cancelled
Details
Tests / Integration (8.4) (push) Has been cancelled
Details
Tests / Integration (8.5) (push) Has been cancelled
Details
Actions Security Analysis / Scan workflows (push) Has been cancelled
Details 
- Swapped billable/non-billable SQL values to match migrated data
- All 3 pivot tables always render (empty ones show 'No data')
- Added grand total row to pivot tables
- Initialize unprodRows/userColumnsUP to prevent undefined var error
 2026-06-18 23:08:43 +00:00
root
baab938326 Fix Team Summary report — all 3 pivot tables + proper Kimai layout
Some checks failed
Actions Security Analysis / Scan workflows (push) Has been cancelled
Details
Frontend / Frontend verification (push) Has been cancelled
Details
Lint PHP / Linting (8.2) (push) Has been cancelled
Details
Check .lock files / Verify lock file integrity (push) Has been cancelled
Details
Release Drafter / Verify repository (push) Has been cancelled
Details
Release Drafter / Draft next release (push) Has been cancelled
Details
Tests / Integration (8.2) (push) Has been cancelled
Details
Tests / Integration (8.3) (push) Has been cancelled
Details
Tests / Integration (8.4) (push) Has been cancelled
Details
Tests / Integration (8.5) (push) Has been cancelled
Details 
- Billable Projects (billable=1), Non-Billable (billable=0), Unproductive (billable=2)
- Uses Twig macro for DRY pivot table rendering
- Extends Kimai reporting/layout.html.twig for proper navbar/breadcrumb
- Team selector + date range in card header
 2026-06-18 22:59:58 +00:00
root
74ebac9e94 Add Team Summary custom report
Some checks failed
Frontend / Frontend verification (push) Has been cancelled
Details
Lint PHP / Linting (8.2) (push) Has been cancelled
Details
Check .lock files / Verify lock file integrity (push) Has been cancelled
Details
Release Drafter / Verify repository (push) Has been cancelled
Details
Release Drafter / Draft next release (push) Has been cancelled
Details
Tests / Integration (8.2) (push) Has been cancelled
Details
Tests / Integration (8.3) (push) Has been cancelled
Details
Tests / Integration (8.4) (push) Has been cancelled
Details
Tests / Integration (8.5) (push) Has been cancelled
Details
Actions Security Analysis / Scan workflows (push) Has been cancelled
Details 
- src/Controller/Reporting/TeamSummaryController.php: new report with
  - Section 1: Time Analysis per user (billable/non-billable/unproductive/total hours)
  - Section 2: Billable Projects pivot table per user
  - Team selector (mapped from old K1 divisions)
  - Date range picker
- src/Reporting/ReportingService.php: registered report route
 2026-06-18 22:43:12 +00:00
Kevin Papst
0bedb7a877 added missing response object in OpenAPI description 2026-06-17 22:15:41 +02:00
Kevin Papst
8bf711c417 Some random tests and fixes (#6000) 
* added tests for form models
* apply form theme only to the own custom form type
* change route order for improves matching
 2026-06-17 10:20:50 +02:00
Kevin Papst
f8bc853d2f Release 2.61 (#5990) 2026-06-17 07:27:57 +02:00
Kevin Papst
a2c1c71cfc Release 2.60 (#5971) 2026-06-10 12:39:54 +02:00
Kevin Papst
87c85270a9 Release 2.59 (#5957) 2026-06-05 19:05:10 +02:00
Kevin Papst
31a8f887a5 Release 2.58 (#5952) 
* bump version
* fix formatting locale reset after embedded controller sub-requests (#5944)
* fix GHSA-c6w6-57jj-62vh
* fix GHSA-m492-gv72-xvxj
* fix GHSA-jr9p-4h4j-6c58
* make sure to only use JS logic to call API endpoints
* fixes GHSA-r8vr-m544-qh4h
* make sure to only use JS logic to call API endpoints
* fix GHSA-rw46-qg69-vg6h
* fix GHSA-pj8j-p4g4-4vw8 - prevent kimai from rendering images via markdown
* fix GHSA-pj8j-p4g4-4vw8 - use a safe network client to prevent SSRF via images
* fix GHSA-xv4r-4885-gwpg
* fix GHSA-pgcc-vfmc-7cw5 - move GET routes to API with POST method to prevent CSRF
* fix tooltip survives page reload
* updated wizard images
* split wizard and password reset subscriber into two classes
* relax upper php limit
* added zizmor workflow scans and apply findings
* user permissions <name>_other_profile  now respect teams
* move all linting steps to new job
* updated docker image version names
* use .env.local for storing APP_SECRET
* improve build order and use given tag as ref for checkout, not default main branch
* improved APP_SECRET handling, see entrypoint.sh
* use local code for building the image for more flexibility, added dockerignore
 2026-05-25 15:39:47 +02:00
Tobias Perschon
8d245ae223 Adds a setting to disable first time wizard for new users (#5938) 2026-05-23 18:48:42 +02:00
Kevin Papst
976d38e8a4 Release 2.57 (#5929) 2026-05-21 22:14:10 +02:00
Max Hausch
f0ce1c7bd6 fix checking for correct formatter in durationDecimal (#5943) 2026-05-12 10:16:14 +02:00
Kevin Papst
dabd63800f Invoice download via API (#5926) 2026-04-27 17:08:38 +02:00
Kevin Papst
20c7b03bd9 Re-usable ACL checks on teams (#5925) 2026-04-26 17:06:59 +02:00
Kevin Papst
7a559a09e6 Whitelist PDF context options (#5924) 2026-04-26 09:28:28 +02:00
Kevin Papst
3b051e4aa5 Twig config improvements (#5923) 
* deprecate direct kimai_config access, which was only used internally
* prevent access to system configs
* prevent access to most configs in sandbox environments
 2026-04-25 20:13:33 +02:00
Kevin Papst
3eebb02ad3 new API endpoint to save invoice meta-fields (#5916) 2026-04-25 18:14:10 +02:00
Kevin Papst
087350ab72 Release 2.56 (#5909) 2026-04-25 09:58:43 +02:00
Kevin Papst
01cb14a3da activate catalan locale (#5921) 2026-04-25 09:54:02 +02:00
Kevin Papst
372c676afa Release 2.55 (#5907) 2026-04-16 22:06:53 +02:00
Kevin Papst
bad92d7215 Release 2.54 (#5896) 2026-04-13 21:22:06 +02:00
Kevin Papst
16703081cd Exporter/Invoice formula cleanup (#5899) 2026-04-12 09:27:05 +02:00
Kevin Papst
cbdf91f316 Team API docs (#5897) 
* let view_team permission be handled by global ACLs
* code style and API docs
* improve permission check
 2026-04-11 17:22:59 +02:00
Kevin Papst
999d820d4c Release 2.53 (#5878) 2026-04-10 18:09:27 +02:00
Kevin Papst
cad9f58703 Release 2.52 (#5874) 2026-03-16 17:44:12 +01:00
Kevin Papst
a0601c8cb2 check customer permissions on invoice api access (#5849) 2026-03-01 16:53:49 +01:00
Kevin Papst
5b320bf2ea Release 2.51 (#5847) 
* bump packages
 2026-03-01 16:21:07 +01:00
Kevin Papst
4154de6bd1 Release 2.50 (#5835) 
* replace p-0 class with fullsize embed option
* bump parsedown package
* remove support for file:// urls
* fix missing macro in export print template
* fix weekly hours with breaks
 2026-02-25 21:07:40 +01:00
Kevin Papst
77afa207e0 Allow to customize statistic queries (#5827) 
* use TimesheetStatisticsQUery for all repository calls
* send event to customize statistics query
 2026-02-24 13:27:48 +01:00
Kevin Papst
ff6918fcab Release 2.49 (#5820) 
* bump packages
* add column summarization per customer (#5808)
* clarify database requirements
* added helper methods to fetch original expected time

Co-authored-by: GregorB54321 <34287148+GregorB54321@users.noreply.github.com>
 2026-02-15 21:31:06 +01:00
Kevin Papst
4a31411d69 Release 2.48 (#5789) 2026-01-30 16:44:26 +01:00
Kevin Papst
d429c56687 Release 2.47 (#5784) 2026-01-25 09:51:22 +01:00
Kevin Papst
6a86afb5fd Release 2.46 (#5757) 2026-01-07 00:59:47 +01:00
Kevin Papst
9e87fc131b fade-out customer address (#5749) 2025-12-27 17:53:03 +01:00
Kevin Papst
5a0c783a76 added section name for meta-fields positioning (#5747) 2025-12-26 12:54:15 +01:00
Kevin Papst
7e72f144cb clarify api doc 2025-12-25 12:20:05 +01:00
Kevin Papst
3c3d6379a8 Invoice tax rates API (#5740) 2025-12-24 18:47:42 +01:00
Kevin Papst
806bb97e60 query modified_after in UTC (#5743) 2025-12-24 16:33:28 +01:00
Kevin Papst
3fcaf55d02 merge default currency settings (#5739) 2025-12-22 17:55:48 +01:00
Kevin Papst
f0e2337d67 fix dark theme was bright depending on OS settings 2025-12-22 14:24:20 +01:00
Kevin Papst
afb5a0bba4 Release 2.45 (#5721) 
Co-authored-by: Henning Klein <info@henningklein.de>
 2025-12-21 16:42:34 +01:00
Kevin Papst
8c1ed68817 improved dark mode, automatic theme switch (#5720) 2025-12-19 23:51:27 +01:00
Kevin Papst
595b5f4b25 Configurable rate rounding (#5734) 
* added invoice hydration of the issuer object
* added "rate calculator" mode
* new config to select rounding mode
* replace static calls with dependency injection
 2025-12-16 16:47:46 +01:00
Kevin Papst
a15c1e56cb Release 2.44 (#5699) 2025-11-19 14:28:54 +01:00
Kevin Papst
8a42c9640f Release 2.43 (#5694) 2025-11-14 17:41:33 +01:00
Kevin Papst
8e6764b67a Release 2.42 (#5686) 2025-11-12 16:15:04 +01:00
Kevin Papst
1a38c7d7a3 Release 2.41 (#5653) 2025-11-08 23:03:44 +01:00
Kevin Papst
636a51e721 group invoices by project and activity (#5675) 2025-11-02 12:34:41 +01:00