admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,674 Commits 1,012 Branches 0 Tags
3e44458f5cfe06ae8dd9da047a8ef80ab958d011
Commit Graph

4674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Dave Richer
e83badb454 - the great reformat 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-06 18:20:58 -05:00
Dave Richer
30c530bcc4 - rectify 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-06 15:31:38 -05:00
Patrick Fic
9b95e40a13 Merge branch 'release/2024-02-02' of bitbucket.org:snaptsoft/bodyshop into release/2024-02-02 2024-02-06 10:05:26 -08:00
Patrick Fic
e3a998b6f8 Merge branch 'feature/IO-2626-CSI-Pages' into release/2024-02-02 2024-02-06 10:05:11 -08:00
Patrick Fic
3c7ede0155 IO-2626 Prevent crisp from loading on anon CSI page. 2024-02-06 10:04:59 -08:00
Allan Carr
82c7aa1347 Merged in feature/IO-2626-CSI-Pages (pull request #1265) 
IO-2626 Resource Class for Test
 2024-02-06 17:37:46 +00:00
Allan Carr
4ccd912363 Merge branch 'feature/IO-2626-CSI-Pages' of bitbucket.org:snaptsoft/bodyshop into feature/IO-2626-CSI-Pages 2024-02-06 09:36:16 -08:00
Patrick Fic
c0525842fd Merge branch 'feature/IO-2626-CSI-Pages' into release/2024-02-02 2024-02-06 09:29:39 -08:00
Patrick Fic
dd5ca5d233 Add resource class to test build as well. 2024-02-06 09:29:22 -08:00
Allan Carr
616a4b04a0 IO-2626 Resource Class for Test 2024-02-06 09:10:32 -08:00
Allan Carr
9a34640c88 Merged in feature/IO-2626-CSI-Pages (pull request #1263) 
IO-2626 CICD Resource Size Change
 2024-02-06 16:55:55 +00:00
Allan Carr
3110be4703 IO-2626 CICD Resource Size Change 2024-02-06 08:52:51 -08:00
Dave Richer
3ec9ea6ed1 Merge branch 'master' into feature/IO-1828-Front-End-Package-Updates 
# Conflicts:
#	client/src/index.js
 2024-02-06 11:51:38 -05:00
Dave Richer
ed5ec61e7c Merged in test-beta (pull request #1262) 
- Add additional date time autocomplete formats
 2024-02-06 16:42:12 +00:00
Dave Richer
5fd71cf25e Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1261) 
- Add additional date time autocomplete formats
 2024-02-06 16:40:39 +00:00
Dave Richer
cba63d609a - Add additional date time autocomplete formats 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-06 11:34:16 -05:00
Allan Carr
971c8d41ff Merged in feature/IO-2626-CSI-Pages (pull request #1253) 
IO-2626 CSI Pages
 2024-02-06 16:17:50 +00:00
Allan Carr
7c303a5154 IO-2626 Change Server Variable Name for response 2024-02-05 20:06:28 -08:00