9001429d2f
Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/lion/chatbot
2026-01-12 14:25:16 -05:00
6a473fae0c
fix(chatbot): forgot to actually translate internal/default chat messages, fixed
2026-01-12 14:24:44 -05:00
ff25cf5082
Merge pull request 'dev/lion/chatbot' ( #48 ) from dev/lion/chatbot into main
...
Reviewed-on: Targo/targo_frontend#48
2026-01-12 14:13:42 -05:00
7114574ecf
feat(chatbot): fully implement chatbot, fix UI issues, add to permissions under user list.
2026-01-12 14:12:37 -05:00
0fe8c89dd9
Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/lion/chatbot
2026-01-12 10:48:16 -05:00
5ff20452a7
fix(chatbot): continue integration and trim of chatbot-related code.
2026-01-12 10:48:11 -05:00
7432d7f15b
Merge pull request 'feat(shifts): added banking and withdrawal of banked hours' ( #47 ) from dev/matthieu/getting-ready-for-staging into main
...
Reviewed-on: Targo/targo_frontend#47
2026-01-12 10:40:46 -05:00
Matthieu Haineault
ccdc1e68da
feat(shifts): added banking and withdrawal of banked hours
2026-01-12 08:51:43 -05:00
ea5e2ef36e
BREAKING(chatbot): being process of merging chatbot with current app for inhouse testing
2026-01-09 16:38:23 -05:00
e3c596a5f2
Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/lion/chatbot
2026-01-09 16:25:04 -05:00
129b422551
Merge pull request 'dev/nicolas/staging-prep' ( #46 ) from dev/nicolas/staging-prep into main
...
Reviewed-on: Targo/targo_frontend#46
2026-01-09 16:06:42 -05:00
9c82319298
Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/nicolas/staging-prep
2026-01-09 16:06:05 -05:00
b56510c6db
fix(employee-list): add background color to input fields in employee detail dialog because I forgot, like a junior dev
2026-01-09 16:05:56 -05:00
10e0939e4e
Merge pull request 'dev/nicolas/staging-prep' ( #45 ) from dev/nicolas/staging-prep into main
...
Reviewed-on: Targo/targo_frontend#45
2026-01-09 16:01:40 -05:00
d7b4e150ac
feat(employee-list): add error messages to form when modifying employee details, minor UI changes.
2026-01-09 16:01:00 -05:00
ffe671376f
fix(employee-list): make last_updated change for pto when sick hours are changed
2026-01-09 13:01:55 -05:00
68973501c6
Merge pull request 'dev/nicolas/staging-prep' ( #44 ) from dev/nicolas/staging-prep into main
...
Reviewed-on: Targo/targo_frontend#44
2026-01-09 11:41:05 -05:00
6ec05a00b8
feat(employees-list): add paid time off fields to employee details, DRY details dialog code
2026-01-09 11:40:21 -05:00
35db8418a6
fix(many): ui adjustments to employee-list and timesheet-approvals, add phone number to employee-list
...
add field for extension in employee list, but will need to be manually entered from Facturation, current DB does not contain extensions.
2026-01-09 09:43:17 -05:00
78d70f8fe4
Merge pull request 'fix(approvals): add more functionality and ui fixes to list view, add weekly breakdown hours, ui adjustments to card view' ( #43 ) from dev/nicolas/staging-prep into main
...
Reviewed-on: Targo/targo_frontend#43
2026-01-09 07:38:26 -05:00
c62350fde4
fix(approvals): add more functionality and ui fixes to list view, add weekly breakdown hours, ui adjustments to card view
2026-01-09 07:37:50 -05:00
10fd1a956d
Merge pull request 'fix(help): removed "terminated_employee" descriptions from the basic employee_list_options' ( #42 ) from dev/matthieu/help-page into main
...
Reviewed-on: Targo/targo_frontend#42
2026-01-07 14:53:59 -05:00
Matthieu Haineault
5f41bf964a
fix(help): removed "terminated_employee" descriptions from the basic employee_list_options
2026-01-07 14:53:21 -05:00
0d068f2156
Merge pull request 'fix(csv): fixed the checkbox for companies and used a radio-button instead to make sure only one can be selected at a time' ( #41 ) from dev/matthieu/staging-csv into main
...
Reviewed-on: Targo/targo_frontend#41
2026-01-07 14:51:12 -05:00
Matthieu Haineault
04eb716a12
fix(csv): fixed the checkbox for companies and used a radio-button instead to make sure only one can be selected at a time
2026-01-07 13:59:11 -05:00
53698eaa08
Merge pull request 'fix(timesheet): adjustment to mobile UI, reduce header space, remove footer' ( #40 ) from dev/nicolas/staging-prep into main
...
Reviewed-on: Targo/targo_frontend#40
2026-01-07 10:32:41 -05:00
1a707bf05b
fix(timesheet): adjustment to mobile UI, reduce header space, remove footer
2026-01-07 10:32:19 -05:00
73a371ae49
Modification in Dockerfile to remove the necessity to have a persistent folder on the docker host. Also added modification in docker-compose file to reflect the Dockerfile changes.
2026-01-07 10:26:20 -05:00
00bc56ea61
Merge pull request 'fix(all): fix scroll issue in timesheet mobile, add approval for individual expenses in approvals' ( #39 ) from dev/nicolas/staging-prep into main
...
Reviewed-on: Targo/targo_frontend#39
2026-01-07 09:49:54 -05:00
76da80cccc
fix(all): fix scroll issue in timesheet mobile, add approval for individual expenses in approvals
2026-01-07 09:49:20 -05:00
7abbfe8208
Merge pull request 'fix(approvals): fix sizing issue, multiple ui bugs in details window, separate scrollable timesheet from static one' ( #38 ) from dev/nicolas/staging-prep into main
...
Reviewed-on: Targo/targo_frontend#38
2026-01-06 15:11:07 -05:00
ec466bf6f2
fix(approvals): fix sizing issue, multiple ui bugs in details window, separate scrollable timesheet from static one
2026-01-06 15:10:27 -05:00
07b52c854f
Merge pull request 'dev/nicolas/timesheet-approval-staging-prep' ( #37 ) from dev/nicolas/timesheet-approval-staging-prep into main
...
Reviewed-on: Targo/targo_frontend#37
2026-01-06 09:16:55 -05:00
b6ddb8f447
merge with main
2026-01-06 09:16:37 -05:00
1e16c8334b
fix(all): many changes, see commit details. Add weekly overview data to timesheets
2026-01-06 09:12:49 -05:00
Matthieu Haineault
a2d5a187d2
fix(help): small modification display
2026-01-05 08:36:55 -05:00
f738a5872a
fix(all): More changes to UI:
...
Timesheet: fix UI spaces with scrolling, change ui to not show preset apply if no preset set to employee. Layout Drawer: fix display of options according to user permissions, fix highlight of menu item to match current route name. Employee list: add functionality to prevent users without user management permissions to see or edit user info and prevent seeing inactive users, add remote to shifts for preset editor, add hover effect to employee items when management mode to visually hint at clickable item.
2026-01-02 17:26:20 -05:00
20fcc0206c
fix(all): Many fixes and adjustements, see full commit comment:
...
Dashboard: Reworked carousel and added useful links. Help page: made title sections more obvious, minor UI adjustments to spacing, appearance. Timesheets: Make mobile timesheet automaticall scroll to today's date when loading. Layout: Fix UI bugs where menu labels would not appear in mobile and tray would load automatically on mobile.
2026-01-02 12:38:35 -05:00
8989a7d9c0
fix(approvals): progress on layout, dynamic resizing of table scroll area, UI/UX improvements, redo of left drawer
2025-12-30 17:15:47 -05:00
1d0c77b1fd
added allowedHosts to make URL functional.
2025-12-30 14:56:20 -05:00
ba894b704e
Added docker-compose file
2025-12-30 11:51:19 -05:00
6448a62fc5
Merge pull request 'dev/nicolas/timesheet-approval-staging-prep' ( #36 ) from dev/nicolas/timesheet-approval-staging-prep into main
...
Reviewed-on: Targo/targo_frontend#36
2025-12-29 14:15:01 -05:00
720417ab16
Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/nicolas/timesheet-approval-staging-prep
2025-12-29 14:14:34 -05:00
29cff14e3b
fix(approvals): work on list view, dashboard carousel and general layout
2025-12-29 14:13:56 -05:00
7e3c83e40d
Found a way to set variables inside docker compose and use them in Dockerfile
2025-12-29 11:05:39 -05:00
10511484fa
Merge branch 'main' of git.targo.ca:Targo/targo_frontend into dev/nicolas/timesheet-approval-staging-prep
2025-12-29 10:18:11 -05:00
9fab8ae1ca
refactor(approvals): more work on filters, table list view tweaks to columns, plug in list view functionalities
2025-12-29 10:17:18 -05:00
0efa683a07
fixed dockerfile
2025-12-29 10:15:27 -05:00
3b1f48231d
update dockerfile
2025-12-29 09:58:07 -05:00
e824278cec
update docker file
2025-12-29 09:53:49 -05:00
