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

Commit c3bdb19

Browse files
author
James Calcaben
committed
Merge branch 'jackalopes-develop' into MAGETWO-65176-unserialize-in-framework
 Conflicts: guides/v2.2/release-notes/backward-incompatible-changes.md
2 parents f94f665 + 942b92d commit c3bdb19

File tree

660 files changed

+19349
-5163
lines changed

Some content is hidden

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

660 files changed

+19349
-5163
lines changed

‎_config.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,22 @@ namem2devgde: "Magento 2 Developer's Guide"
5555
namem2apiref: "Magento 2 API Reference"
5656
namem2install: "Magento 2 Installation Guide"
5757

58+
59+
collections:
60+
videos:
61+
output: true
62+
permalink: "/videos/:path/"
63+
64+
65+
defaults:
66+
-
67+
scope:
68+
path: ""
69+
type: videos
70+
values:
71+
layout: video
72+
guide_version: "2.1"
73+
5874
# toc_baseurl: "https://github.corp.ebay.com/pages/Magento/devdocs_internal"
5975

6076
# Build settings
@@ -63,9 +79,9 @@ highlighter: pygments
6379
kramdown:
6480
toc_levels: 2..3
6581

66-
incremental: true
82+
incremental: false
6783

6884
gems:
6985
- jekyll-redirect-from
7086

71-
exclude: ['scss', 'bin', 'node_modules', 'vendor', '.git', '.idea', 'guides/v2.2']
87+
exclude: ['scss', 'bin', 'node_modules', 'vendor', '.git', '.idea', 'guides/v2.2' ]

‎_includes/breadcrumbs.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
{% if url.size > 0 %}
33
<nav class="breadcrumbs">
44

5-
<a class="breadcrumb-item" href="{% if page.guide_version == site.version %}{{site.baseurl}}{% else %}{{page.baseurl}}{% endif %}"><span>Home</span></a>
5+
<a class="breadcrumb-item" href="{% if page.guide_version == site.version or page.guide_version == nil %}{{ site.baseurl }}{% else %}{{ page.baseurl }}{% endif %}"><span>Home</span></a>
66

77
<ol class="breadcrumb list-unstyled" vocab="http://schema.org/" typeof="BreadcrumbList">
88

99
<!-- Iteration breadcrumb item -->
1010
{% assign position = 0 %}
1111
{% assign breadcrumbs = page.breadcrumbs %}
12+
1213
{% for crumb in breadcrumbs %}
1314

1415
<!-- Skip if root -->
@@ -30,7 +31,12 @@
3031

3132
{% endfor %}
3233

34+
{% include video/breadcrumbs.html %}
35+
3336
</ol>
3437

38+
39+
40+
3541
</nav>
3642
{% endif %}

