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

4629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick Fic
3687a644d6 Further merge resolutions of RO into IO. 2024-02-12 12:56:03 -08: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
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
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
Dave Richer
9f41b9d9fa Merged in test-beta (pull request #1259) 
- Add additional date time autocomplete formats
 2024-02-05 21:52:56 +00:00
Dave Richer
942fff68a2 Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1258) 
- Add additional date time autocomplete formats
 2024-02-05 21:52:27 +00:00
Dave Richer
3abf3b9bfd - Add additional date time autocomplete formats 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-05 16:52:03 -05:00
Dave Richer
397f9bf587 Merged in test-beta (pull request #1257) 
- fix date picker
 2024-02-05 21:13:57 +00:00
Dave Richer
0d7e54364a Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1256) 
- fix date picker
 2024-02-05 21:13:28 +00:00
Dave Richer
197d97dd99 - fix date picker 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-05 16:06:33 -05:00
Dave Richer
bfc2ecea1c Merged in test-beta (pull request #1255) 
- Fix for job line null check
 2024-02-05 16:37:58 +00:00
Dave Richer
4d1a583939 Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1254) 
- Fix for job line null check
 2024-02-05 16:37:29 +00:00
Dave Richer
498292c2ec - Fix for job line null check 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-02-05 11:35:24 -05:00
Patrick Fic
eb7e2d83af Merge branch 'test-beta' into master-beta - sentry error tracking. 2024-02-01 11:00:23 -08:00
Patrick Fic
ce3caef085 Merge branch 'feature/IO-1828-Front-End-Package-Updates' into master-beta 2024-01-31 13:14:38 -08:00
Patrick Fic
a39dcfba10 Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta 2024-01-31 13:14:13 -08:00
Patrick Fic
6b0c211084 Resolve CI for master. 2024-01-31 13:14:01 -08:00
Patrick Fic
ce3dbbfbc6 Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta 2024-01-31 13:04:34 -08:00
Patrick Fic
c4c65d1696 CI Updates. 2024-01-31 13:03:51 -08:00
Patrick Fic
d8cb1b4a68 Merge branch 'feature/Sentry-Improvements' into test-beta 2024-01-31 10:45:17 -08:00
Patrick Fic
0455e03bfd Remove apollo sentry error. 2024-01-31 10:44:52 -08:00
Patrick Fic
c155d340b5 CI update. 2024-01-31 10:44:22 -08:00
Patrick Fic
434f346688 Merge branch 'feature/Sentry-Improvements' into test-beta 2024-01-31 10:39:07 -08:00
Patrick Fic
4719c2d3a3 Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta 2024-01-31 10:37:03 -08:00
Patrick Fic
7395450b7a CI update. 2024-01-31 10:36:45 -08:00
Patrick Fic
ae596b9df4 Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta 2024-01-31 10:21:20 -08:00
Patrick Fic
62852f4002 CI Changes. 2024-01-31 10:20:49 -08:00
Dave Richer
3b54fd27bb - replace require with import 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-31 12:05:12 -05:00
Dave Richer
f463d3d6aa Merged in test-beta (pull request #1249) 
Test beta
 2024-01-31 17:01:06 +00:00
Dave Richer
b9bca31b57 Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1248) 
- replace require with import
 2024-01-31 17:00:28 +00:00
Dave Richer
edc2a0f122 - replace require with import 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
 2024-01-31 11:59:25 -05:00
Patrick Fic
5ad5cca2ed Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta 2024-01-30 17:40:00 -08:00
Patrick Fic
530032b5ea Remove Jira from CI. 2024-01-30 17:39:46 -08:00
Patrick Fic
fd720f2a27 Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta 2024-01-30 17:38:25 -08:00
Patrick Fic
3ca48350a6 Update old orbs on CI 2024-01-30 17:37:59 -08:00
Patrick Fic
02957fa132 Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta 2024-01-30 17:33:29 -08:00
Patrick Fic
c8979091fd CI update. 2024-01-30 17:28:45 -08:00
Patrick Fic
2310f99787 Merge branch 'test-beta' of bitbucket.org:snaptsoft/bodyshop into test-beta 2024-01-30 17:17:39 -08:00
Patrick Fic
fea67e752b Merge branch 'feature/IO-1828-Front-End-Package-Updates' into test-beta 2024-01-30 17:17:32 -08:00
Patrick Fic
7358dee3e0 CI adjustment. 2024-01-30 17:17:10 -08:00