Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit f824a36

Browse files
authored
Merge branch 'master' into db_remove_old_front_matter
2 parents 1640719 + dd9d777 commit f824a36

File tree

1,231 files changed

+18829
-44533
lines changed

Some content is hidden

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

1,231 files changed

+18829
-44533
lines changed

Gemfile.lock

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
11
GIT
22
remote: https://github.com/magento-devdocs/devdocs-theme.git
3-
revision: 7ed3a8b1051e6f03527ba0ee833d78f6fe3d3302
3+
revision: d2a43eecfe4fcf0586cc08ebe342bd9d5de8b41f
44
specs:
5-
devdocs (2)
5+
devdocs (3)
66
jekyll (>= 3.3)
77

88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
activesupport (5.2.3)
12-
concurrent-ruby (~> 1.0, >= 1.0.2)
13-
i18n (>= 0.7, < 2)
14-
minitest (~> 5.1)
15-
tzinfo (~> 1.1)
16-
addressable (2.6.0)
17-
public_suffix (>= 2.0.2, < 4.0)
18-
algolia_html_extractor (2.6.1)
11+
addressable (2.7.0)
12+
public_suffix (>= 2.0.2, < 5.0)
13+
algolia_html_extractor (2.6.2)
1914
json (~> 2.0)
20-
nokogiri (~> 1.8.2)
21-
algoliasearch (1.26.0)
15+
nokogiri (~> 1.10.4)
16+
algoliasearch (1.27.0)
2217
httpclient (~> 2.8, >= 2.8.3)
2318
json (>= 1.5.1)
2419
colorator (1.1.0)
25-
colorize (0.8.1)
2620
concurrent-ruby (1.1.5)
2721
em-websocket (0.5.1)
2822
eventmachine (>= 0.12.9)
@@ -36,31 +30,30 @@ GEM
3630
ffi (1.11.1)
3731
filesize (0.2.0)
3832
forwardable-extended (2.6.0)
39-
fspath (3.1.1)
40-
html-proofer (3.9.3)
41-
activesupport (>= 4.2, < 6.0)
33+
fspath (3.1.2)
34+
html-proofer (3.12.2)
4235
addressable (~> 2.3)
43-
colorize (~> 0.8)
44-
mercenary (~> 0.3.2)
45-
nokogiri (~> 1.8.1)
36+
mercenary (~> 0.3)
37+
nokogiri (~> 1.10)
4638
parallel (~> 1.3)
39+
rainbow (~> 3.0)
4740
typhoeus (~> 1.3)
4841
yell (~> 2.0)
4942
http_parser.rb (0.6.0)
5043
httpclient (2.8.3)
5144
i18n (0.9.5)
5245
concurrent-ruby (~> 1.0)
53-
image_optim (0.26.4)
46+
image_optim (0.26.5)
5447
exifr (~> 1.2, >= 1.2.2)
5548
fspath (~> 3.0)
5649
image_size (>= 1.5, < 3)
5750
in_threads (~> 1.3)
5851
progress (~> 3.0, >= 3.0.1)
59-
image_optim_pack (0.5.3)
52+
image_optim_pack (0.6.0)
6053
fspath (>= 2.1, < 4)
6154
image_optim (~> 0.19)
62-
image_size (2.0.1)
63-
in_threads (1.5.2)
55+
image_size (2.0.2)
56+
in_threads (1.5.3)
6457
jekyll (3.8.6)
6558
addressable (~> 2.4)
6659
colorator (~> 1.0)
@@ -74,11 +67,11 @@ GEM
7467
pathutil (~> 0.9)
7568
rouge (>= 1.7, < 4)
7669
safe_yaml (~> 1.0)
77-
jekyll-algolia (1.4.11)
70+
jekyll-algolia (1.5.0)
7871
algolia_html_extractor (~> 2.6)
79-
algoliasearch (~> 1.25)
72+
algoliasearch (~> 1.26)
8073
filesize (~> 0.1)
81-
jekyll (~> 3.0)
74+
jekyll (>= 3.6, < 5.0)
8275
json (~> 2.0)
8376
nokogiri (~> 1.6)
8477
progressbar (~> 1.9)
@@ -111,27 +104,27 @@ GEM
111104
mixlib-cli (~> 1.7, >= 1.7.0)
112105
mixlib-config (~> 2.2, >= 2.2.1)
113106
mercenary (0.3.6)
114-
mini_portile2 (2.3.0)
115-
minitest (5.11.3)
107+
mini_portile2 (2.4.0)
116108
mixlib-cli (1.7.0)
117109
mixlib-config (2.2.18)
118110
tomlrb
119111
multipart-post (2.1.1)
120112
netrc (0.11.0)
121-
nokogiri (1.8.5)
122-
mini_portile2 (~> 2.3.0)
113+
nokogiri (1.10.4)
114+
mini_portile2 (~> 2.4.0)
123115
octokit (4.14.0)
124116
sawyer (~> 0.8.0, >= 0.5.3)
125117
parallel (1.17.0)
126118
pathutil (0.16.2)
127119
forwardable-extended (~> 2.6)
128-
progress (3.5.1)
120+
progress (3.5.2)
129121
progressbar (1.10.1)
130-
public_suffix (3.1.1)
122+
public_suffix (4.0.1)
123+
rainbow (3.0.0)
131124
rb-fsevent (0.10.3)
132125
rb-inotify (0.10.0)
133126
ffi (~> 1.0)
134-
rouge (3.5.1)
127+
rouge (3.11.0)
135128
ruby_dep (1.5.0)
136129
safe_yaml (1.0.5)
137130
sass (3.7.4)
@@ -143,12 +136,9 @@ GEM
143136
addressable (>= 2.3.5)
144137
faraday (> 0.8, < 2.0)
145138
thor (0.20.3)
146-
thread_safe (0.3.6)
147139
tomlrb (1.2.8)
148140
typhoeus (1.3.1)
149141
ethon (>= 0.9.0)
150-
tzinfo (1.2.5)
151-
thread_safe (~> 0.1)
152142
verbal_expressions (0.1.5)
153143
wdm (0.1.1)
154144
whatsup_github (0.0.1)

