Commit graph

3171 commits

Author SHA1 Message Date
Katie
3c17de9f2c Fix merge conflicts 2022-09-14 11:28:41 -04:00
CarlNation
f25b43dc6b Merge branch 'release/2022.09.29' into feature/CSR-779 2022-09-14 10:58:59 -04:00
Katie
9078221bb7 Change coverage threshold 2022-09-14 10:49:34 -04:00
CarlNation
0ee3bb672a
Merge pull request #739 from Safelite/rlsmerge/2022.09.29-to-develop
Rlsmerge/2022.09.29 to develop
2022-09-14 09:51:25 -04:00
Adam Caouette
922597ca65 CSR-803: add comment 2022-09-14 09:41:21 -04:00
Adam Caouette
d59378588b Revert "CSR-803: do not think async/await is needed here"
This reverts commit e98543dc5c.
2022-09-14 09:36:56 -04:00
CarlNation
4d96191915 Merge branch 'release/2022.09.29' into rlsmerge/2022.09.29-to-develop 2022-09-14 09:35:26 -04:00
Mark Harris
0079988604
Merge pull request #738 from Safelite/feature/CSR-835-2
trying to fix repair-chips
2022-09-14 08:25:57 -04:00
Mark Harris
9d6b829cb1 trying to fix repair-chips 2022-09-14 08:04:21 -04:00
Leah Schumann
7103c1de60
Merge pull request #735 from Safelite/removeOrigFile
Remove text-block.orig file
2022-09-14 08:01:48 -04:00
katieoh-safelite
413d775fa6
Merge pull request #736 from Safelite/defect/CSR-835
Defect/csr 835
2022-09-13 19:11:47 -04:00
Katie
d8fa80bbe1 CSR-835 Fix broken test 2022-09-13 19:08:26 -04:00
Katie
4c2fbba29e CSR-385 Fix list-button-horizontal 2022-09-13 19:00:20 -04:00
Adam Caouette
e98543dc5c CSR-803: do not think async/await is needed here 2022-09-13 17:38:24 -04:00
Adam Caouette
cffbe64b33 CSR-803: remove keyString prop from question-chain component 2022-09-13 17:24:45 -04:00
Katie
ff6a45e6e4 CSR-835 Update list-button-horizontal, getPartsOrQuestions call 2022-09-13 17:11:52 -04:00
AdamCaouetteSafelite
bb4edb43fa
Merge pull request #733 from Safelite/bugfix/CSR-818
Bugfix/CSR-818
2022-09-13 16:57:12 -04:00
AdamCaouetteSafelite
3eef2ec588
Merge pull request #734 from Safelite/revert-727-bugfix/CSR-818-r2
Revert "CSR-818: add focus style for greyed out button"
2022-09-13 16:56:39 -04:00
Adam Caouette
0ed0566395 CSR-803: remove unneeded property 2022-09-13 15:17:59 -04:00
Leah Schumann
4ccfa5e3f0 Remove text-block.orig file 2022-09-13 15:05:00 -04:00
AdamCaouetteSafelite
ff2a68bb62
Revert "CSR-818: add focus style for greyed out button" 2022-09-13 15:02:19 -04:00
Adam Caouette
f893692346 CSR-818: undo previous commit 2022-09-13 14:59:17 -04:00
Adam Caouette
d34d291c7b CSR-818: small focus style change 2022-09-13 14:52:45 -04:00
Adam Caouette
af069eb3b6 Merge branch 'develop' into bugfix/CSR-818 2022-09-13 13:24:35 -04:00
Katie
8e8f663be3 Add more tests 2022-09-13 13:13:07 -04:00
Leah Schumann
325a0e24c3
Merge pull request #732 from Safelite/feature/buildfix20220913
fixed text-block build issues
2022-09-13 10:59:51 -04:00
Leah Schumann
bdc9f176b5 fixing error ... again? 2022-09-13 10:56:40 -04:00
Leah Schumann
02ff535f6e fixed text-block build issues 2022-09-13 10:33:54 -04:00
Leah Schumann
b9bfd27298
Merge pull request #731 from Safelite/feature/CSR-781-2
Feature/csr 781 2
2022-09-13 09:51:26 -04:00
Leah Schumann
c0da21419e Added quote email message to estimate page and changed top / bottom margins to more accurately reflect Figma 2022-09-13 09:26:10 -04:00
Mark Harris
21d4b4884a fixed remaining merge conflict 2022-09-13 09:25:51 -04:00
Leah Schumann
9c275b6cb7 Before adding text-block to Estimate page 2022-09-13 09:23:52 -04:00
CarlNation
b139ca0b08
Merge pull request #729 from Safelite/feature/CSR-779
CSR-779 Repair view of estimate page
2022-09-13 08:26:00 -04:00
CarlNation
6491b94044 CSR-779 Repair view of estimate page 2022-09-13 08:02:05 -04:00
AdamCaouetteSafelite
adc6059543
Merge pull request #727 from Safelite/bugfix/CSR-818-r2
CSR-818: add focus style for greyed out button
2022-09-12 15:10:30 -04:00
Leah Schumann
14091a172e
Merge pull request #728 from Safelite/rlsmerge/2022.09.29toDevelop
Rlsmerge/2022.09.29to develop
2022-09-12 14:47:36 -04:00
Leah Schumann
ceed64cc36 Preparing to merge 2022.09.29 branch into develop 2022-09-12 14:43:06 -04:00
Adam Caouette
a65881a3de CSR-818: add focus style for greyed out button 2022-09-12 14:27:05 -04:00
Leah Schumann
fe8fa9be2c
Merge pull request #725 from Safelite/cherrypick145359e226
Cherry-picked changes from commit 145359e226
2022-09-12 14:02:42 -04:00
Leah Schumann
681afdc4bd Cherry-picked changes from commit 145359e226 2022-09-12 13:55:28 -04:00
Adam Caouette
788810a93f CSR-818: remove no longer needed unit test 2022-09-12 10:28:31 -04:00
Katie
f51135b030 Merge remote-tracking branch 'origin/release/2022.09.15' into feature/parts-pages-cleanup-KO 2022-09-09 13:34:58 -04:00
Katie
24e4441eaf Add tests 2022-09-09 13:34:42 -04:00
Adam Caouette
3cb31dcd59 CSR-818: fix accessibility for greyed out button 2022-09-08 17:34:17 -04:00
katieoh-safelite
1f68cf3797
Merge pull request #721 from Safelite/defect/CSR-820-2
CSR-820 Add back usage of getHasRecalibrationPart
2022-09-08 08:50:38 -04:00
Leah Schumann
7600d0b181
Merge pull request #723 from Safelite/feature/CSR-757
Added conditional in arePagePrerequisitesValid to check if order is r…
2022-09-08 08:49:36 -04:00
Leah Schumann
cce84cf0ac Added conditional in arePagePrerequisitesValid to check if order is repair or has glassParts 2022-09-08 08:44:00 -04:00
katieoh-safelite
ed59ea0023
Merge pull request #722 from Safelite/feature/CSR-743-revert-temp-tests
Feature/csr 743 revert temp tests
2022-09-08 08:35:52 -04:00
Katie
b350eaae93 Revert commit 'CSR-743 experiment integration testing' and change hasSettingEqualTo to use loose equality 2022-09-08 08:24:08 -04:00
Katie
50bddd897a Revert "fix hard coded value"
This reverts commit b569225eff.
2022-09-08 08:21:09 -04:00