‎_includes/changes/ce/200-201.html

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
<h3 id="class-200-201">Changes in classes</h3>
2+
<table><tbody>
3+
<tr>
4+
<th>Class</th>
5+
<th>What Changed</th>
6+
</tr>
7+
<tr>
8+
<td>Magento\User\Observer\Backend\CheckAdminPasswordChangeObserver</td>
9+
<td>Class was removed.</td>
10+
</tr>
11+
<tr>
12+
<td>Magento\PageCache\Model\App\FrontController\MessageBox</td>
13+
<td>Class was removed.</td>
14+
</tr>
15+
<tr>
16+
<td>Magento\Framework\Data\Form\FormKey::__construct</td>
17+
<td>[public] Method parameter changed.</td>
18+
</tr>
19+
<tr>
20+
<td>Magento\Swatches\Helper\Data::loadFirstVariationWithSwatchImage</td>
21+
<td>[public] Method parameter changed.</td>
22+
</tr>
23+
<tr>
24+
<td>Magento\Swatches\Block\Product\Renderer\Configurable::getAllOptionsIdsFromAttributeArray</td>
25+
<td>[protected] Method has been removed.</td>
26+
</tr>
27+
<tr>
28+
<td>Magento\Store\Model\Plugin\StoreCookie::aroundDispatch</td>
29+
<td>[public] Method has been removed.</td>
30+
</tr>
31+
<tr>
32+
<td>Magento\CatalogUrlRewrite\Observer\AfterImportDataObserver::cleanOverriddenUrlKey</td>
33+
<td>[protected] Method has been removed.</td>
34+
</tr>
35+
<tr>
36+
<td>Magento\CatalogUrlRewrite\Observer\AfterImportDataObserver::__construct</td>
37+
<td>[public] Method parameter changed.</td>
38+
</tr>
39+
<tr>
40+
<td>Magento\CatalogUrlRewrite\Observer\AfterImportDataObserver::$urlKeyAttribute</td>
41+
<td>[protected] Property has been removed.</td>
42+
</tr>
43+
<tr>
44+
<td>Magento\CatalogUrlRewrite\Observer\AfterImportDataObserver::$entityStoresToCheckOverridden</td>
45+
<td>[protected] Property has been removed.</td>
46+
</tr>
47+
<tr>
48+
<td>Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::rebuildIndex</td>
49+
<td>[protected] Method has been removed.</td>
50+
</tr>
51+
<tr>
52+
<td>Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::getSearchableProducts</td>
53+
<td>[protected] Method has been removed.</td>
54+
</tr>
55+
<tr>
56+
<td>Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::deleteIndex</td>
57+
<td>[protected] Method has been removed.</td>
58+
</tr>
59+
<tr>
60+
<td>Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::getProductAttributes</td>
61+
<td>[protected] Method has been removed.</td>
62+
</tr>
63+
<tr>
64+
<td>Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::getProductChildIds</td>
65+
<td>[protected] Method has been removed.</td>
66+
</tr>
67+
<tr>
68+
<td>Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::prepareProductIndex</td>
69+
<td>[protected] Method has been removed.</td>
70+
</tr>
71+
<tr>
72+
<td>Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::getAttributeValue</td>
73+
<td>[protected] Method has been removed.</td>
74+
</tr>
75+
<tr>
76+
<td>Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::getStoreDate</td>
77+
<td>[protected] Method has been removed.</td>
78+
</tr>
79+
<tr>
80+
<td>Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::getIterator</td>
81+
<td>[protected] Method has been removed.</td>
82+
</tr>
83+
<tr>
84+
<td>Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::__construct</td>
85+
<td>[public] Method parameter changed.</td>
86+
</tr>
87+
<tr>
88+
<td>Magento\CatalogImportExport\Model\Import\Product::__construct</td>
89+
<td>[public] Method parameter changed.</td>
90+
</tr>
91+
<tr>
92+
<td>Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile::__construct</td>
93+
<td>[public] Method parameter changed.</td>
94+
</tr>
95+
</tbody></table>

‎_includes/changes/ce/201-202.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<h3 id="no-changes-201-202">No changes</h3>
2+
<p>No backward incompatible changes.</p>

‎_includes/changes/ce/2010-2011.html

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<h3 id="class-2010-2011">Changes in classes</h3>
2+
<table><tbody>
3+
<tr>
4+
<th>Class</th>
5+
<th>What Changed</th>
6+
</tr>
7+
<tr>
8+
<td>Magento\CatalogInventory\Observer\RefundOrderInventoryObserver</td>
9+
<td>Class was removed.</td>
10+
</tr>
11+
<tr>
12+
<td>Magento\Ui\DataProvider\EavValidationRules::$validationRul</td>
13+
<td>[protected] Property has been removed.</td>
14+
</tr>
15+
<tr>
16+
<td>Magento\GiftMessage\Model\Plugin\OrderGet::aroundGet</td>
17+
<td>[public] Method has been removed.</td>
18+
</tr>
19+
<tr>
20+
<td>Magento\GiftMessage\Model\Plugin\OrderSave::aroundSave</td>
21+
<td>[public] Method has been removed.</td>
22+
</tr>
23+
<tr>
24+
<td>Magento\Customer\Controller\Adminhtml\Index\Save::_extractData</td>
25+
<td>[protected] Method parameter changed.</td>
26+
</tr>
27+
</tbody></table>

‎_includes/changes/ce/2011-2012.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<h3 id="no-changes-2011-2012">No changes</h3>
2+
<p>No backward incompatible changes.</p>

‎_includes/changes/ce/2012-2013.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<h3 id="no-changes-2012-2013">No changes</h3>
2+
<p>No backward incompatible changes.</p>

‎_includes/changes/ce/202-203.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<h3 id="no-changes-202-203">No changes</h3>
2+
<p>No backward incompatible changes.</p>

‎_includes/changes/ce/203-204.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<h3 id="no-changes-203-204">No changes</h3>
2+
<p>No backward incompatible changes.</p>

‎_includes/changes/ce/204-205.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<h3 id="no-changes-204-205">No changes</h3>
2+
<p>No backward incompatible changes.</p>

‎_includes/changes/ce/205-206.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<h3 id="no-changes-205-206">No changes</h3>
2+
<p>No backward incompatible changes.</p>

‎_includes/changes/ce/206-207.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<h3 id="no-changes-206-207">No changes</h3>
2+
<p>No backward incompatible changes.</p>

‎_includes/changes/ce/207-208.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<h3 id="no-changes-207-208">No changes</h3>
2+
<p>No backward incompatible changes.</p>

0 commit comments

Comments
 (0)