Dave Richer
254fb4f77f
Merge remote-tracking branch 'origin/master-AIO' into feature/IO-3255-simplified-part-management
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2025-07-17 12:49:03 -04:00
Dave Richer
53a559b126
feature/IO-3255-simplified-parts-management - Checkpoint
2025-07-17 12:48:30 -04:00
Patrick Fic
17285fc029
Merged in hotfix/2025-07-15-nginxtune (pull request #2416 )
...
Remove all testing due to failed test in RO.
2025-07-16 19:07:20 +00:00
Patrick Fic
401e3cff73
Remove all testing due to failed test in RO.
2025-07-16 12:05:40 -07:00
Patrick Fic
865680e019
Merged in hotfix/2025-07-15-nginxtune (pull request #2415 )
...
Adjust body and buffer sizes.
2025-07-15 21:07:46 +00:00
Patrick Fic
9f97ca0336
Adjust body and buffer sizes.
2025-07-15 14:06:55 -07:00
Patrick Fic
5df38f8612
Merged in hotfix/2025-07-15-nginxtune (pull request #2414 )
...
Override nginx.conf
2025-07-15 20:46:27 +00:00
Patrick Fic
63c5719420
Override nginx.conf
2025-07-15 13:45:37 -07:00
Patrick Fic
d6c80f1420
Merged in hotfix/2025-07-15-nginxtune (pull request #2413 )
...
Additional change
2025-07-15 20:36:13 +00:00
Patrick Fic
fade927c9e
Additional change
2025-07-15 13:35:17 -07:00
Patrick Fic
9f472ce1d0
Merged in hotfix/2025-07-15-nginxtune (pull request #2412 )
...
Add worker process limits for EB config.
2025-07-15 20:21:38 +00:00
Patrick Fic
47a56e32b9
Add worker process limits for EB config.
2025-07-15 13:20:41 -07:00
Dave Richer
bfa9fddb9e
Merged in feature/IO-3303-logging (pull request #2410 )
...
[DO NOT MERGE] - IO-3303 Logging/Socket Params into Master-AIO
Approved-by: Patrick Fic
2025-07-14 23:51:09 +00:00
Dave Richer
28abd9707e
feature/IO-3303-logging - Logging
2025-07-14 19:31:31 -04:00
Dave Richer
5f621e1ae0
feature/IO-3303-logging - Logging
2025-07-14 19:28:29 -04:00
Dave Richer
931fa4b82b
Merge remote-tracking branch 'origin/master-AIO' into feature/IO-3255-simplified-part-management
2025-07-09 11:15:00 -04:00
Patrick Fic
fbd6766dcd
Merged in feature/IO-3294-imgproxy-bill-upload-hotfix (pull request #2401 )
...
IO-3294 fix upload to image proxy for bills.
2025-07-08 21:46:35 +00:00
Patrick Fic
9ace531edb
IO-3294 fix upload to image proxy for bills.
2025-07-08 14:31:32 -07:00
Dave Richer
91cc12873e
feature/IO-3255-simplified-parts-management -Cleanup / Docblocks
2025-07-07 13:19:19 -04:00
Dave Richer
c71026f22a
feature/IO-3255-simplified-parts-management - Sample data modified / added
2025-07-07 13:12:47 -04:00
Dave Richer
bd2720f534
feature/IO-3255-simplified-parts-management - Refactor / Working Change Request
2025-07-07 13:09:55 -04:00
Dave Richer
8bc6bea4b2
feature/IO-3255-simplified-parts-management - Bump deps, add Change Request
2025-07-07 12:14:23 -04:00
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
