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 |
|
Dave Richer
|
bcb8de0937
|
- Fix issues with labels on sorters
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-15 21:03:04 -05:00 |
|
Dave Richer
|
9cc0d6175e
|
- Progress commit
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-15 21:01:43 -05:00 |
|
Dave Richer
|
4c07632ee6
|
Merged in feature/IO-2456-Report-Filters-From-Master (pull request #1283)
- Report Center Filters Version 1 retargeted to Master
Approved-by: Patrick Fic
|
2024-02-15 17:32:38 +00:00 |
|
Dave Richer
|
767c219af8
|
- Remove additional console.log
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-15 11:59:56 -05:00 |
|
Dave Richer
|
cfc301570e
|
- Remove redundant CSS
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-15 11:57:27 -05:00 |
|
Allan Carr
|
fb718f9f37
|
Merged in feature/IO-2631-Update-Schedule-Completion-on-Import (pull request #1284)
IO-2631 Update Scheduled Completion on Supp
Approved-by: Dave Richer
|
2024-02-15 16:53:41 +00:00 |
|
Dave Richer
|
cafc0e5628
|
- Update GUI and provide loading state
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-15 11:49:02 -05:00 |
|
Dave Richer
|
a635725839
|
- Remove console.log statements
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-15 10:58:19 -05:00 |
|
Allan Carr
|
eb8e9b10ef
|
IO-2631 Update Scheduled Completion on Supp
|
2024-02-14 16:47:25 -08:00 |
|
Dave Richer
|
2584f7129c
|
- Report Center Filters Version 1 retargeted to Master
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-14 14:31:35 -05:00 |
|
Dave Richer
|
5d68da846a
|
Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta
|
2024-02-14 13:45:14 -05:00 |
|
Dave Richer
|
46be569b4a
|
- package updates
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-14 13:44:55 -05:00 |
|
Dave Richer
|
3988deea19
|
Merge branch 'master' into feature/IO-1828-Front-End-Package-Updates
|
2024-02-14 13:34:12 -05:00 |
|
Dave Richer
|
17aaaf38d1
|
Merged in test-beta (pull request #1281)
- fix time input boxes with showSeconds deprecated prop
|
2024-02-12 21:29:01 +00:00 |
|
Dave Richer
|
e09081e9ef
|
Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1280)
- fix time input boxes with showSeconds deprecated prop
|
2024-02-12 21:28:25 +00:00 |
|
Dave Richer
|
9883c39101
|
- fix time input boxes with showSeconds deprecated prop
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-12 16:27:10 -05:00 |
|
Patrick Fic
|
3e44458f5c
|
Merge branch 'rome/test-beta' into master-AIO. Initia
|
2024-02-12 13:12:45 -08:00 |
|
Dave Richer
|
735a38ead6
|
Merged in test-beta (pull request #1279)
- card payment modal component had unhidden fields.
|
2024-02-12 20:56:14 +00:00 |
|
Patrick Fic
|
3687a644d6
|
Further merge resolutions of RO into IO.
|
2024-02-12 12:56:03 -08:00 |
|
Dave Richer
|
cca07229d2
|
Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1278)
- card payment modal component had unhidden fields.
|
2024-02-12 20:55:47 +00:00 |
|
Dave Richer
|
f43b4b49ec
|
- card payment modal component had unhidden fields.
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-12 15:54:44 -05:00 |
|
Patrick Fic
|
2fe4b113b2
|
Resolve build issue.
|
2024-02-12 12:22:26 -08:00 |
|
Patrick Fic
|
1d04683c06
|
RO into IO merge as of 02/05/2024.
|
2024-02-12 12:22:05 -08:00 |
|
Allan Carr
|
47a9bd1c2c
|
Merged in test-beta (pull request #1277)
Test beta
Approved-by: Patrick Fic
|
2024-02-09 22:15:56 +00:00 |
|
Dave Richer
|
d03910315d
|
Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta
|
2024-02-09 14:46:39 -05:00 |
|
Dave Richer
|
52ed56fe57
|
- fix query
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-09 14:46:22 -05:00 |
|
Dave Richer
|
960febfe00
|
Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta
|
2024-02-09 14:33:04 -05:00 |
|
Dave Richer
|
b617ccdaf8
|
- fix query
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-09 14:32:48 -05:00 |
|
Dave Richer
|
44168de7a1
|
Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta
|
2024-02-09 14:13:10 -05:00 |
|
Dave Richer
|
fe241be5d1
|
- missed a history push
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-09 14:12:36 -05:00 |
|
Dave Richer
|
ef30352ae3
|
Merged in test-beta (pull request #1276)
Test beta
Approved-by: Patrick Fic
|
2024-02-09 18:47:31 +00:00 |
|
Allan Carr
|
6c996037d6
|
Merged in release/2024-02-02 (pull request #1274)
Release/2024 02 02
Approved-by: Patrick Fic
|
2024-02-09 18:47:24 +00:00 |
|
Dave Richer
|
b69505206c
|
Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1275)
Feature/IO-1828 Front End Package Updates
|
2024-02-09 18:39:03 +00:00 |
|
Dave Richer
|
e187bc3c0c
|
- Fix deprecations brought in from merge release
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-09 13:35:50 -05:00 |
|
Dave Richer
|
4654e01cca
|
- Merge release
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-09 13:29:51 -05:00 |
|
Allan Carr
|
f421b45222
|
Merged in feature/IO-2630-Parts-Queue-Mods (pull request #1272)
IO-2630 Adjust Query to match Tags
|
2024-02-09 17:54:46 +00:00 |
|
Allan Carr
|
30cf46a158
|
IO-2630 Adjust Query to match Tags
|
2024-02-09 09:54:22 -08:00 |
|
Allan Carr
|
8d37c54f89
|
Merged in feature/IO-2630-Parts-Queue-Mods (pull request #1269)
Feature/IO-2630 Parts Queue Mods
Approved-by: Dave Richer
|
2024-02-09 16:14:51 +00:00 |
|
Dave Richer
|
542ca4f1eb
|
Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1270)
Feature/IO-1828 Front End Package Updates
|
2024-02-09 16:14:28 +00:00 |
|
Dave Richer
|
b090a0110a
|
- Merge release
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-09 11:11:22 -05:00 |
|
Allan Carr
|
f9b9f39418
|
IO-2630 Add in Drawer for Parts Queue
|
2024-02-08 17:18:14 -08:00 |
|
Allan Carr
|
05a5df789b
|
IO-2030 Change & Add Columns, Add Sorters and Filters
|
2024-02-08 13:22:00 -08:00 |
|
Allan Carr
|
bed87eda97
|
Merged in feature/IO-2626-CSI-Pages (pull request #1267)
IO-2626 Adjust Image Prop on customer page
|
2024-02-08 17:58:21 +00:00 |
|
Allan Carr
|
67008c35b8
|
IO-2626 Adjust Image Prop on customer page
|
2024-02-08 09:57:39 -08:00 |
|
Patrick Fic
|
04a06e85ec
|
IO-2632 Add basic instance manager functions & editor config.
|
2024-02-07 11:38:57 -08:00 |
|
Dave Richer
|
797610a364
|
Merge branch 'test-beta' into master-beta
|
2024-02-06 19:28:30 -05:00 |
|
Dave Richer
|
1e28bc5eef
|
Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta
# Conflicts:
# client/src/graphql/apollo-error-handling.js
# client/src/index.js
|
2024-02-06 19:27:49 -05:00 |
|
Dave Richer
|
9346a819f5
|
- The Great merge
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-06 19:16:47 -05:00 |
|
Dave Richer
|
4eb8faa5d9
|
- the great reformat
Signed-off-by: Dave Richer <dave@imexsystems.ca>
|
2024-02-06 18:23:46 -05:00 |
|