Commit graph

1660 commits

Author SHA1 Message Date
CarlNation
e1fa0df820 CSR-520 broken test fix 2022-05-06 15:28:02 -04:00
CarlNation
3466347eb7 CSR-520 2022-05-06 10:17:02 -04:00
CarlNation
78f965ec4f CSR-520 loading modal 2022-05-06 10:12:04 -04:00
CarlNation
e0c067a883 Merge branch 'develop' into feature/CSR-520 2022-05-06 10:02:15 -04:00
CarlNation
3c06e44da5 CSR-520 loading modal 2022-05-06 09:57:31 -04:00
max-dempsey
e18bf628ce
Merge pull request #394 from Safelite/feature/CSR-92
Feature/csr 92
2022-05-06 09:52:48 -04:00
Max
651d7c017c Resolving merge conflicts 2022-05-06 09:48:56 -04:00
CarlNation
063135966f Merge branch 'develop' into feature/CSR-520 2022-05-06 09:12:54 -04:00
scottkiener
0edd240ba4
Merge pull request #397 from Safelite/feature/CSR-240
CSR-240 | Implement Transition via div wrapper
2022-05-06 08:21:05 -04:00
Scott Kiener
31defe304e CSR-240 | Fixing merge conflicts 2022-05-06 08:11:48 -04:00
Scott Kiener
434811ccf7 Merge remote-tracking branch 'origin/develop' into feature/CSR-240 2022-05-06 08:10:36 -04:00
Scott Kiener
3854aa5dff CSR-240 | Implement transition as div wrapper
Also fix padding on first 4 pages
2022-05-05 16:38:26 -04:00
Scott Kiener
30419e2eee Auto stash before merge of "feature/CSR-240" and "origin/develop" 2022-05-05 15:47:37 -04:00
Scott Kiener
f95aebc0aa Merge remote-tracking branch 'origin/develop' into feature/CSR-240 2022-05-05 15:45:36 -04:00
Max
3935e8acc6 Merge branch 'develop' into feature/CSR-92 2022-05-05 13:33:38 -04:00
Frank Rua
7ee2a94ccd
Merge pull request #396 from Safelite/feature/fix-npm
audit fix
2022-05-05 12:47:31 -04:00
Max
47380eda80 Fixing unit tests 2022-05-05 12:11:31 -04:00
FrankRua
03baf4c6b9 audit fix 2022-05-05 12:04:21 -04:00
bmauger
27b9ed72e8
Merge pull request #393 from Safelite/CSR-101-code-review-updates
Csr 101 code review updates
2022-05-05 11:21:29 -04:00
FrankRua
aaf70410e2 fixed merge 2022-05-05 09:18:57 -04:00
Max
842a444e5c Fixing lpl page and nav scenario 2022-05-04 16:28:20 -04:00
bmauger
e4f2fa9ea5
Merge branch 'develop' into CSR-101-code-review-updates 2022-05-04 16:22:51 -04:00
bmauger
269ca9e25c Fix validation so it recognizes when a field has info in it. 2022-05-04 16:13:28 -04:00
bmauger
7b8ad775cf WIP code review updates. 2022-05-04 14:22:39 -04:00
Max
88dcff55af Merge branch 'develop' into feature/CSR-92 2022-05-04 14:13:09 -04:00
Max
fef7a2227e Merge branch 'develop' into feature/CSR-92 and fix / update unit tests 2022-05-04 13:21:05 -04:00
Frank Rua
ae3fbf1c91
Merge pull request #392 from Safelite/feature/CSR-7
Fixed weird formatting / duplicates and added QA var's
2022-05-04 10:48:22 -04:00
FrankRua
eb1843d7c0 Fixed weird formatting / duplicates and added QA var's 2022-05-04 09:53:59 -04:00
FrankRua
484f1eed71 Merge branch 'develop' into feature/CSR-7 2022-05-04 09:46:57 -04:00
CarlNation
0ca1f1ac05
Merge pull request #391 from Safelite/feature/CSR-18
Feature/csr 18
2022-05-04 09:27:04 -04:00
CarlNation
a385e2a8bc CSR-18 remove endpoint 2022-05-04 09:15:22 -04:00
CarlNation
8659d77558 Merge branch 'develop' into feature/CSR-18 2022-05-04 09:11:46 -04:00
CarlNation
341cc02d7d CSR-18 activity log split into lagpageview and logcustomevent 2022-05-04 09:07:59 -04:00
katieoh-safelite
ee67f4adc9
Merge pull request #384 from Safelite/feature/cookie-environment-name
Add current environment to cookie name
2022-05-03 16:39:05 -04:00
Katie
e3bf843e0a CSR-113 Edit comment 2022-05-03 16:28:09 -04:00
Scott Kiener
d9115c65f4 Merge remote-tracking branch 'origin/develop' into feature/CSR-240 2022-05-03 16:09:30 -04:00
Scott Kiener
c3b3fda79f CSR-240 | Fade between page transitions
Two different approaches - PR created for review purposes
2022-05-03 16:04:49 -04:00
Frank Rua
80a2d18c54
Merge pull request #389 from Safelite/feature/CSR-33
adjusted endpoint and logic
2022-05-03 15:49:34 -04:00
FrankRua
fc0ea703ba fix unit tests 2022-05-03 15:46:32 -04:00
FrankRua
809c6d7aa9 mapping 2022-05-03 15:33:56 -04:00
CarlNation
9060c3b2d0 Merge branch 'develop' into feature/CSR-18 2022-05-03 15:25:31 -04:00
DonielleAtSafelite
8ac9309b66
Merge pull request #385 from Safelite/feature/CSR-414-V2
estimate page
2022-05-03 15:20:15 -04:00
Donielle Austin
b5b40d2c5c estimate page 2022-05-03 15:15:34 -04:00
FrankRua
57bd4dbaf7 removed temp code 2022-05-03 15:09:50 -04:00
FrankRua
a42600f24c adjusted endpoint and logic 2022-05-03 15:08:19 -04:00
Donielle Austin
a6481307f7 estimate page edits 2022-05-03 14:49:12 -04:00
CarlNation
6ff58e208a Merge branch 'develop' into feature/CSR-18 2022-05-03 14:49:02 -04:00
DonielleAtSafelite
551e557922
Merge branch 'develop' into feature/CSR-414-V2 2022-05-03 14:42:09 -04:00
Mark Harris
a54280584c
Merge pull request #386 from Safelite/feature/renamed-zip
Feature/renamed zip
2022-05-03 13:31:58 -04:00
Max
e640ff292c Fixing routing table and creating unit tests 2022-05-03 13:14:26 -04:00