Skip to content

[CMS Team 2 - Sprint 13] Changes to content type configuration, missing MFTF tests, custom container documentation, data migration bug and color picker bug #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Changes from 1 commit
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
6685c10
MC-3087: Overlay color for banner displays as input instead of color …
Jul 17, 2018
e1b3a61
MC-3145: Data migration is broken from bluefoot to mainline pagebuilder
Jul 17, 2018
79ea774
MC-3277: Remove wrapper for style and attributes
Jul 17, 2018
de8e35f
MC-230: Customer should be able to see basic Bundle product details
Clendenin Jul 17, 2018
7c1147c
MC-3087: Overlay color for banner displays as input instead of Color …
dhaecker Jul 18, 2018
0a92485
MC-3277: Remove wrapper for style and attributes
Jul 18, 2018
6adee5d
MC-3145: Data migration is broken from bluefoot to mainline pagebuilder
Jul 18, 2018
8ffa030
MC-3277: Remove wrapper for style and attributes
Jul 18, 2018
827fb2f
MC-3275: Change Persist/Virtual Attributes to persistance_mode
krissyhiserote Jul 17, 2018
11a8fc1
MC-3275: Change Persist/Virtual Attributes to persistance_mode
krissyhiserote Jul 18, 2018
58d32dc
MC-3275: Change Persist/Virtual Attributes to persistance_mode
krissyhiserote Jul 18, 2018
033c8ad
MC-3276: Eliminate Complex Property/Attribute
tjwiebell Jul 19, 2018
ec1f2ef
MC-800: [Doc] Create Custom Content Block
Jul 19, 2018
8b7b681
MC-3276: Eliminate Complex Property/Attribute
tjwiebell Jul 19, 2018
9aa3562
MC-3276: Eliminate Complex Property/Attribute
tjwiebell Jul 20, 2018
4d6c38f
MC-3275: Change Persist/Virtual Attributes to persistance_mode
krissyhiserote Jul 20, 2018
72a1ffe
MC-800: [Doc] Create Custom Content Block
Jul 20, 2018
0690c70
MC-3277: Remove Wrapper for Style and Attributes
krissyhiserote Jul 20, 2018
0c7d956
Merge remote-tracking branch 'mainline/develop' into MC-532-eliminate…
tjwiebell Jul 20, 2018
f5e4964
MC-800: [Doc] Create Custom Content Block
Jul 20, 2018
f438aea
MC-3362: Move Map
dhaecker Jul 23, 2018
5546831
MC-3355: Move Banner
dhaecker Jul 23, 2018
e45881d
MC-3364: Rename ElementAttributeReader to AttributeReader
tjwiebell Jul 23, 2018
5813187
MC-3352: Delete Banner
dhaecker Jul 23, 2018
c2e2f20
MC-3357: Delete divider
Jul 23, 2018
b7fd502
MC-3357: Delete divider
Jul 23, 2018
77b1acd
MC-3358: Move Divider
krissyhiserote Jul 23, 2018
e6f72a2
MC-3358: Move Divider
krissyhiserote Jul 23, 2018
034d3e1
MC-3359: Delete Video
krissyhiserote Jul 23, 2018
ce4236f
MC-3363: Additional configuration node changes
Jul 23, 2018
fb684ca
MC-3361: Move Video
krissyhiserote Jul 24, 2018
5353de4
MC-3363: Additional configuration node changes
Jul 24, 2018
9f66551
MC-3363: Additional configuration node changes
Jul 24, 2018
876d2a9
MC-3357: Delete divider
Jul 24, 2018
2f8074a
MC-3357: Delete divider
Jul 24, 2018
5e160be
Merge branch 'MC-3226-add-missing-p0-p1-mftf-tests-for-divider' of gi…
Jul 24, 2018
af817d2
MC-3360: Duplicate Video
krissyhiserote Jul 24, 2018
5b3f99e
MC-3363: Additional configuration node changes
Jul 24, 2018
13baf92
MC-230: Customer should be able to see basic Bundle product details
Jul 24, 2018
05a2013
MC-230: Customer should be able to see basic Bundle product details
Jul 24, 2018
1086be4
MC-230: Customer should be able to see basic Bundle product details
Jul 24, 2018
d2d20da
MC-3363: Additional configuration node changes
Jul 25, 2018
722abfa
MC-3363: Additional configuration node changes
Jul 25, 2018
466f842
Merge remote-tracking branch 'origin/MC-532-eliminate-contradicting-a…
Jul 25, 2018
5969d67
MC-3360: Duplicate Video
krissyhiserote Jul 25, 2018
7808c0d
MC-800: [Doc] Create Custom Content Block
Jul 25, 2018
559b0d4
MC-800: [Doc] Create Custom Content Block
Jul 25, 2018
b053eea
MC-800: [Doc] Create Custom Content Block
Jul 25, 2018
3c79f68
MC-3360: Duplicate Video
krissyhiserote Jul 25, 2018
600bb26
MC-3360: Duplicate Video
krissyhiserote Jul 25, 2018
cf4c088
MC-800: [Doc] Create Custom Content Block
Jul 25, 2018
f904f92
MC-800: Create custom content block
Jul 26, 2018
890beae
Merge remote-tracking branch 'origin/MC-3226-add-missing-p0-p1-mftf-t…
Jul 26, 2018
ddc99b3
Merge remote-tracking branch 'origin/MC-3087-overlay-color-for-banner…
Jul 26, 2018
5fb4bb3
Merge remote-tracking branch 'origin/MC-3145-data-migration-is-broken…
Jul 26, 2018
ff0bcb0
MC-3354: All Attributes Banner
dhaecker Jul 26, 2018
d85a104
Merge remote-tracking branch 'owls/MC-3229-add-missing-p0-p1-mftf-tes…
krissyhiserote Jul 26, 2018
5ecdea2
MC-3354: All Attributes Banner
dhaecker Jul 27, 2018
d9c30ca
Merge remote-tracking branch 'mainline/develop' into MC-230
tomreece Jul 27, 2018
5ff6676
MC-3354: All Attributes Banner
dhaecker Jul 27, 2018
aa791d1
Merge remote-tracking branch 'obsessive-owls/cms-team-2-sprint-13' in…
dhaecker Jul 27, 2018
2e4acde
MC-800: Create custom content block
Jul 27, 2018
11e0be5
MC-800: Create custom content block
Jul 27, 2018
1dfa16f
MC-3354: All Attributes Banner
dhaecker Jul 27, 2018
bbbf68c
MC-3354: All Attributes Banner
dhaecker Jul 30, 2018
fda17c0
MC-3362: Move Map
krissyhiserote Jul 30, 2018
eb89a40
Merge remote-tracking branch 'owls/MC-3233-Add-Missing-P0-P1-MFTF-Tes…
krissyhiserote Jul 30, 2018
bf9d84b
MC-800: Create custom content block
jcalcaben Jul 30, 2018
3d36483
MC-3354: All Attributes Banner
dhaecker Jul 30, 2018
6f007e0
Merge remote-tracking branch 'owls/MC-3239-Add-Missing-P0-P1-MFTF-Tes…
krissyhiserote Jul 30, 2018
be90be4
MC-3436: Address demo feedback and docs review changes
Jul 30, 2018
e109fa0
Merge remote-tracking branch 'mainline/develop' into cms-team-2-sprin…
tjwiebell Aug 1, 2018
1e97bb9
MC-3363: [Architecture] Additional Configuration Node Changes
tjwiebell Aug 1, 2018
7c4786c
MC-3145: Data Migration Is Broken From Bluefoot To Mainline Pagebuilder
tjwiebell Aug 1, 2018
914fa68
MC-3354: All Attributes Banner
dhaecker Aug 1, 2018
0d6a392
Merge remote-tracking branch 'pangolin/MC-230' into cms-team-2-sprint-13
tjwiebell Aug 2, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
MC-3145: Data Migration Is Broken From Bluefoot To Mainline Pagebuilder
- Resolve some issues with Product expected output after merge with mainline
  • Loading branch information
tjwiebell committed Aug 1, 2018
commit 7c4786cf5d22e9ff546ae3ff6ce7eb73cb27ceff
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div data-element="main" data-role="row" data-appearance="contained"><div data-element="inner"><div data-element="main" data-role="products" data-appearance="grid" class="one two" style="text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;">{{widget type="Magento\CatalogWidget\Block\Product\ProductsList" template="Magento_CatalogWidget::product/widget/content/grid.phtml" type_name="Catalog Products List" anchor_text="" id_path="" show_pager="0" products_count="2" conditions_encoded="^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:^[`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`==`,`value`:`product-for-data-migration`^]^]^]^]"}}</div></div></div>
<div data-element="main" data-role="row" data-appearance="contained"><div data-element="inner"><div data-element="main" data-role="products" data-appearance="grid" class="one two" style="text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;">{{widget type="Magento\CatalogWidget\Block\Product\ProductsList" template="Magento_CatalogWidget::product/widget/content/grid.phtml" type_name="Catalog Products List" anchor_text="" id_path="" show_pager="0" products_count="1" conditions_encoded="^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:^[`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`==`,`value`:`product-for-data-migration`^]^]^]^]"}}</div></div></div>