_checks/md_check_hook.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

33
# This Jekyll hook runs Markdown linter (https://github.com/markdownlint/markdownlint)
4-
# on .md files that git tracks as 'modified' ('git ls-files -m').
4+
# on modified '.md' files.
55
# '_checks/styles/style-rules-dev' sets a style (https://github.com/markdownlint/markdownlint/blob/master/docs/creating_styles.md)
66
# that is a set of rules to be applied when linting (https://github.com/markdownlint/markdownlint/blob/master/docs/RULES.md).
77
# '.mdlrc' sets linting configuration (https://github.com/markdownlint/markdownlint/blob/master/docs/configuration.md).
@@ -11,13 +11,13 @@
1111
Jekyll::Hooks.register :site, :post_write do |site|
1212
next unless site.config['serving']
1313

14-
staged_files = `git ls-files -m`.split("\n")
15-
staged_md_files = staged_files.select { |file| File.extname(file) == '.md' }
16-
next if staged_md_files.empty?
14+
modified_files = `git ls-files --modified --others --exclude-standard`.split("\n")
15+
modified_md_files = modified_files.select { |file| File.extname(file) == '.md' }
16+
next if modified_md_files.empty?
1717

1818
puts 'Checking Markdown syntax...'.blue
19-
staged_md_files_as_a_string = staged_md_files.join(' ')
20-
report = `bin/mdl #{staged_md_files_as_a_string}`
19+
modified_md_files_as_a_string = modified_md_files.join(' ')
20+
report = `bin/mdl #{modified_md_files_as_a_string}`
2121
puts report.yellow
2222
puts 'The style is defined in _checks/styles/style-rules-dev'.yellow
2323
end

