admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,629 Commits 1,012 Branches 0 Tags
3687a644d6e493ba2bca35cd0ebdf902c9d0c790
Commit Graph

739 Commits

Author SHA1 Message Date
Patrick Fic
3687a644d6 Further merge resolutions of RO into IO. 2024-02-12 12:56:03 -08:00
Patrick Fic
1d04683c06 RO into IO merge as of 02/05/2024. 2024-02-12 12:22:05 -08:00
Patrick Fic
04a06e85ec IO-2632 Add basic instance manager functions & editor config. 2024-02-07 11:38:57 -08:00
Dave Richer
9346a819f5 - The Great merge 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-06 19:16:47 -05:00
Dave Richer
4eb8faa5d9 - the great reformat 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-06 18:23:46 -05:00
Dave Richer
e83badb454 - the great reformat 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-06 18:20:58 -05:00
Dave Richer
232109c2c7 Merge remote-tracking branch 'origin/rome/release/2024-01-26' into rome/test-beta 
# Conflicts:
#	.circleci/config.yml
#	client/package-lock.json
#	client/src/components/header/header.component.jsx
#	client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx
#	client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx
#	client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
#	client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx
#	client/src/components/production-list-detail/production-list-detail.component.jsx
#	client/src/components/report-center-modal/report-center-modal.component.jsx
#	client/src/pages/jobs-admin/jobs-admin.page.jsx
#	client/src/pages/jobs-detail/jobs-detail.page.component.jsx
#	client/src/utils/TemplateConstants.js
#	client/yarn.lock
#	package-lock.json
#	server.js
 2024-01-30 18:42:45 -05:00
Patrick Fic
39bba3623a Resolve broken routes. 2024-01-29 12:56:14 -08:00
Dave Richer
d6bb6a891d Merged in release/2024-01-29 (pull request #1232) 
IO-1532 resolve update logic issue for status timings.
 2024-01-29 18:18:52 +00:00
Dave Richer
fb47b45eb6 Merge remote-tracking branch 'origin/release/2024-01-29' into feature/IO-1828-Front-End-Package-Updates 2024-01-29 12:12:15 -05:00
Patrick Fic
cb4a6e8774 IO-1532 resolve update logic issue for status timings. 2024-01-29 09:05:46 -08:00
Dave Richer
04728690ca - merge adjustments 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-26 21:20:49 -05:00
Dave Richer
bdff9f62c0 Merge branch 'release/2024-01-26' into feature/IO-1828-Front-End-Package-Updates 2024-01-26 18:08:41 -05:00
Dave Richer
48cef3e188 - updates from lifecyle component. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-26 18:06:14 -05:00
Dave Richer
ae98566bbd Merge branch 'release/2024-01-26' into feature/IO-1828-Front-End-Package-Updates 
# Conflicts:
#	client/src/pages/jobs-detail/jobs-detail.page.component.jsx
#	package-lock.json
#	package.json
 2024-01-26 16:28:18 -05:00
Dave Richer
c1f6d06128 - Finish department cycle times. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-26 16:10:24 -05:00
Dave Richer
120a8a4576 - Finish department cycle times. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-26 16:09:46 -05:00
Dave Richer
89224e871c - Progress Update 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-26 12:57:06 -05:00
Dave Richer
f8408908b2 - Major Progress Commit 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-24 21:40:05 -05:00
Dave Richer
6489a8666f - Progress 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-24 18:39:59 -05:00
Dave Richer
5ea64ed805 - Progress 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-24 17:18:43 -05:00
Dave Richer
d740446ccb - Progress 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-24 10:07:07 -05:00
Dave Richer
5de4ef5d83 - human readable dates 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-23 12:54:38 -05:00
Dave Richer
f59bdf9030 - Progress Update 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-23 12:35:58 -05:00
Dave Richer
cfe0727447 - Rough in front end / backend 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-23 10:20:26 -05:00
Dave Richer
09d112350a - Rough in front end / backend 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-23 01:37:11 -05:00
Dave Richer
52f8eabd2b - Finish cleanup 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-23 00:02:18 -05:00
Dave Richer
a162b275a3 - Finish cleanup 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-22 23:11:10 -05:00
Dave Richer
2e7232bb65 - Finish cleanup 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-22 23:00:31 -05:00
Dave Richer
272a3f579a - Minor cleanup 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-22 18:53:57 -05:00
Dave Richer
ff1ceb20cb - Minor cleanup 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-22 18:39:27 -05:00
Dave Richer
343179d4fe - Minor cleanup 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-22 18:05:35 -05:00
Dave Richer
eabbc2211b - Minor cleanup 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-22 17:21:46 -05:00
Dave Richer
7f587680ca - Scaffolding. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-22 16:38:26 -05:00
Dave Richer
166efdc877 progressUpdate 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-22 14:25:21 -05: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
c2d6c980ed - Fix the page layout, the footer was in the content section causing it not to remain at the bottom and just reside 'at the bottom' of the content section. Also added a 100% on the outer container height (100vh) so the grey background fills the page 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-16 15:32:35 -05:00
Allan Carr
ebe5c5b113 IO-2520 Adjust to imexshopid instead of shopname & prettify 2024-01-12 21:06:39 -08:00
Dave Richer
f3db5d83c7 Merge branch 'master' into feature/IO-1828-Front-End-Package-Updates 2024-01-12 20:30:12 -05:00
Allan Carr
04cff4acb1 IO-2520 Add in Server Key format 2024-01-12 16:26:09 -08:00
Allan Carr
3e9279d89a IO-2520 Change Query Time Bound 2024-01-09 12:00:24 -08:00
Allan Carr
1305277c09 IO-2520 Kaizen Data Pump 2024-01-09 11:08:02 -08:00
Dave Richer
3a3b3af13f Merge master 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-08 11:18:22 -05:00
Patrick Fic
1cf13da413 Merge branch 'release/2024-01-05' into rome/release/2024-01-05 2024-01-05 09:02:01 -08:00
Patrick Fic
9c897972ad Minor intellipay change. 2024-01-05 08:53:17 -08:00
Dave Richer
d2e4b7d9ec merge test (release pending tomorrow) into client-update and make required changes. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2023-12-21 13:12:24 -05:00
Dave Richer
b2c8e45d5e even more updates. 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2023-12-14 16:27:00 -05:00
Allan Carr
2dd56590d3 Admin panel to force email addresses to be lowercase to conform with firebase 2023-12-14 08:57:36 -08:00
Dave Richer
d915c123db Some additional progress / start on updating future deprecations 2023-12-05 13:41:52 -05:00
Patrick Fic
89339e1033 IO-2478 resolve incorrect labor type during conversion calculation. 2023-11-23 09:37:49 -08:00