Commit Graph

4092 Commits

Author SHA1 Message Date
Dave Richer
f8df351de6 Merged in release/2025-03-14 (pull request #2214)
Release/2025 03 14
2025-03-14 15:29:10 +00:00
Dave Richer
87a57e057d Merged in feature/IO-3096-GlobalNotifications (pull request #2212)
IO-3096-GlobalNotifications - Adjust splits
2025-03-13 21:41:35 +00:00
Dave Richer
69da6bccf7 IO-3096-GlobalNotifications - Adjust splits 2025-03-13 17:37:36 -04:00
Dave Richer
b8c096f4ff Merged in release/2025-03-14 (pull request #2211)
IO-3172 RO Basic Payments V2
2025-03-13 21:03:15 +00:00
Allan Carr
9a1f0e1e42 IO-3172 RO Basic Payments V2
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
2025-03-13 14:01:24 -07:00
Dave Richer
93ad23b615 Merged in release/2025-03-14 (pull request #2209)
Release/2025 03 14
2025-03-13 19:34:49 +00:00
Dave Richer
0675f84386 release/2025-03-14 - Fix issues caused by 3 of us merging stuff into release, 2 of which are months long. 2025-03-13 15:30:26 -04:00
Dave Richer
0d6d8e9d7c release/2025-03-14 - Fix issues caused by 3 of us merging stuff into release, 2 of which are months long. 2025-03-13 15:28:15 -04:00
Dave Richer
65ad4d9426 Merged in release/2025-03-14 (pull request #2192)
Release/2025-03-14 into test-AIO - IO-3172 IO-3166
2025-03-12 16:09:26 +00:00
Dave Richer
72ee621303 Merge remote-tracking branch 'origin/feature/IO-3172-RO-Basic-Payments' into release/2025-03-14 2025-03-12 12:08:07 -04:00
Dave Richer
8ae3b28cb6 IO-3166-Global-Notifications-Part-2: checkpoint, Modify additional strings as per Allan, Refactor builder down to prevent duplicate logic, comment out supplement imported. 2025-03-12 11:34:50 -04:00
Allan Carr
87a55028e1 Merge branch 'release/2025-03-14' into feature/IO-3172-RO-Basic-Payments
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

# Conflicts:
#	client/src/components/header/header.component.jsx
#	client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
2025-03-11 13:38:19 -07:00
Allan Carr
8045c228d6 IO-3172 RO Basic Payments
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
2025-03-11 13:25:25 -07:00
Dave Richer
18924b4f08 Merged in release/2025-03-14 (pull request #2188)
Release/2025 03 14
2025-03-11 19:16:00 +00:00
Dave Richer
029fb58f48 IO-3166-Global-Notifications-Part-2: checkpoint 2025-03-11 14:47:54 -04:00
Dave Richer
85929b0bb1 IO-3166-Global-Notifications-Part-2: checkpoint 2025-03-11 14:09:35 -04:00
Dave Richer
dc234e4d72 IO-3166-Global-Notifications-Part-2: checkpoint 2025-03-11 13:57:05 -04:00
Dave Richer
c524f5f0e0 Merged in release/2025-03-14 (pull request #2185)
Release/2025 03 14
2025-03-11 17:18:59 +00:00
Dave Richer
9061821347 IO-3166-Global-Notifications-Part-2: Fixed unread notifications not vanishing once marked as read in unread only 2025-03-11 11:00:42 -04:00
Dave Richer
24798390b5 Merged in release/2024-03-14 (pull request #2170)
IO-3166-Global-Notifications-Part-2 - Small styling change
2025-03-07 18:52:24 +00:00
Dave Richer
235527140c IO-3166-Global-Notifications-Part-2 - Small styling change 2025-03-07 13:50:40 -05:00
Dave Richer
a992dead04 Merged in release/2024-03-14 (pull request #2167)
IO-3166-Global-Notifications-Part-2 - Checkpoint
2025-03-07 16:05:48 +00:00
Dave Richer
11ff8e91c7 IO-3166-Global-Notifications-Part-2 - Checkpoint 2025-03-07 10:58:01 -05:00
Dave Richer
494e691230 Merged in release/2024-03-14 (pull request #2161)
Release/2024 03 14
2025-03-06 21:08:05 +00:00
Dave Richer
02e6c6007c IO-3166-Global-Notifications-Part-2 - Checkpoint 2025-03-06 16:05:42 -05:00
Dave Richer
2cee5f1944 IO-3166-Global-Notifications-Part-2 - Checkpoint 2025-03-06 16:02:01 -05:00
Dave Richer
4cc7366290 Merged in release/2024-03-14 (pull request #2158)
Release/2024 03 14
2025-03-06 18:40:37 +00:00
Dave Richer
53580fbc78 IO-3166-Global-Notifications-Part-2 - Checkpoint 2025-03-06 13:36:19 -05:00
Dave Richer
21335d4e8c IO-3166-Global-Notifications-Part-2 - Checkpoint - job watchers styling 2025-03-05 21:05:24 -05:00
Dave Richer
fd9d660a61 Merged in release/2024-03-14 (pull request #2155)
Release/2024 03 14
2025-03-05 22:33:06 +00:00
Dave Richer
2a65cb5025 IO-3166-Global-Notifications-Part-2 - Checkpoint 2025-03-05 17:28:32 -05:00
Dave Richer
0b5bd4f718 Merged in release/2024-03-14 (pull request #2152)
Release/2024 03 14
2025-03-05 18:56:08 +00:00
Dave Richer
358503f9ef IO-3166-Global-Notifications-Part-2 - Checkpoint 2025-03-05 12:46:45 -05:00
Dave Richer
25a9e6cea1 IO-3166-Global-Notifications-Part-2 - Checkpoint 2025-03-05 12:18:01 -05:00
Dave Richer
7511b42bd4 Merged in release/2024-03-14 (pull request #2149)
Release/2024 03 14
2025-03-05 16:47:40 +00:00
Dave Richer
059067bc61 IO-3166-Global-Notifications-Part-2 - Checkpoint 2025-03-05 11:43:05 -05:00
Dave Richer
f8ae6dc5af IO-3166-Global-Notifications-Part-2 - Checkpoint 2025-03-05 11:07:28 -05:00
Dave Richer
26f94c4d5b Merged in release/2024-03-14 (pull request #2146)
Release/2024 03 14
2025-03-04 22:56:23 +00:00
Dave Richer
07faa5eec2 IO-3166-Global-Notifications-Part-2 - Checkpoint 2025-03-04 17:07:31 -05:00
Dave Richer
2b76f8a12d IO-3096-GlobalNotifications: Package Updates to match test-AIO 2025-03-04 11:40:19 -05:00
Dave Richer
2810428d19 test-AIO - Merge in GlobalNotifications branch 2025-03-04 11:35:12 -05:00
Dave Richer
4fc3fbdcc0 Merged in release/2025-02-28 (pull request #2140)
IO-2561 Return Items Modal
2025-03-04 16:18:49 +00:00
Dave Richer
163978930f feature/IO-3096-GlobalNotifications - Code Review Part 4 2025-03-03 23:29:47 -05:00
Dave Richer
c75e27e018 feature/IO-3096-GlobalNotifications - Code Review Part 3 2025-03-03 23:20:01 -05:00
Dave Richer
555bedbb6c feature/IO-3096-GlobalNotifications - Code Review Part 2 2025-03-03 23:11:03 -05:00
Dave Richer
a57abec81b feature/IO-3096-GlobalNotifications - Code Review Part 1 2025-03-03 22:14:33 -05:00
Dave Richer
15686bdab8 Merge remote-tracking branch 'origin/release/2025-02-28' into feature/IO-3096-GlobalNotifications 2025-03-03 14:35:52 -05:00
Dave Richer
86aa5bf5e7 feature/IO-3096-GlobalNotifications - Checkpoint - Additional String Cleanup, loading spinner 2025-03-03 12:07:19 -05:00
Dave Richer
35b92570e5 feature/IO-3096-GlobalNotifications - Checkpoint - Splits are now in place 2025-03-03 11:41:10 -05:00
Dave Richer
b5c03b8cf0 feature/IO-3096-GlobalNotifications - Checkpoint - add some missing keys (cleanup) 2025-03-03 11:00:55 -05:00