Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit dc50338

Browse files
doboothdobooth
authored
Merge branch 'master' into fix/broken_symlink_8787
2 parents 2867a5c + 80d17c1 commit dc50338

File tree

155 files changed

+3253
-1213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+3253
-1213
lines changed

‎.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ You can provide feedback using the following options:
148148

149149
Have a question? Need help? Magento DevDocs, Maintainers, and other Contributors are available through:
150150

151-
- [Slack](https://magentocommeng.slack.com/messages/CAN932A3H) ([Join us](http://tinyurl.com/engcom-slack))
151+
- [Slack](https://magentocommeng.slack.com/messages/CAN932A3H) ([Join us](https://opensource.magento.com/slack))
152152
- [Twitter @MagentoDevDocs](https://twitter.com/MagentoDevDocs)
153153

154154
Thank you for contributing your brilliance to Magento DevDocs!!

‎.github/workflows/linter.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,20 @@ on:
2121
# Set the Job #
2222
###############
2323
jobs:
24-
25-
build:
26-
# Name the Job
27-
name: Lint Code Base
24+
mdl:
25+
name: mdl
26+
runs-on: ubuntu-latest
27+
steps:
28+
- uses: actions/checkout@v2
29+
- name: Set up Ruby
30+
uses: actions/setup-ruby@v1
31+
with:
32+
ruby-version: 2.6
33+
- name: Install mdl gem
34+
run: gem install mdl
35+
- name: Run mdl
36+
run: mdl --style=_checks/styles/style-rules-prod --ignore-front-matter --git-recurse -- .
37+
super-lint:
2838
# Set the agent to run on
2939
runs-on: ubuntu-latest
3040

‎Docfile.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,3 @@ content_map:
2020
repository: magento/magento2-page-builder-docs
2121
branch: master
2222
filter: true
23-
-
24-
directory: src/page-builder-migration
25-
repository: magento/magento2-page-builder-data-migration
26-
branch: 1.0.0-release
27-
filter: true
28-

‎rakelib/update.rake

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ namespace :update do
2424
update_dir 'src/page-builder'
2525
end
2626

27-
desc 'Update Page Builder Migration docs'
28-
task :pbm do
29-
puts 'Updating Page Builder Migration docs'.magenta
30-
update_dir 'src/page-builder-migration'
31-
end
32-
3327
desc 'Update MFTF docs'
3428
task :mftf do
3529
puts 'Updating MFTF docs:'.magenta

‎src/_data/codebase/cloud/magento-cloud.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎src/_data/codebase/v2_4/mrg/ce/ConfigurableProduct.yml

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,45 @@ release: 2.4.2
55
github_path: app/code/Magento/ConfigurableProduct/README.md
66
last_modified_at: '2014-12-12 12:14:06 -0800'
77
content: |-
8-
Magento_ConfigurableProduct module introduces new product type in the Magento application called Configurable Product.
8+
The Magento_ConfigurableProduct module introduces new product type in the Magento application called Configurable Product.
99
This module is designed to extend existing functionality of Magento_Catalog module by adding new product type.
1010
1111
Configurable Products let the customers select the variant they desire by choosing options.
1212
For example, store owner sells t-shirts in two colors and three sizes.
13+
14+
## Structure
15+
16+
`ConfigurableProduct/` - the directory that declares ConfigurableProduct metadata used by the module.
17+
18+
For information about a typical file structure of a module in Magento 2, see [Module file structure](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/build/module-file-structure.html#module-file-structure).
19+
20+
## Extensibility
21+
22+
Extension developers can interact with the Magento_ConfigurableProduct module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/plugins.html).
23+
24+
[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_ConfigurableProduct module.
25+
26+
## Additional information
27+
28+
### Configurable variables through the theme view.xml
29+
30+
Modify the value of the `gallery_switch_strategy` variable in the theme view.xml file to configure how gallery images should be updated when a user switches between product configurations.
31+
32+
Learn how to [configure variables](https://devdocs.magento.com/guides/v2.4/frontend-dev-guide/themes/theme-images.html#view_xml_vars) in the view.xml file.
33+
34+
There are two available values for the `gallery_switch_strategy` variable:
35+
36+
Value | Description
37+
--- | ---
38+
`replace` | In replace mode, images of the parent configurable product will be replaced by the simple product images upon a configuration change
39+
`prepend` | In prepend mode, the simple product images will be added in front of the parent configurable product upon a configuration change
40+
41+
If the `gallery_switch_strategy` variable is not defined, the default value `replace` will be used.
42+
43+
For example, adding these lines of code to the theme view.xml file will set the gallery behavior to `replace` mode.
44+
45+
```xml
46+
<vars module="Magento_ConfigurableProduct">
47+
<var name="gallery_switch_strategy">replace</var>
48+
</vars>
49+
```

‎src/_data/features.yml

Lines changed: 280 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,280 @@
1+
versions:
2+
- 2.0
3+
- 2.1
4+
- 2.2
5+
- 2.3
6+
- 2.4
7+
features:
8+
-
9+
name: Maximizing conversion & sales
10+
versions:
11+
-
12+
name: Seller Assisted Shopping
13+
support:
14+
2.0: false
15+
2.1: false
16+
2.2: false
17+
2.3: false
18+
2.4: true
19+
-
20+
name: Product Recommendations powered by Adobe Sensei
21+
support:
22+
2.0: false
23+
2.1: false
24+
2.2: false
25+
2.3: true
26+
2.4: true
27+
-
28+
name: Page Builder drag and drop content management
29+
support:
30+
2.0: false
31+
2.1: false
32+
2.2: false
33+
2.3: true
34+
2.4: true
35+
-
36+
name: PWA Studio
37+
support:
38+
2.0: false
39+
2.1: false
40+
2.2: false
41+
2.3: true
42+
2.4: true
43+
-
44+
name: PayPal Smart Buttons
45+
support:
46+
2.0: false
47+
2.1: false
48+
2.2: false
49+
2.3: true
50+
2.4: true
51+
-
52+
name: Vendor Bundled Extension – Yotpo
53+
support:
54+
2.0: false
55+
2.1: false
56+
2.2: false
57+
2.3: true
58+
2.4: true
59+
-
60+
name: Live Chat Agent powered by dotdigital
61+
support:
62+
2.0: false
63+
2.1: false
64+
2.2: false
65+
2.3: true
66+
2.4: true
67+
-
68+
name: Amazon Sales Channel
69+
support:
70+
2.0: false
71+
2.1: false
72+
2.2: true
73+
2.3: true
74+
2.4: true
75+
-
76+
name: B2B-ready functionality and APIs (check B2B's infosheet for more info)
77+
support:
78+
2.0: false
79+
2.1: false
80+
2.2: true
81+
2.3: true
82+
2.4: true
83+
-
84+
name: Instant Purchase
85+
support:
86+
2.0: false
87+
2.1: false
88+
2.2: true
89+
2.3: true
90+
2.4: true
91+
-
92+
name: Vendor Bundled Extensions (dotdigital, Klarna & Braintree)
93+
support:
94+
2.0: false
95+
2.1: false
96+
2.2: true
97+
2.3: true
98+
2.4: true
99+
-
100+
name: PayPal in-context checkout
101+
support:
102+
2.0: false
103+
2.1: true
104+
2.2: true
105+
2.3: true
106+
2.4: true
107+
-
108+
name: Smarter, faster operations
109+
versions:
110+
-
111+
name: Enhanced Media Gallery & Asset Management
112+
support:
113+
2.0: false
114+
2.1: false
115+
2.2: false
116+
2.3: false
117+
2.4: true
118+
-
119+
name: Buy Online Pickup In-Store (BOPIS)
120+
support:
121+
2.0: false
122+
2.1: false
123+
2.2: false
124+
2.3: false
125+
2.4: true
126+
-
127+
name: B2B Order Approval Workflows
128+
support:
129+
2.0: false
130+
2.1: false
131+
2.2: false
132+
2.3: false
133+
2.4: true
134+
-
135+
name: Adobe Stock Integration
136+
support:
137+
2.0: false
138+
2.1: false
139+
2.2: false
140+
2.3: true
141+
2.4: true
142+
-
143+
name: Multi-Source Inventory management
144+
support:
145+
2.0: false
146+
2.1: false
147+
2.2: false
148+
2.3: true
149+
2.4: true
150+
-
151+
name: Integrated Vertex
152+
support:
153+
2.0: false
154+
2.1: false
155+
2.2: true
156+
2.3: true
157+
2.4: true
158+
-
159+
name: Business Intelligence
160+
support:
161+
2.0: false
162+
2.1: true
163+
2.2: true
164+
2.3: true
165+
2.4: true
166+
-
167+
name: Content staging & preview
168+
support:
169+
2.0: false
170+
2.1: true
171+
2.2: true
172+
2.3: true
173+
2.4: true
174+
-
175+
name: Platform, performance, and security enhancements
176+
versions:
177+
-
178+
name: Site-wide Analysis Tool
179+
support:
180+
2.0: false
181+
2.1: false
182+
2.2: false
183+
2.3: false
184+
2.4: true
185+
-
186+
name: Composer Update Plugin
187+
support:
188+
2.0: false
189+
2.1: false
190+
2.2: false
191+
2.3: false
192+
2.4: true
193+
-
194+
name: Upgrade Compatibility Tool
195+
support:
196+
2.0: false
197+
2.1: false
198+
2.2: false
199+
2.3: false
200+
2.4: true
201+
-
202+
name: In-Product Guidance
203+
support:
204+
2.0: false
205+
2.1: false
206+
2.2: false
207+
2.3: false
208+
2.4: true
209+
-
210+
name: PHP 7.4
211+
support:
212+
2.0: false
213+
2.1: false
214+
2.2: false
215+
2.3: false
216+
2.4: true
217+
-
218+
name: PHP 7.3
219+
support:
220+
2.0: false
221+
2.1: false
222+
2.2: false
223+
2.3: true
224+
2.4: true
225+
-
226+
name: Continued tech stack updates
227+
support:
228+
2.0: false
229+
2.1: false
230+
2.2: false
231+
2.3: true
232+
2.4: true
233+
-
234+
name: Ongoing performance, quality, and security improvements
235+
support:
236+
2.0: false
237+
2.1: false
238+
2.2: false
239+
2.3: true
240+
2.4: true
241+
-
242+
name: Asynchronous & Bulk APIs
243+
support:
244+
2.0: false
245+
2.1: false
246+
2.2: false
247+
2.3: true
248+
2.4: true
249+
-
250+
name: GraphQL
251+
support:
252+
2.0: false
253+
2.1: false
254+
2.2: false
255+
2.3: true
256+
2.4: true
257+
-
258+
name: Declarative Schema for easier installations and upgrades
259+
support:
260+
2.0: false
261+
2.1: false
262+
2.2: false
263+
2.3: true
264+
2.4: true
265+
-
266+
name: Security Tools:/ 2FA, ReCAPTCHA, ACL, WAF
267+
support:
268+
2.0: false
269+
2.1: false
270+
2.2: false
271+
2.3: true
272+
2.4: true
273+
-
274+
name: Magento-optimized cloud
275+
support:
276+
2.0: false
277+
2.1: true
278+
2.2: true
279+
2.3: true
280+
2.4: true

0 commit comments

Comments
 (0)