Skip to content

Commit

Permalink
Merge main into stage to resolve history issues (#2310)
Browse files Browse the repository at this point in the history 
* [Release] Stage to Main (#2299)

* MWPW-147599: CaaS Bulk Publisher not working after MS authentication change (#2248)

Potential fix for bulk publisher issues

Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>
Co-authored-by: Sheridan Sunier <sunier92@gmail.com>

* Preflight Accessibility tab update (#2254)

Updating how alt text is used and displayed in preflight

Co-authored-by: Ryan Clayton <rclayton@adobe.com>

* MWPW-146407: add new card style to caas configurator (#2279)

Co-authored-by: Brad Johnson <fullcolorcoder@gmail.com>
Co-authored-by: Sheridan Sunier <sunier@sheridans-mbp.corp.adobe.com>

* MWPW-141780 - Clean up Accordion block attributes (#2276)

remove role attribute on dd elements

Co-authored-by: Okan Sahin <39759830+mokimo@users.noreply.github.com>

* MWPW-147158: adds support for footer divider at the collection level (#2198)

* MWPW-147158: adds support for footer divider at the collection level

* Updatest unit-test files

* Update windows copy hash

* Update OSX copy hash

* Updates OSX hash again

* Removes console log

* Adds console logs for debbuging

* Removes console logs

* Adds console logs for debbuging again

* Removes console log

* Updates OSX hash

* Adds debuging message to test

* Update os-hash check logic

* trim() generated hash

* Changes the comparison logic for the hash

* Reverts last attempt

* new attempt to fix test

---------

Co-authored-by: Okan Sahin <39759830+mokimo@users.noreply.github.com>

* MWPW-147594: Consumers mappings for origin not being sent when using sidekick (#2244)

* Fix for origin always being upper cased

* Update tools/send-to-caas/send-utils.js

changing to const

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Okan Sahin <39759830+mokimo@users.noreply.github.com>

* Stage automation, update the body after merging another PR in (#2289)

* Stage process improvements

* Remove team reviewers

* Formatting

* Simplify PR bodies

---------

Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>

* Remove label requirements & merge workflows (#2288)

Remove label & merge workflows

Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>

* Quiz entry block (#2294)

* Initial quiz-entry block with ml field

* MWPW-144810: Quiz Entry - Add option cards and text to the block (#2095)

* Quiz entry block (#2103)

* MWPW-144810: Quiz Entry - Add option cards and text to the block

* MWPW-144810: Add the text to strings.xlsx for title, subtitle, ML field default, card instruction bar and the button

* MWPW-146243 - Quiz entry code optimization (#2121)

* MWPW-146243 - Quiz entry code optimization

* Restores code optimization that was lost in previous PRs

Resolves: [MWPW-146243](https://jira.corp.adobe.com/browse/MWPW-146243)

* Update utils.js

* Update quiz-entry.js

Set button to use string values

* Update quiz-entry.js

Fixed to use new strings object

* MWPW-146034 - Quiz entry block accessibility (#2139)

* resolved accessibility concerns when the ml input is used
* general code refinements for more clarity, specifically for getting string values

Resolves: [MWPW-146034](https://jira.corp.adobe.com/browse/MWPW-146034)

* MWPW-146036 - Rig up quiz entry button (#2190)

* Support for ml filtering
* Debug support using ?debug=quiz-entry
* Store quizState in local storage and redirect to the quiz

Resolves: [MWPW-146036](https://jira.corp.adobe.com/browse/MWPW-146036)

* Quiz entry block (#2204)

* MWPW-144810: Quiz Entry - Add option cards and text to the block

* MWPW-144810: Add the text to strings.xlsx for title, subtitle, ML field default, card instruction bar and the button

* MWPW-147031:Add Analytics for Quiz Entry Block, MWPW-146080: Integrate Auto-Complete for Open Text Field on UAR Exposed Front Door

* fix eslint

* fix code according feedbacks

* MWPW-144022: Quiz entry block (#2227)

* carousel starts

* got buttons working

* MWPW-144022: Prototype carousel refinement, keybord controls updated

* linting fixes

* MWPW-147482 - ML Input Bulletproofing (#2242)

* add support for fallback fi codes
* add lana logging for ml field failures
* fix so the redirect checks for maxQuestions

Resolves: [MWPW-147482](https://jira.corp.adobe.com/browse/MWPW-147482)

**Test URLs:**
- Before: https://main--milo--adobecom.hlx.page/?martech=off
- After: https://<branch>--milo--adobecom.hlx.page/?martech=off

* MWPW-147683 - CSS Cleanup (#2267)

* MWPW-147683 - CSS Cleanup

* Final pass on the css
* Edits to markup where necessary

Resolves: [MWPW-147683](https://jira.corp.adobe.com/browse/MWPW-147683)

* pr feedback for vars and eslint errors

* more PR feedback on icon placement

* pr feedback for button border

* cleaned up the carousel widths so it's consistent it all times as it was previously 8px short.

* pr feedback on the location of the input clear X.

* PR feedback - reduced border on input, fixed a card disable bug, addressed card layout in tablet

* carousel starts

* got buttons working

* MWPW-144022: Prototype carousel refinement, keybord controls updated

* linting fixes

* Tests

* working tests update

* Small font size fixes that design has asked for

* linting

* linting

* Update quiz-entry.js with default vals

* Bring back debug

* debugging debug

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/quiz-entry.test.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/quiz-entry.test.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update test/blocks/quiz-entry/mocks/mock-data.js

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* added quiz-entry to utils.js (#2296)

Co-authored-by: Denys Fedotov <dfedotov@Denyss-MacBook-Pro.local>

* MWPW-148206: Update Spectra ML host from cchome-dev to cchome for PROD

---------

Co-authored-by: Jacky Sun <67350368+JackySun9@users.noreply.github.com>
Co-authored-by: Brad Johnson <fullcolorcoder@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Denys Fedotov <denlight@gmail.com>
Co-authored-by: Denys Fedotov <dfedotov@Denyss-MacBook-Pro.local>
Co-authored-by: Jacky Sun <XIASUN@ADOBE.COM>

---------

Co-authored-by: Sanjay Rai <sanrai@adobe.com>
Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>
Co-authored-by: Sheridan Sunier <sunier92@gmail.com>
Co-authored-by: Ryan Clayton <rgclayton@gmail.com>
Co-authored-by: Ryan Clayton <rclayton@adobe.com>
Co-authored-by: Brad Johnson <fullcolorcoder@gmail.com>
Co-authored-by: Sheridan Sunier <sunier@sheridans-mbp.corp.adobe.com>
Co-authored-by: Elan Bartholomew <79870969+elan-tbx@users.noreply.github.com>
Co-authored-by: Okan Sahin <39759830+mokimo@users.noreply.github.com>
Co-authored-by: cmiqueo <64917520+cmiqueo@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>
Co-authored-by: Cody Lloyd <119891065+colloyd@users.noreply.github.com>
Co-authored-by: Jacky Sun <67350368+JackySun9@users.noreply.github.com>
Co-authored-by: Denys Fedotov <denlight@gmail.com>
Co-authored-by: Denys Fedotov <dfedotov@Denyss-MacBook-Pro.local>
Co-authored-by: Jacky Sun <XIASUN@ADOBE.COM>

* Revert "MWPW-141725 Graybox Block (#2282)"

This reverts commit 7c47541.

* Revert "MWPW-148253 Quiz Entry Coverage (#2305)"

This reverts commit ed79630.

* Revert "Revert "MWPW-141725 Graybox Block (#2282)""

This reverts commit e14572a.

* MWPW-148253 Quiz Entry Coverage (#2305)

* Initial quiz-entry block with ml field

* MWPW-144810: Quiz Entry - Add option cards and text to the block (#2095)

* Quiz entry block (#2103)

* MWPW-144810: Quiz Entry - Add option cards and text to the block

* MWPW-144810: Add the text to strings.xlsx for title, subtitle, ML field default, card instruction bar and the button

* MWPW-146243 - Quiz entry code optimization (#2121)

* MWPW-146243 - Quiz entry code optimization

* Restores code optimization that was lost in previous PRs

Resolves: [MWPW-146243](https://jira.corp.adobe.com/browse/MWPW-146243)

* Update utils.js

* Update quiz-entry.js

Set button to use string values

* Update quiz-entry.js

Fixed to use new strings object

* MWPW-146034 - Quiz entry block accessibility (#2139)

* resolved accessibility concerns when the ml input is used
* general code refinements for more clarity, specifically for getting string values

Resolves: [MWPW-146034](https://jira.corp.adobe.com/browse/MWPW-146034)

* MWPW-146036 - Rig up quiz entry button (#2190)

* Support for ml filtering
* Debug support using ?debug=quiz-entry
* Store quizState in local storage and redirect to the quiz

Resolves: [MWPW-146036](https://jira.corp.adobe.com/browse/MWPW-146036)

* Quiz entry block (#2204)

* MWPW-144810: Quiz Entry - Add option cards and text to the block

* MWPW-144810: Add the text to strings.xlsx for title, subtitle, ML field default, card instruction bar and the button

* MWPW-147031:Add Analytics for Quiz Entry Block, MWPW-146080: Integrate Auto-Complete for Open Text Field on UAR Exposed Front Door

* fix eslint

* fix code according feedbacks

* MWPW-144022: Quiz entry block (#2227)

* carousel starts

* got buttons working

* MWPW-144022: Prototype carousel refinement, keybord controls updated

* linting fixes

* MWPW-147482 - ML Input Bulletproofing (#2242)

* add support for fallback fi codes
* add lana logging for ml field failures
* fix so the redirect checks for maxQuestions

Resolves: [MWPW-147482](https://jira.corp.adobe.com/browse/MWPW-147482)

**Test URLs:**
- Before: https://main--milo--adobecom.hlx.page/?martech=off
- After: https://<branch>--milo--adobecom.hlx.page/?martech=off

* MWPW-147683 - CSS Cleanup (#2267)

* MWPW-147683 - CSS Cleanup

* Final pass on the css
* Edits to markup where necessary

Resolves: [MWPW-147683](https://jira.corp.adobe.com/browse/MWPW-147683)

* pr feedback for vars and eslint errors

* more PR feedback on icon placement

* pr feedback for button border

* cleaned up the carousel widths so it's consistent it all times as it was previously 8px short.

* pr feedback on the location of the input clear X.

* PR feedback - reduced border on input, fixed a card disable bug, addressed card layout in tablet

* carousel starts

* got buttons working

* MWPW-144022: Prototype carousel refinement, keybord controls updated

* linting fixes

* Tests

* working tests update

* linting

* linting

* Update quiz-entry.js with default vals

* Bring back debug

* debugging debug

* Improved test coverage

* resolve conflicts

* restore style

* formatting fix

---------

Co-authored-by: Cody Lloyd <colloyd@adobe.com>
Co-authored-by: Jacky Sun <67350368+JackySun9@users.noreply.github.com>
Co-authored-by: Cody Lloyd <119891065+colloyd@users.noreply.github.com>

---------

Co-authored-by: Brad Johnson <fullcolorcoder@gmail.com>
Co-authored-by: milo-pr-merge[bot] <169241390+milo-pr-merge[bot]@users.noreply.github.com>
Co-authored-by: Sanjay Rai <sanrai@adobe.com>
Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>
Co-authored-by: Sheridan Sunier <sunier92@gmail.com>
Co-authored-by: Ryan Clayton <rgclayton@gmail.com>
Co-authored-by: Ryan Clayton <rclayton@adobe.com>
Co-authored-by: Sheridan Sunier <sunier@sheridans-mbp.corp.adobe.com>
Co-authored-by: Elan Bartholomew <79870969+elan-tbx@users.noreply.github.com>
Co-authored-by: cmiqueo <64917520+cmiqueo@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>
Co-authored-by: Cody Lloyd <119891065+colloyd@users.noreply.github.com>
Co-authored-by: Jacky Sun <67350368+JackySun9@users.noreply.github.com>
Co-authored-by: Denys Fedotov <denlight@gmail.com>
Co-authored-by: Denys Fedotov <dfedotov@Denyss-MacBook-Pro.local>
Co-authored-by: Jacky Sun <XIASUN@ADOBE.COM>
Co-authored-by: Cody Lloyd <colloyd@adobe.com>
  • Loading branch information
@mokimo @fullcolorcoder
@milo-pr-merge @sanrai @Blainegunn @sheridansunier @rgclayton @elan-tbx @cmiqueo @github-actions @robert-bogos @colloyd @JackySun9 @denlight
19 people authored May 15, 2024
1 parent ed79630 commit 4880fec
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 4880fec

Please sign in to comment.