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

4941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Richer
7fba6cb5e6 Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta 2024-02-23 11:47:11 -05:00
Dave Richer
6a26fb413c - refactor on scheduled-out-today 
- routine package updates

Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-23 11:46:53 -05:00
Dave Richer
07fa92f6d6 Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1305) 
Feature/IO-1828 Front End Package Updates
 2024-02-22 23:45:38 +00:00
Dave Richer
16a43d998f - Merge release and adjust due to version differences 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-22 18:44:43 -05:00
Allan Carr
93d139f926 Merged in feature/IO-2640-TV-Mode-for-Scheduled-In-Out (pull request #1303) 
IO-2640 TV Mode for Schedule In and Out Dashboard Components

Approved-by: Dave Richer
 2024-02-22 21:50:18 +00:00
Allan Carr
4d1f40537c IO-2640 Change Variable Names and adjust CSS 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-02-22 12:57:48 -08:00
Dave Richer
896f1415f7 Merged in feature/IO-2636-Customized-Report-Filtering-Version-2 (pull request #1302) 
Feature/IO-2636 Customized Report Filtering Version 2
 2024-02-21 21:58:27 +00:00
Dave Richer
8a01cd9cb0 - call changes 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-21 16:57:56 -05:00
Allan Carr
c2013d47e7 IO-2640 TV Mode for Schedule In and Out Dashboard Components 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-02-21 12:03:35 -08:00
Dave Richer
0f20807690 Merge remote-tracking branch 'origin/master' into feature/IO-2636-Customized-Report-Filtering-Version-2 2024-02-21 14:30:28 -05:00
Dave Richer
2a45be6a45 - fix on change set Field value issues 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-21 14:29:56 -05:00
Dave Richer
b63602143e - fix select box being weird on scroll / resize 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-21 14:10:50 -05:00
Dave Richer
2add712270 - add additional date picker presets in development 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-21 13:23:22 -05:00
Dave Richer
77c8f74bcb - Restore functionality 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-21 13:13:26 -05:00
Allan Carr
1d38102541 Merged in feature/IO-2578-Scoreboard-Entries (pull request #1300) 
IO-2578 Scoreboard Entries Modal

Approved-by: Dave Richer
 2024-02-21 17:36:28 +00:00
Allan Carr
6117b5ab64 Merged in feature/IO-2562-Job-Info-Block-CC-Info (pull request #1298) 
IO-2562 CC Info in Job Block UI Correction

Approved-by: Dave Richer
 2024-02-21 17:35:39 +00:00
Allan Carr
578f0a110e Merged in feature/IO-2556-CC-Sort-Order (pull request #1301) 
IO-2556 CC Sort Order

Approved-by: Dave Richer
 2024-02-21 17:34:56 +00:00
Allan Carr
b5c66274ca Merged in feature/IO-2557-New-CC-Contract-Warnings (pull request #1299) 
IO-2557 New CC Contract Warnings

Approved-by: Dave Richer
 2024-02-21 17:34:08 +00:00
Dave Richer
be46bdc57f - Default sorts! 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-20 19:11:37 -05:00
Dave Richer
6263e63a1d Merge branch 'feature/IO-2636-Customized-Report-Filtering-Version-2' of bitbucket.org:snaptsoft/bodyshop into feature/IO-2636-Customized-Report-Filtering-Version-2 2024-02-20 19:11:10 -05:00
Dave Richer
83d702f12b - Default sorts! 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-20 19:10:34 -05:00
Dave Richer
37708a0b59 - Default sorts! 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-20 19:07:23 -05:00
Allan Carr
6cfcab8156 IO-2557 / IO-1019 Update tooltip 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-02-20 14:52:40 -08:00
Allan Carr
33ec18986d IO-2556 CC Sort Order 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-02-20 13:10:57 -08:00
Dave Richer
6b7b34ae79 - Progress Commit, this fills agreed upon functionality 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-20 16:00:59 -05:00
Allan Carr
06ef2482ba IO-2562 CC Info in Job Block UI Correction 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-02-20 12:53:12 -08:00
Allan Carr
83bd485597 IO-2557 New CC Contract Warnings 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-02-20 09:19:30 -08:00
Dave Richer
6921f2fe68 Merge branch 'release/2024-02-16' into feature/IO-2636-Customized-Report-Filtering-Version-2 2024-02-16 20:49:04 -05:00
Allan Carr
a7e199932c IO-2578 Scoreboard Entries Modal 
Correct OK button, add sorting to table, adjust date to only be a date, remove closeable on modal

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
 2024-02-16 17:14:11 -08:00
Allan Carr
2427c14b7b Merged in release/2024-02-16 (pull request #1296) 
IO-2631 Correct Import Statement for moment

Approved-by: Dave Richer
 2024-02-16 21:37:49 +00:00
Allan Carr
747cd52f54 Merged in test-beta (pull request #1297) 
Test beta

Approved-by: Dave Richer
 2024-02-16 21:36:57 +00:00
Patrick Fic
af7ff2d8b5 FIrst round of changes for Instance Manger & Pro Manager 2024-02-16 14:01:39 -07:00
Dave Richer
c9fb40a9ff Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta 2024-02-16 15:36:53 -05:00
Dave Richer
08f7376961 - fix bug 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-16 15:36:16 -05:00
Dave Richer
d99eae6a7c Merge branch 'release/2024-02-16' into feature/IO-1828-Front-End-Package-Updates 
# Conflicts:
#	client/src/components/jobs-available-table/jobs-available-table.container.jsx
 2024-02-16 15:34:25 -05:00
Allan Carr
66655d449e Merged in feature/IO-2631-Update-Schedule-Completion-on-Import (pull request #1294) 
IO-2631 Correct Import Statement for moment

Approved-by: Dave Richer
 2024-02-16 20:33:05 +00:00
Allan Carr
845a84c4c8 IO-2631 Correct Import Statement for moment 2024-02-16 12:30:12 -08:00
Dave Richer
0ff5ea3d59 Merged in release/2024-02-16 (pull request #1291) 
Release/2024 02 16

Approved-by: Patrick Fic
 2024-02-16 20:21:35 +00:00
Dave Richer
3d70aa8b6c Merged in test-beta (pull request #1290) 
Test beta

Approved-by: Patrick Fic
 2024-02-16 20:21:30 +00:00
Dave Richer
b2ef0fb7d0 Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta 2024-02-16 14:21:01 -05:00
Dave Richer
093089f977 Merge branch 'release/2024-02-16' into feature/IO-1828-Front-End-Package-Updates 
# Conflicts:
#	client/src/components/jobs-available-table/jobs-available-table.container.jsx
 2024-02-16 14:20:30 -05:00
Allan Carr
09492e647e Merged in feature/IO-2631-Update-Schedule-Completion-on-Import (pull request #1292) 
IO-2631 Correct for Business Days

Approved-by: Dave Richer
 2024-02-16 19:19:08 +00:00
Allan Carr
2d6594cc73 IO-2631 Correct for Business Days 2024-02-16 11:08:59 -08:00
Dave Richer
0a27c38b56 Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1289) 
Feature/IO-1828 Front End Package Updates
 2024-02-16 17:53:11 +00:00
Dave Richer
e020f60d34 - clear stage 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-16 12:50:51 -05:00
Dave Richer
3b8e83d88a - clear stage 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-16 12:32:40 -05:00
Dave Richer
3ec4dbb5b8 - big progress commit 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-16 12:25:24 -05:00
Allan Carr
601fdbba39 Merged in feature/IO-2637-Add-Scoreboard-Date (pull request #1287) 
IO-2637 Correct for Timezone offset

Approved-by: Dave Richer
 2024-02-16 17:23:05 +00:00
Allan Carr
830adc4ef3 IO-2637 Correct for Timezone offset 2024-02-16 08:52:33 -08:00
Dave Richer
3f216195ca Merge branch 'feature/IO-2456-Report-Filters-From-Master' into release/2024-02-16 2024-02-15 21:03:30 -05:00