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

Skip to content

Commit 68f6385

Browse files
dshevtsovdshevtsov
authored
Merge branch 'master' into ds_whatsup-release
2 parents 572176e + 32af6c8 commit 68f6385

File tree

1,326 files changed

+129964
-2200
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,326 files changed

+129964
-2200
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
<!-- # IMPORTANT
2+
3+
We are no longer accepting pull requests to update v2.1 devdoc files.
4+
5+
Magento 2.1.18 is the final 2.1.x release. After the [June 2019 end-of-support date](https://magento.com/sites/default/files/magento-software-lifecycle-policy.pdf), Magento will no longer apply security patches, quality fixes, or documentation updates to v2.1.x. To maintain your site's performance, security, and PCI compliance, [upgrade](https://devdocs.magento.com/guides/v2.3/comp-mgr/bk-compman-upgrade-guide.html) to the latest version of Magento. -->
6+
17
## Purpose of this pull request
28

39
<!-- REQUIRED Describe the goal and the type of changes this pull request covers. -->
@@ -8,14 +14,12 @@ This pull request (PR) ...
814

915
<!-- REQUIRED List the affected pages on devdocs.magento.com (URLs). Not needed for large numbers of files. -->
1016

11-
- ...
1217
- ...
1318

1419
## Links to Magento source code
1520

1621
<!-- OPTIONAL - REMOVE THIS SECTION IF NOT USED. If this pull request references a file in a Magento codebase repository, add it here. -->
1722

18-
- ...
1923
- ...
2024

2125
<!--

‎_data/toc/architecture-guide.yml

Lines changed: 18 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,45 +7,36 @@ pages:
77
url: /architecture/archi_perspectives/ABasics_intro.html
88
children:
99

10-
- label: Extensibility and modularity
11-
url: /architecture/extensibility.html
12-
13-
- label: Ease of frontend customization
14-
url: /architecture/frontend_custom_strategies.html
15-
16-
- label: Global features that support extensibility
17-
url: /architecture/global_extensibility_features.html
18-
19-
- label: Security
20-
url: /architecture/security_intro.html
21-
22-
- label: Storefront customization strategies
23-
url: /architecture/storefront_customization.html
24-
2510
- label: Architectural diagrams
2611
url: /architecture/archi_perspectives/arch_diagrams.html
2712

28-
- label: Technology stack
29-
url: /architecture/tech-stack.html
13+
- label: Frontend customization
14+
url: /architecture/frontend_custom_strategies.html
3015

3116
- label: Architectural layers
3217
url: /architecture/archi_perspectives/ALayers_intro.html
3318
children:
3419

20+
- label: Domain layer
21+
url: /architecture/archi_perspectives/domain_layer.html
22+
23+
- label: Persistence layer
24+
url: /architecture/archi_perspectives/persist_layer.html
25+
3526
- label: Presentation layer
3627
url: /architecture/archi_perspectives/present_layer.html
3728

3829
- label: Service layer
3930
url: /architecture/archi_perspectives/service_layer.html
4031

41-
- label: Domain layer
42-
url: /architecture/archi_perspectives/domain_layer.html
32+
- label: Coding Standards
33+
url: /coding-standards/bk-coding-standards.html
4334

44-
- label: Persistence layer
45-
url: /architecture/archi_perspectives/persist_layer.html
35+
- label: Magento Framework
36+
url: /architecture/archi_perspectives/framework.html
4637

47-
- label: Components
48-
url: /architecture/archi_perspectives/components/AComponents.html
38+
- label: Modules and Extensibility
39+
url: /architecture/extensibility.html
4940
children:
5041

5142
- label: Module overview
@@ -54,29 +45,15 @@ pages:
5445
- label: Modules and areas
5546
url: /architecture/archi_perspectives/components/modules/mod_and_areas.html
5647

57-
- label: Module conventions
58-
url: /architecture/archi_perspectives/components/modules/mod_conventions.html
59-
6048
- label: Module relationships
6149
url: /architecture/archi_perspectives/components/modules/mod_relationships.html
6250

6351
- label: Module dependencies
6452
url: /architecture/archi_perspectives/components/modules/mod_depend.html
6553

66-
- label: Module dependency types
67-
url: /architecture/archi_perspectives/components/modules/mod_depend_types.html
68-
69-
- label: Magento Framework
70-
url: /architecture/archi_perspectives/framework.html
71-
72-
- label: Third-party libraries
73-
url: /architecture/archi_perspectives/third-party-libs.html
74-
75-
- label: GDPR compliance
76-
include_versions: ["2.1", "2.2", "2.3"]
54+
- label: Technical vision
55+
url: /architecture/archi_perspectives/tech-vision.html
7756
children:
78-
- label: Magento 2.x
79-
url: /architecture/gdpr/magento-2x.html
8057

81-
- label: Magento 1.x
82-
url: /architecture/gdpr/magento-1x.html
58+
- label: Web Api
59+
url: /get-started/bk-get-started-api.html

‎_data/toc/cloud-guide.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ pages:
3838
- label: Magento Cloud CLI
3939
url: /cloud/reference/cli-ref-topic.html
4040

41+
- label: ece-tools package
42+
url: /cloud/reference/ece-tools-reference.html
43+
4144
- label: Git
4245
url: /cloud/reference/git-integration.html
4346

@@ -105,6 +108,9 @@ pages:
105108
- label: Connect to the database
106109
url: /cloud/docker/docker-database.html
107110

111+
- label: Functional testing in Docker
112+
url: /cloud/docker/docker-development-testing.html
113+
108114
- label: Docker quick reference
109115
url: /cloud/docker/docker-quick-reference.html
110116

‎_data/toc/configuration-guide.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,3 +415,12 @@ pages:
415415
- label: Development environment recommendations
416416
include_versions: ["2.1"]
417417
url: /config-guide/prod/development-environment.html
418+
419+
- label: GDPR compliance
420+
include_versions: ["2.1", "2.2", "2.3"]
421+
children:
422+
- label: Magento 2.x
423+
url: /architecture/gdpr/magento-2x.html
424+
425+
- label: Magento 1.x
426+
url: /architecture/gdpr/magento-1x.html

‎_data/toc/module-reference-guide-2_3.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ pages:
33
- label: Introduction
44
url: /mrg/intro.html
55
- label: Open Source
6+
include_versions: ["2.3"]
67
children:
78

89
- label: AdminNotification
@@ -200,6 +201,9 @@ pages:
200201
- label: GraphQl
201202
url: /mrg/ce/GraphQl.html
202203

204+
- label: GraphQlCache
205+
url: /mrg/ce/GraphQlCache.html
206+
203207
- label: GroupedCatalogInventory
204208
url: /mrg/ce/GroupedCatalogInventory.html
205209

@@ -266,6 +270,9 @@ pages:
266270
- label: Paypal
267271
url: /mrg/ce/Paypal.html
268272

273+
- label: PaypalCaptcha
274+
url: /mrg/ce/PaypalCaptcha.html
275+
269276
- label: Persistent
270277
url: /mrg/ce/Persistent.html
271278

@@ -416,6 +423,9 @@ pages:
416423
- label: Vault
417424
url: /mrg/ce/Vault.html
418425

426+
- label: VaultGraphQl
427+
url: /mrg/ce/VaultGraphQl.html
428+
419429
- label: Version
420430
url: /mrg/ce/Version.html
421431

@@ -497,6 +507,12 @@ pages:
497507
- label: CatalogUrlRewriteStaging
498508
url: /mrg/ee/CatalogUrlRewriteStaging.html
499509

510+
- label: CheckoutAddressSearch
511+
url: /mrg/ee/CheckoutAddressSearch.html
512+
513+
- label: CheckoutAddressSearchGiftRegistry
514+
url: /mrg/ee/CheckoutAddressSearchGiftRegistry.html
515+
500516
- label: CheckoutStaging
501517
url: /mrg/ee/CheckoutStaging.html
502518

@@ -527,6 +543,9 @@ pages:
527543
- label: DownloadableStaging
528544
url: /mrg/ee/DownloadableStaging.html
529545

546+
- label: ElasticsearchCatalogPermissions
547+
url: /mrg/ee/ElasticsearchCatalogPermissions.html
548+
530549
- label: Enterprise
531550
url: /mrg/ee/Enterprise.html
532551

@@ -688,6 +707,9 @@ pages:
688707
- label: BundleSharedCatalog
689708
url: /mrg/b2b/BundleSharedCatalog.html
690709

710+
- label: CheckoutAddressSearchNegotiableQuote
711+
url: /mrg/b2b/CheckoutAddressSearchNegotiableQuote.html
712+
691713
- label: Company
692714
url: /mrg/b2b/Company.html
693715

@@ -738,4 +760,3 @@ pages:
738760

739761
- label: SharedCatalog
740762
url: /mrg/b2b/SharedCatalog.html
741-

‎_data/toc/testing.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ pages:
1313
url: /test/integration/annotations.html
1414
children:
1515

16+
- label: '@depends'
17+
url: /test/integration/annotations/depends.html
18+
1619
- label: '@magentoAppArea'
1720
url: /test/integration/annotations/magento-app-area.html
1821

‎_includes/backward-incompatible-changes/commerce/2.1.17-2.1.18.md

Whitespace-only changes.

‎_includes/backward-incompatible-changes/commerce/2.2.8-2.2.9.md

Whitespace-only changes.

‎_includes/backward-incompatible-changes/commerce/2.3.1-2.3-develop.html

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎_includes/backward-incompatible-changes/commerce/2.3.1-2.3.2.md

Whitespace-only changes.

‎_includes/backward-incompatible-changes/open-source/2.1.17-2.1.18.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
### No changes {#changes-2117-2118}
2+
3+
No backward incompatible changes.

‎_includes/backward-incompatible-changes/open-source/2.2.8-2.2.9.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
### Class changes {#class-228-229}
2+
3+
| What changed | How it changed |
4+
|--------------------------------------------------------------------------------------|---------------------------------------------|
5+
| Magento\AuthorizenetAcceptjs\Block\Form | Class was added. |
6+
| Magento\AuthorizenetAcceptjs\Block\Info | Class was added. |
7+
| Magento\AuthorizenetAcceptjs\Block\Payment | Class was added. |
8+
| Magento\Framework\Mail\Template\TransportBuilder::setFromByScope | [public] Method has been added. |
9+
| Magento\Swatches\Block\Product\Renderer\Listing\Configurable::getCacheKeyInfo | [public] Method has been added. |
10+
| Magento\Sales\Block\Adminhtml\Order\Create\Form\Account::extractValuesFromAttributes | [private] Removed last method parameter(s). |
11+
| Magento\Reports\Model\ResourceModel\Product\Downloads\Collection::getSelectCountSql | [public] Method has been added. |
12+
| Magento\Catalog\Model\Category::beforeSave | [public] Method has been added. |
13+
14+
### Interface changes {#interface-228-229}
15+
16+
| What changed | How it changed |
17+
|------------------------------------------------------|--------------------------|
18+
| Magento\Store\Api\Data\WebsiteInterface::ADMIN\_CODE | Constant has been added. |

0 commit comments

Comments
 (0)