_checks/styles/style-rules-prod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
exclude_rule 'MD001'
1+
rule 'MD001'
22
exclude_rule 'MD002'
33
rule 'MD003', :style => :atx
44
exclude_rule 'MD004'
55
exclude_rule 'MD005'
66
exclude_rule 'MD006'
77
exclude_rule 'MD007'
88
rule 'MD009'
9-
exclude_rule 'MD010'
9+
rule 'MD010'
1010
exclude_rule 'MD011'
1111
rule 'MD012'
1212
exclude_rule 'MD013'
1313
exclude_rule 'MD014'
14-
exclude_rule 'MD018'
14+
rule 'MD018'
1515
rule 'MD019'
1616
exclude_rule 'MD020'
1717
exclude_rule 'MD021'
1818
exclude_rule 'MD022'
19-
exclude_rule 'MD023'
19+
rule 'MD023'
2020
exclude_rule 'MD024'
2121
rule 'MD025'
2222
exclude_rule 'MD026'
@@ -33,6 +33,6 @@ exclude_rule 'MD036'
3333
rule 'MD037'
3434
rule 'MD038'
3535
exclude_rule 'MD039'
36-
exclude_rule 'MD040'
36+
rule 'MD040'
3737
exclude_rule 'MD041'
3838
exclude_rule 'MD046'

