admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,508 Commits 1,012 Branches 0 Tags
54820fe3c8211fc11eb052d7ad8adc5a5ec3300a
Commit Graph

6508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Richer
73058c4405 Merge branch 'feature/IO-1828-Front-End-Package-Updates' into feature/IO-2477 2024-01-20 19:22:42 -05:00
Dave Richer
72e8aba546 - Merge master 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-20 19:21:31 -05:00
Dave Richer
039f1e6a91 - move lib 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-19 22:30:35 -05:00
Dave Richer
ddea46ddef - Remove test data 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-19 22:28:47 -05:00
Dave Richer
2ada4ac44b - Eula finished 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-19 22:27:03 -05:00
Dave Richer
6937f33134 - Eula Progress 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-19 20:55:15 -05:00
Allan Carr
9274742520 Merged in release/2024-01-19 (pull request #1206) 
Release/2024 01 19
 2024-01-20 01:03:59 +00:00
Patrick Fic
9b4c85c9e3 IO-2543 additional schema correction. 2024-01-19 13:50:14 -08:00
Allan Carr
66c64ce9e0 Merged in feature/IO-2599-Techstation-Linking (pull request #1204) 
IO-2599 Remove Space and put Div in to space components

Approved-by: Patrick Fic
 2024-01-19 21:18:39 +00:00
Patrick Fic
c9cbffdec8 IO-2543 Schema changes for AR calculation. 2024-01-19 13:15:06 -08:00
Allan Carr
ca3145ce0f IO-2599 Remove Space and put Div in to space components 2024-01-19 12:19:07 -08:00
Dave Richer
06a8d4257a Merge branch 'feature/IO-1828-Front-End-Package-Updates' into feature/IO-2477 2024-01-19 12:31:46 -05:00
Dave Richer
1718ba5695 - merge 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-19 12:29:04 -05:00
Dave Richer
60acb8e744 Merged in test-beta (pull request #1203) 
Test beta
 2024-01-19 17:13:01 +00:00
Dave Richer
1cf47b91e2 Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1202) 
Feature/IO-1828 Front End Package Updates
 2024-01-19 17:12:21 +00:00
Dave Richer
44a13ca0d5 Merge branch 'release/2024-01-19' into feature/IO-1828-Front-End-Package-Updates 
# Conflicts:
#	client/src/App/App.jsx
#	client/src/components/shop-employees/shop-employees-list.component.jsx
 2024-01-19 12:08:34 -05:00
Allan Carr
52f9106776 Merged in feature/IO-2608-Employee-Filter-and-Sort (pull request #1197) 
IO-2608 Filter and Sort columns in Employee table

Approved-by: Dave Richer
 2024-01-19 16:58:45 +00:00
Allan Carr
1a2cc5623d Merged in feature/IO-2598-Tech-Create-IOU (pull request #1201) 
IO-2598 Restrict IOU from Tech Console

Approved-by: Dave Richer
 2024-01-19 16:58:13 +00:00
Allan Carr
d06037df1f IO-2598 Restrict IOU from Tech Console 2024-01-19 08:47:17 -08:00
Dave Richer
0665bade1b Merge branch 'feature/IO-1828-Front-End-Package-Updates' into feature/IO-2477 2024-01-18 20:57:42 -05:00
Dave Richer
a159bdbff1 Merged in test-beta (pull request #1200) 
- optimize schedule out today in dashboard
 2024-01-19 01:56:36 +00:00
Dave Richer
95c445c40f Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1199) 
- optimize schedule out today in dashboard
 2024-01-19 01:56:00 +00:00
Dave Richer
51483f62e1 - optimize schedule out today in dashboard 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-18 20:49:50 -05:00
Dave Richer
2826360627 - fixed scheduled-out-today.component.jsx 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-18 20:46:51 -05:00
Allan Carr
cb8632641e IO-2608 Filter and Sort columns in Employee table 2024-01-18 17:28:46 -08:00
Dave Richer
3690ea0332 - Merge client update into test-beta 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-18 19:20:08 -05:00
Dave Richer
8dc41519ce Merge branch 'feature/IO-1828-Front-End-Package-Updates' into feature/IO-2477 2024-01-18 16:52:20 -05:00
Dave Richer
703fad7d39 Merged in test-beta (pull request #1196) 
Test beta
 2024-01-18 21:51:43 +00:00
Dave Richer
913c81409a Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1195) 
Feature/IO-1828 Front End Package Updates
 2024-01-18 21:51:08 +00:00
Dave Richer
e255f0a664 - update handleBeta 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-18 16:50:30 -05:00
Dave Richer
adbfcddd9d Merged in feature/IO-1828-Beta-Updates-To-Test (pull request #1194) 
Feature/IO-1828 Beta Updates To Test
 2024-01-18 21:49:33 +00:00
Dave Richer
e3aea55e91 Merged in feature/IO-1828-Beta-Updates-To-Test (pull request #1193) 
Feature/IO-1828 Beta Updates To Test
 2024-01-18 21:48:51 +00:00
Dave Richer
bf6b1c202f - update handleBeta 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-18 16:35:30 -05:00
Dave Richer
0cab47f984 - update handleBeta 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-18 16:22:58 -05:00
Dave Richer
829e611692 - update handleBeta 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-18 16:16:06 -05:00
Patrick Fic
e0e62a52be Cherry pick schema chengs from IO-2477 2024-01-18 13:08:39 -08:00
Dave Richer
23c0f8e383 - update handleBeta 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-18 16:07:17 -05:00
Dave Richer
7da5d1a4fd - node versions 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-18 16:04:53 -05:00
Dave Richer
ff0c0de926 Merged in test-beta (pull request #1188) 
Test beta
 2024-01-18 20:58:07 +00:00
Dave Richer
f6799c0436 Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1187) 
Feature/IO-1828 Front End Package Updates
 2024-01-18 20:57:37 +00:00
Dave Richer
43621bc6a2 - add a reload on beta switch 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-18 15:57:15 -05:00
Dave Richer
909f6e8eb5 - add a reload on beta switch 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-18 15:55:23 -05:00
Dave Richer
73bb7ffdab Merged in test-beta (pull request #1186) 
Test beta
 2024-01-18 20:34:37 +00:00
Dave Richer
39a69e60c9 Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1185) 
Feature/IO-1828 Front End Package Updates
 2024-01-18 20:33:04 +00:00
Dave Richer
1e78106224 - add a reload on beta switch 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-18 15:31:46 -05:00
Dave Richer
d1cd0ea126 Merge branch 'release/2024-01-19' into feature/IO-1828-Front-End-Package-Updates 
# Conflicts:
#	client/src/App/App.jsx
#	client/src/components/header/header.component.jsx
 2024-01-18 14:41:29 -05:00
Allan Carr
764a89e5bf Merged in feature/IO-2599-Techstation-Linking (pull request #1183) 
Feature/IO-2599 Techstation Linking

Approved-by: Dave Richer
 2024-01-18 19:33:20 +00:00
Allan Carr
f4908ed265 IO-2599 Tech Station Linking 2024-01-18 11:30:58 -08:00
Dave Richer
ef5a3701a0 Merged in test-beta (pull request #1182) 
Update CI for test.
 2024-01-18 18:49:18 +00:00
Dave Richer
3c0780e410 Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1181) 
Update CI for test.
 2024-01-18 18:48:41 +00:00