Dave Richer
1cc33a67e6
Merge remote-tracking branch 'origin/release/2025-08-01' into feature/IO-3255-simplified-part-management
2025-07-25 11:25:35 -04:00
Allan Carr
5277e90946
Merged in feature/IO-3310-Shop-Data-Preservation (pull request #2433 )
...
IO-3310 Shop Data Preservation on Hidden Fields
Approved-by: Dave Richer
2025-07-24 17:50:14 +00:00
Dave Richer
0a16a0fcbc
Merge remote-tracking branch 'origin/release/2025-08-01' into feature/IO-3255-simplified-part-management
2025-07-23 10:18:36 -04:00
Allan Carr
15ea4e6afa
IO-3310 Shop Data Preservation on Hidden Fields
...
Signed-off-by: Allan Carr <allan@imexsystems.ca >
2025-07-22 17:40:51 -07:00
Dave Richer
295f1d1cb3
Merge branch 'hotfix/2025-07-22-SocketProvider' into feature/IO-3255-simplified-part-management
2025-07-22 20:17:13 -04:00
Dave Richer
5b3b6a409c
Merged in hotfix/2025-07-22-SocketProvider (pull request #2431 )
...
Hotfix/2025 07 22 SocketProvider
2025-07-23 00:16:13 +00:00
Patrick Fic
93c6e2b601
Revert socket transport settings.
2025-07-22 14:23:25 -07:00
Dave Richer
19a90571f6
Down Socket Reconnects
2025-07-22 17:11:52 -04:00
Dave Richer
37ceddf54d
Merge remote-tracking branch 'origin/release/2025-08-01' into feature/IO-3255-simplified-part-management
2025-07-22 14:56:22 -04:00
Patrick Fic
736e9cedfa
Merged in feature/IO-2604-vendor-tagging (pull request #2428 )
...
IO-2604 Add vendor tags to search select & vendor edit screen.
Approved-by: Dave Richer
2025-07-22 18:09:57 +00:00
Patrick Fic
c433103e1b
IO-2604 Merge in conflicted translations file.
2025-07-22 10:25:04 -07:00
Patrick Fic
2892fdbb58
IO-2604 reformat translations to resolve conflict.
2025-07-22 10:17:10 -07:00
Patrick Fic
c45f38e47b
IO-2604 Add vendor tags to search select & vendor edit screen.
2025-07-22 10:03:07 -07:00
Dave Richer
6f4d21cac9
feature/IO-3255-simplified-parts-management - Merge release
2025-07-22 12:22:52 -04:00
Dave Richer
6b5ad3dafa
feature/IO-3255-simplified-parts-management -Checkpoint
2025-07-22 12:20:59 -04:00
Patrick Fic
1934ae0758
IO-3292 Add note pinning functionality.
2025-07-22 09:03:41 -07:00
Dave Richer
0ac9bbd97c
feature/IO-3255-simplified-parts-management -Checkpoint
2025-07-21 15:28:03 -04:00
Dave Richer
dfa457e3c6
feature/IO-3255-simplified-parts-management -Checkpoint
2025-07-21 15:05:15 -04:00
Dave Richer
e8dec042bd
feature/IO-3255-simplified-parts-management - Merge Master / Bump Packages
2025-07-21 13:04:30 -04:00
Dave Richer
139ee46dc0
feature/IO-3255-simplified-parts-management - Merge release / resolve conflicts
2025-07-18 11:26:51 -04:00
Allan Carr
cf9d8d649d
Merged in feature/IO-3309-Date-Restriction-Removal (pull request #2419 )
...
IO-3309 Date Field Rescriton Removal
Approved-by: Dave Richer
2025-07-17 23:36:53 +00:00
Allan Carr
a25051c4c2
IO-3309 Date Field Rescriton Removal
...
Signed-off-by: Allan Carr <allan@imexsystems.ca >
2025-07-17 16:31:08 -07:00
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
Allan Carr
d5c3152631
Merged in feature/IO-3252-Reschedule-Job (pull request #2417 )
...
IO-3252 Reschedule Job with Existing Data
Approved-by: Dave Richer
2025-07-16 21:08:03 +00:00
Allan Carr
66c425bf96
IO-3252 Fix Spelling Mistake in Feature Request
...
Signed-off-by: Allan Carr <allan@imexsystems.ca >
2025-07-16 14:12:16 -07:00
Allan Carr
ffad0dfbf7
IO-3252 Reschedule Job with Existing Data
...
Signed-off-by: Allan Carr <allan@imexsystems.ca >
2025-07-16 14:02:30 -07:00
Allan Carr
f13f79acb6
Merged in feature/IO-3286-Additional-Product-Fruit-IDs (pull request #2406 )
...
IO-3286 Additional Product Fruit IDs
Approved-by: Dave Richer
2025-07-15 18:01:05 +00:00
Dave Richer
28abd9707e
feature/IO-3303-logging - Logging
2025-07-14 19:31:31 -04:00
Dave Richer
624414799e
Merge branch 'feature/IO-3303-Socket-IO-Optimization-Auto-Add-Watchers-Gate' into release/2025-07-18
...
# Conflicts:
# client/src/contexts/SocketIO/socketProvider.jsx
2025-07-14 18:45:34 -04:00
Dave Richer
72091e9eae
feature/IO-3303-Socket-IO-Optimization-Auto-Add-Watchers-Gate - SocketIO Optimization / Auto Add Watchers Gate
2025-07-14 18:42:27 -04:00
Dave Richer
9cfacdd025
Merged in feature/IO-3291-Tasks-Notifications (pull request #2407 )
...
feature/IO-3291-Tasks-Notifications: Package Bumps
2025-07-14 17:34:30 +00:00
Dave Richer
d5c63b798a
feature/IO-3291-Tasks-Notifications: Package Bumps
2025-07-14 13:33:23 -04:00
Allan Carr
655e516246
IO-3286 Additional Product Fruit IDs
...
Signed-off-by: Allan Carr <allan@imexsystems.ca >
2025-07-11 11:07:12 -07:00
Dave Richer
7b12f0a3b9
Merged in feature/IO-3291-Tasks-Notifications (pull request #2404 )
...
Feature/IO-3291 Tasks Notifications
2025-07-11 17:40:06 +00:00
Dave Richer
e0b937474d
feature/IO-3291-Tasks-Notifications: Final
2025-07-11 13:38:19 -04:00
Allan Carr
5c4267f3ef
Merge branch 'master-AIO' into feature/IO-3286-Additional-Product-Fruit-IDs
2025-07-11 10:31:22 -07:00
Dave Richer
4dcfb382a9
feature/IO-3291-Tasks-Notifications: Checkpoint
2025-07-10 17:27:32 -04:00
Dave Richer
cf181dfd0a
feature/IO-3291-Tasks-Notifications: Checkpoint
2025-07-10 16:40:55 -04:00
Dave Richer
1127864ba9
feature/IO-3291-Tasks-Notifications: Checkpoint
2025-07-10 13:18:01 -04:00
Dave Richer
79e379b61a
feature/IO-3291-Tasks-Notifications: Checkpoint
2025-07-10 10:12:50 -04:00
Allan Carr
e79e512291
Merged in feature/IO-3296-Scheduled-Delivery-Dashboard (pull request #2402 )
...
Feature/IO-3296 Scheduled Delivery Dashboard
Approved-by: Dave Richer
2025-07-09 22:30:29 +00:00
Allan Carr
f0064abfbe
IO-3296 Schedule Delivery Dashboard
...
Signed-off-by: Allan Carr <allan@imexsystems.ca >
2025-07-09 15:16:31 -07:00
Dave Richer
4a30a5bc64
feature/IO-3291-Tasks-Notifications: Checkpoint
2025-07-09 17:47:32 -04:00
Allan Carr
32bdea559e
IO-3296 Schedule Delivery Dashboard
...
Signed-off-by: Allan Carr <allan@imexsystems.ca >
2025-07-09 14:37:51 -07:00
Dave Richer
d4215b7aee
feature/IO-3291-Tasks-Notifications: Checkpoint
2025-07-09 16:41:55 -04:00
Dave Richer
2494399993
feature/IO-3291-Tasks-Notifications: Checkpoint
2025-07-09 13:12:28 -04:00
Dave Richer
34f62a8858
feature/IO-3291-Tasks-Notifications: Checkpoint
2025-07-09 12:40:26 -04:00
Dave Richer
9e5689b06f
feature/IO-3291-Tasks-Notifications: Checkpoint
2025-07-09 11:59:57 -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
Dave Richer
5d69d37db2
Merge remote-tracking branch 'origin/master-AIO' into feature/IO-3291-Tasks-Notifications
2025-07-09 11:14:28 -04:00