_data/codebase/mrg/b2b/B2b.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
title: Magento_B2b
3+
source_repo: magento2b2b
4+
release: 1.1.2
5+
github_path: app/code/Magento/B2b/README.md
6+
last_modified_at: '2017-02-15 17:02:23 +0300'
7+
content: "## Overview\n\nThe Magento_b2b module is the base module for B2B. It must
8+
be present on all B2B installations.\n\nThis module also provides several B2B branding
9+
elements. For example, it adds a link to B2B customer support in Admin, and it displays
10+
\"B2B Edition\" at the bottom of the site. Also, the module adds the configuration
11+
page for B2B settings where an admin user can enable or disable a B2B feature. Disabling
12+
a B2B feature in store configurations disables this feature for the storefront only,
13+
and it is still available in the admin panel.\n\n## Installation details\n\nThis
14+
module must be installed to use and to configure the other B2B modules. It can be
15+
uninstalled after other B2B modules are uninstalled.\n\n## Structure\n \n[Learn
16+
about a typical file structure for a Magento 2 module](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/build/module-file-structure.html).\n
17+
\n## Extensibility\n \nExtension developers can interact with the Magento_B2b module.
18+
For more information about the Magento extension mechanism, see [Magento plug-ins](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/plugins.html).\n
19+
\n[The Magento dependency injection mechanism](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/depend-inj.html)
20+
enables you to override the functionality of the Magento_B2b module.\n \n \n## Additional
21+
information\n \nYou can track [backward incompatible changes made in a Magento B2b
22+
mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html)."
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
title: Magento_BundleNegotiableQuote
3+
source_repo: magento2b2b
4+
release: 1.1.2
5+
github_path: app/code/Magento/BundleNegotiableQuote/README.md
6+
last_modified_at: '2017-04-10 10:33:01 +0300'
7+
content: "## Overview\n\nThe Magento_BundleNegotiableQuote module enables bundle products
8+
to be displayed in a negotiable quote in an B2B environment. This module extends
9+
Magento_NegotiableQuote module and Magento_Bundle module.\n\nThe Magento_BundleNegotiableQuote
10+
module provides the following features:\n\n* Display bundle products in a negotiable
11+
quote.\n \n* Order bundle products from a negotiable quote.\n \n## Installation
12+
details\n\nThis module has a dependency on the Magento_NegotiableQuote and Magento_Bundle,
13+
which must be installed and enabled first. \n \nThe Magento_BundleNegotiableQuote
14+
module does not create any backward incompatible changes and can be uninstalled
15+
at any time. \n \n## Structure\n \n[Learn about a typical file structure for a Magento
16+
2 module](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/build/module-file-structure.html).\n
17+
\n## Extensibility\n \nExtension developers can interact with the Magento_BundleNegotiableQuote
18+
module. For more information about the Magento extension mechanism, see [Magento
19+
plug-ins](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/plugins.html).\n
20+
\n[The Magento dependency injection mechanism](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/depend-inj.html)
21+
enables you to override the functionality of the Magento_BundleNegotiableQuote module.\n\n##
22+
Additional information\n \nYou can track [backward incompatible changes made in
23+
a Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html).\n"
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
title: Magento_BundleRequisitionList
3+
source_repo: magento2b2b
4+
release: 1.1.2
5+
github_path: app/code/Magento/BundleRequisitionList/README.md
6+
last_modified_at: '2017-04-10 10:33:01 +0300'
7+
content: "## Overview\n\nThe Magento_BundleRequisitionList module enables bundle products
8+
to be displayed in a requisition list in an B2B environment. This module extends
9+
Magento_RequisitionList module and Magento_Bundle module.\n\nThe Magento_BundleRequisitionList
10+
module provides the following features:\n\n* Display bundle products in a requisition
11+
list. \n\n* Add bundle products to cart from a requisition list. \n \n## Installation
12+
details\n\nThis module has a dependency on the Magento_RequisitionList and Magento_Bundle,
13+
which must be installed and enabled first. \n \nThe Magento_BundleRequisitionList
14+
module does not create any backward incompatible changes and can be uninstalled
15+
at any time. \n \n## Structure\n \n[Learn about a typical file structure for a Magento
16+
2 module](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/build/module-file-structure.html).\n
17+
\n### Layouts\n \nYou can extend and override layouts in the `Magento\\BundleRequisitionList\\view\\frontend\\layout`
18+
directories.\n\nFor more information about layouts, see the [Layout documentation](http://devdocs.magento.com/guides/v2.2/frontend-dev-guide/layouts/layout-overview.html).\n\n##
19+
Additional information\n \nYou can track [backward incompatible changes made in
20+
a Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html).\n"
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
title: Magento_BundleSharedCatalog
3+
source_repo: magento2b2b
4+
release: 1.1.2
5+
github_path: app/code/Magento/BundleSharedCatalog/README.md
6+
last_modified_at: '2017-02-15 17:02:23 +0300'
7+
content: "## Overview\n\nThe Magento_BundleSharedCatalog module enables bundle products
8+
to be added to a shared catalog in an B2B environment. This module extends Magento_SharedCatalog
9+
module and Magento_Bundle module.\n\nThe Magento_BundleSharedCatalog module provides
10+
the following features:\n\n* Display and manage prices for bundle products within
11+
a shared catalog.\n\n* Control the visibility of bundle products in quotes and orders.
12+
Only those bundle products that have been added to a shared catalog will be available
13+
for searches via the \"Add by SKU\" feature in quotes and orders. \n \n## Installation
14+
details\n\nThis module has a dependency on the Magento_SharedCatalog and Magento_Bundle,
15+
which must be installed and enabled first. \n \nThe Magento_BundleSharedCatalog
16+
module does not create any backward incompatible changes and can be uninstalled
17+
at any time. \n \n## Structure\n \n[Learn about a typical file structure for a Magento
18+
2 module](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/build/module-file-structure.html).\n
19+
\n## Extensibility\n \nExtension developers can interact with the Magento_BundleSharedCatalog
20+
module. For more information about the Magento extension mechanism, see [Magento
21+
plug-ins](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/plugins.html).\n
22+
\n[The Magento dependency injection mechanism](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/depend-inj.html)
23+
enables you to override the functionality of the Magento_BundleSharedCatalog module.\n\n###
24+
Layouts\n \nYou can extend and override layouts in the `Magento\\BundleSharedCatalog\\view\\adminhtml\\layout`
25+
directories.\n\nFor more information about layouts, see the [Layout documentation](http://devdocs.magento.com/guides/v2.2/frontend-dev-guide/layouts/layout-overview.html).\n
26+
\n### UI components\n\nThe following directory contains extensible UI components:
27+
\n\n* `Magento\\BundleSharedCatalog\\view\\adminhtml\\ui_component` - renderer for
28+
pricing and structure listings\n\nFor more information, see [UI Listing/Grid Component](http://devdocs.magento.com/guides/v2.2/ui-components/ui-listing-grid.html).\n\n##
29+
Additional information\n \nYou can track [backward incompatible changes made in
30+
a Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html)."
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
title: Magento_CheckoutAddressSearchNegotiableQuote
3+
source_repo: magento2b2b
4+
release: 1.1.2
5+
github_path: app/code/Magento/CheckoutAddressSearchNegotiableQuote/README.md
6+
last_modified_at: '2019-04-10 17:47:51 -0500'
7+
content: |
8+
## CheckoutAddressSearchNegotiableQuote module Overview
9+
10+
CheckoutAddressSearchNegotiableQuote module extends Magento_CheckoutAddressSearch if it is enabled in configuration and it modifies NegotiableQuote shipping address on checkout.
11+
12+
CheckoutAddressSearchNegotiableQuote module removes shipping address search configuration on shipping step on checkout if negotiable quote address is locked and it replaces selected shipping address component to display only negotiable quote address.

_data/codebase/mrg/b2b/Company.yaml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
title: Magento_Company
3+
source_repo: magento2b2b
4+
release: 1.1.2
5+
github_path: app/code/Magento/Company/README.md
6+
last_modified_at: '2017-02-15 17:02:23 +0300'
7+
content: "## Overview\n\nThe Magento_Company module allows a merchant to create a
8+
company account and assign multiple members of the company to the account. \n\nThe
9+
module also implements roles and permissions for the company members. The company
10+
admin builds a hierarchical company structure (which consists of teams and users)
11+
in the storefront and assigns roles and permissions to the company members. This
12+
hierarchy allows the company admin to control user activity within the account.
13+
This hierarchy as well as roles and permissions are currently available in the storefront
14+
only. A merchant can only view the list of company members in Admin.\nA merchant
15+
can view and manage company profiles in Admin. A company's status controls what
16+
kind of access the company members have to the website. An admin user can also configure
17+
company-level emails and allow or disallow a company registration from the storefront.
18+
Also, this module adds a 'customer type' attribute to the customer in Admin: individual
19+
user, company member or company admin.\n\n## Installation details\n \nThis module
20+
does not create any backward incompatible changes. This module can be deactivated
21+
after all the other B2B modules (except QuickOrder and RequisitionList) are deactivated.\n
22+
\n## Structure\n \n[Learn about a typical file structure for a Magento 2 module](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/build/module-file-structure.html).\n
23+
\n## Extensibility\n \nExtension developers can interact with the Magento_Company
24+
module. For more information about the Magento extension mechanism, see [Magento
25+
plug-ins](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/plugins.html).\n
26+
\n[The Magento dependency injection mechanism](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/depend-inj.html)
27+
enables you to override the functionality of the Magento_Company module.\n\n###
28+
Layouts\n \nYou can extend and override layouts in the `Magento\\Company\\view\\adminhtml\\layout`
29+
and `Magento\\Company\\view\\frontend\\layout` directories.\n\nFor more information
30+
about layouts, see the [Layout documentation](http://devdocs.magento.com/guides/v2.2/frontend-dev-guide/layouts/layout-overview.html).\n
31+
\n### UI components\n\nThe following directories contain extensible UI components:
32+
\n\n* `Magento\\Company\\view\\adminhtml\\ui_component` - customer listing, invitation
33+
form, sales order grid\n\n* `Magento\\Company\\view\\base\\ui_component` - company
34+
listing, complany creation form, customer creation form\n\n* `Magento\\Company\\view\\frontend\\ui_component`
35+
- company users listing, role listing\n\n\nFor more information, see [UI Listing/Grid
36+
Component](http://devdocs.magento.com/guides/v2.2/ui-components/ui-listing-grid.html).\n\n##
37+
Additional information\n \nYou can track [backward incompatible changes made in
38+
a Magento B2b mainline after the Magento 2.2 release](http://devdocs.magento.com/guides/v2.2/release-notes/changes/b2b_changes.html)."

0 commit comments

Comments
 (0)