Dave Richer
|
0891c7d4b3
|
Merge remote-tracking branch 'origin/master-AIO' into feature/IO-3255-simplified-part-management
# Conflicts:
# client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
|
2025-07-07 11:18:16 -04:00 |
|
Dave Richer
|
9c59fd4c00
|
Merged in release/2025-07-04 (pull request #2393)
DO NOT MERGE - PENDING Release/2025 07 04 into master-AIO - IO-3284 IO-3285 IO-3286 IO-3288
|
2025-07-05 01:21:35 +00:00 |
|
Allan Carr
|
a9f959cced
|
Merged in feature/IO-3286-Additional-Product-Fruit-IDs (pull request #2394)
IO-3286 Additional Product Fruit IDs
Approved-by: Dave Richer
|
2025-07-04 21:03:37 +00:00 |
|
Allan Carr
|
414897bba0
|
IO-3286 Additional Product Fruit IDs
Signed-off-by: Allan Carr <allan@imexsystems.ca>
|
2025-07-04 13:35:32 -07:00 |
|
Dave Richer
|
94b154a4ac
|
feature/IO-3255-simplified-parts-management - Checkpoint / Meeting changes
|
2025-07-03 14:05:35 -04:00 |
|
Dave Richer
|
5fa58e5013
|
feature/IO-3255-simplified-parts-management - Front End Cleanup
|
2025-07-03 12:00:21 -04:00 |
|
Dave Richer
|
6496f6c414
|
feature/IO-3255-simplified-parts-management - Bump deps
|
2025-07-03 11:52:01 -04:00 |
|
Patrick Fic
|
3a0a3c9fb9
|
Merge branch 'feature/IO-3255-simplified-part-management' of bitbucket.org:snaptsoft/bodyshop into feature/IO-3255-simplified-part-management
|
2025-07-02 11:06:29 -07:00 |
|
Allan Carr
|
7467a31d76
|
Merged in feature/IO-3284-JobLine-Price-Lbr-Hrs-Totals (pull request #2387)
IO-3284 JobLine Price Lbr Hrs Total
Approved-by: Dave Richer
|
2025-06-27 18:24:16 +00:00 |
|
Allan Carr
|
894f6bf6d2
|
Merged in feature/IO-3285-Shop-Config-Lite-Basic (pull request #2388)
IO-3285 Shop Config Lite Basic
Approved-by: Dave Richer
|
2025-06-27 18:23:41 +00:00 |
|
Allan Carr
|
744dfa8163
|
Merged in feature/IO-3286-Additional-Product-Fruit-IDs (pull request #2389)
IO-3286 Additional Product Fruit IDs
Approved-by: Dave Richer
|
2025-06-27 18:22:56 +00:00 |
|
Dave Richer
|
2293119518
|
Merged in feature/IO-3288-Score-Board-Blocked-Days (pull request #2390)
feature/IO-3288-Score-Board-Blocked-Days - Fix
|
2025-06-27 17:57:25 +00:00 |
|
Dave Richer
|
bd529a0dfa
|
feature/IO-3288-Score-Board-Blocked-Days - Fix
|
2025-06-27 13:56:18 -04:00 |
|
Dave Richer
|
646c42b8c7
|
feature/IO-3255-simplified-parts-management - Checkpoint
|
2025-06-27 13:48:49 -04:00 |
|
Dave Richer
|
8de92403ee
|
feature/IO-3255-simplified-parts-management - Checkpoint
|
2025-06-27 13:01:18 -04:00 |
|
Allan Carr
|
57ad89747f
|
IO-3286 Additional Product Fruit IDs
Signed-off-by: Allan Carr <allan@imexsystems.ca>
|
2025-06-26 18:48:09 -07:00 |
|
Allan Carr
|
3ae8f38adb
|
IO-3285 Shop Config Lite Basic
Signed-off-by: Allan Carr <allan@imexsystems.ca>
|
2025-06-26 18:45:48 -07:00 |
|
Allan Carr
|
dc5ed1a39c
|
IO-3284 JobLine Price Lbr Hrs Total
Signed-off-by: Allan Carr <allan@imexsystems.ca>
|
2025-06-26 18:40:38 -07:00 |
|
Dave Richer
|
f5ea8719ef
|
Merge branch 'master-AIO' into feature/IO-3255-simplified-part-management
|
2025-06-26 14:17:04 -04:00 |
|
Patrick Fic
|
aa6e6b8980
|
Merged in hotfix/2025-06-25 (pull request #2386)
IO-3281 Resolve key issue for downloads.
|
2025-06-25 23:33:37 +00:00 |
|
Patrick Fic
|
1dc80c068b
|
Merged in feature/IO-3281-imgproxy-download-hotfix (pull request #2385)
IO-3281 Resolve key issue for downloads.
|
2025-06-25 23:33:14 +00:00 |
|
Patrick Fic
|
bd0c4ceae2
|
IO-3281 Resolve key issue for downloads.
|
2025-06-25 16:32:47 -07:00 |
|
Patrick Fic
|
30b58c6ea5
|
Merged in hotfix/2025-06-25 (pull request #2384)
IO-3281 missed file in previous commit.
|
2025-06-25 22:48:53 +00:00 |
|
Patrick Fic
|
a55e9224f8
|
Merged in feature/IO-3281-imgproxy-download-hotfix (pull request #2383)
IO-3281 missed file in previous commit.
|
2025-06-25 22:48:41 +00:00 |
|
Patrick Fic
|
0c80abb3ca
|
IO-3281 missed file in previous commit.
|
2025-06-25 15:48:06 -07:00 |
|
Patrick Fic
|
7137e611cd
|
Merged in hotfix/2025-06-25 (pull request #2382)
IO-3281 Prevent broken stream reseting HTTP headers.
|
2025-06-25 22:37:01 +00:00 |
|
Patrick Fic
|
6f9d291d36
|
Merged in feature/IO-3281-imgproxy-download-hotfix (pull request #2381)
IO-3281 Prevent broken stream reseting HTTP headers.
|
2025-06-25 22:36:47 +00:00 |
|
Patrick Fic
|
f2a2653eae
|
IO-3281 Prevent broken stream reseting HTTP headers.
|
2025-06-25 15:36:03 -07:00 |
|
Patrick Fic
|
73c25ab91f
|
Merged in hotfix/2025-06-25 (pull request #2380)
Hotfix/2025 06 25 - IO-3279 IO-3281
|
2025-06-25 17:08:57 +00:00 |
|
Patrick Fic
|
780449bac6
|
Merge branch 'hotfix/2025-06-25' of bitbucket.org:snaptsoft/bodyshop into hotfix/2025-06-25
|
2025-06-25 10:08:09 -07:00 |
|
Patrick Fic
|
2509a1ecf3
|
Merge branch 'feature/IO-3279-usage-report' into hotfix/2025-06-25
|
2025-06-25 10:08:02 -07:00 |
|
Patrick Fic
|
16075f7ddd
|
Merged in feature/IO-3281-imgproxy-download-hotfix (pull request #2378)
IO-3281 Adjust zip to stream.
|
2025-06-25 16:43:29 +00:00 |
|
Patrick Fic
|
27d28e7ffc
|
IO-3281 Adjust zip to stream.
|
2025-06-25 09:42:45 -07:00 |
|
Patrick Fic
|
66b87e5c45
|
Merged in feature/IO-3281-imgproxy-download-hotfix (pull request #2376)
IO-3281 resolve imgproxy download failures.
|
2025-06-25 15:53:33 +00:00 |
|
Patrick Fic
|
c1e1dff7d2
|
IO-3281 resolve imgproxy download failures.
|
2025-06-25 08:51:41 -07:00 |
|
Patrick Fic
|
0e1ec83fcd
|
IO-3255 Fix breadcrumb path.
|
2025-06-25 08:15:37 -07:00 |
|
Dave Richer
|
01185b3073
|
feature/IO-3182-Phone-Number-Consent - Checkpoint
|
2025-06-24 16:22:07 -04:00 |
|
Dave Richer
|
49b0990c7b
|
Merge remote-tracking branch 'origin/master-AIO' into feature/IO-3255-simplified-part-management
|
2025-06-24 14:45:04 -04:00 |
|
Dave Richer
|
f76eb7abf5
|
Merged in hotfix/IO-3280-Image-Selection-Bug (pull request #2374)
hotfix/IO-3280-Image-Selection-Bug - Fix Bug in image selection dialog
|
2025-06-24 18:43:29 +00:00 |
|
Dave Richer
|
25ea2a80a3
|
hotfix/IO-3280-Image-Selection-Bug - Fix Bug in image selection dialog
|
2025-06-24 14:42:06 -04:00 |
|
Dave Richer
|
7d930045ef
|
feature/IO-3255-simplified-parts-management - Checkpoint
|
2025-06-24 14:38:13 -04:00 |
|
Patrick Fic
|
633d5668f0
|
IO-3279 Set usage report to 1 year.
|
2025-06-23 15:08:36 -07:00 |
|
Patrick Fic
|
cbb6c43ec3
|
IO-3255 Clean up front end components for pm.
|
2025-06-23 14:00:25 -07:00 |
|
Dave Richer
|
09e1887609
|
feature/IO-3255-simplified-parts-management - Checkpoint
|
2025-06-23 14:24:15 -04:00 |
|
Dave Richer
|
4b83330db9
|
feature/IO-3255-simplified-parts-management - Checkpoint
|
2025-06-23 14:00:58 -04:00 |
|
Dave Richer
|
b0283f827e
|
feature/IO-3255-simplified-parts-management - Checkpoint
|
2025-06-20 14:51:30 -04:00 |
|
Dave Richer
|
3c71902047
|
feature/IO-3255-simplified-parts-management - Checkpoint
|
2025-06-20 13:48:58 -04:00 |
|
Dave Richer
|
79bf30b299
|
feature/IO-3255-simplified-parts-management - Checkpoint
|
2025-06-20 13:30:49 -04:00 |
|
Dave Richer
|
dc3e9b7226
|
feature/IO-3255-simplified-parts-management - Checkpoint
|
2025-06-20 13:25:48 -04:00 |
|
Dave Richer
|
00cc47553b
|
Merged in release/2025-06-13 (pull request #2373)
Release/2025 06 13 into master-AIO - IO-3222 IO-3256 IO-3254
|
2025-06-19 18:26:08 +00:00 |
|