Skip to content

Commit fab1778

Browse files
belbiybelbiy
committed
Merge branch 'develop' of https://github.com/magento/devdocs_internal into yb_theme
# Conflicts: # css/app.css # scss/app.scss # scss/partials/_home.scss
2 parents 1a34819 + e8d4ea7 commit fab1778

36 files changed

+579
-155
lines changed

Diff for: ‎_data/toc/contributor-guide.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pages:
1717
- label: Suggested topics for contribution
1818
url: /contributor-guide/contributing_docs_suggested.html
1919

20-
- label: Quarterly Contributors
20+
- label: DevDocs Contributors
2121
url: /contributor-guide/quarterly-contributors.html
2222

2323
- label: Community maintainers

Diff for: ‎_includes/home/contributors.html

+7-35
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,16 @@
11
<section class="home-contributors">
22
<div class="container">
3-
<h2>Top Recent Contributors</h2>
4-
<p class="intro">Our documentation is open-source on GitHub. Even the smallest of edits are appreciated, as are enhancements and clarifications to our existing content. We love when we get complete new topics from our community members! Below are our top quarterly contributors. See all <a href="{{page.baseurl}}/contributor-guide/quarterly-contributors.html">quarterly contributors</a>.</p>
53

6-
<div class="contributor">
7-
<a href="https://github.com/RakeshJesadiya" class="avatar" target="_blank">
8-
<img src="{{site.baseurl}}/i/contributors/rakesh-jesadiya.png" alt="Rakesh Jesadiya" />
9-
</a>
10-
<h5 class="name"><a href="https://github.com/RakeshJesadiya" target="_blank">Rakesh Jesadiya</a></h5>
11-
<p class="role">Magento Developer</p>
12-
</div>
13-
14-
<div class="contributor">
15-
<a href="https://github.com/lbajsarowicz" class="avatar" target="_blank">
16-
<img src="{{site.baseurl}}/i/contributors/lukasz-bajsarowicz.jpeg" alt="Lukasz Bajsarowicz" />
17-
</a>
18-
<h5 class="name"><a href="https://github.com/lbajsarowicz" target="_blank">Lukasz Bajsarowicz</a></h5>
19-
<p class="role">Magento Developer</p>
20-
</div>
4+
<h2>Top Monthly Contributors</h2>
215

6+
<p class="intro">
7+
Our documentation is open-source on GitHub. Even the smallest of edits are appreciated, as are enhancements and clarifications to our existing content. We love when we get complete new topics from our community members! See <a href="{{ page.baseurl }}/contributor-guide/quarterly-contributors.html">all contributors</a>.
8+
</p>
229

23-
<div class="contributor">
24-
<a href="https://github.com/asrar7787" class="avatar" target="_blank">
25-
<img src="{{site.baseurl}}/i/contributors/asrar-alam.jpeg" alt="Asrar Alam" />
26-
</a>
27-
<h5 class="name"><a href="https://github.com/asrar7787" target="_blank">Asrar Alam</a></h5>
28-
<p class="role">Magento Developer</p>
29-
</div>
30-
31-
32-
<div class="contributor">
33-
<a href="https://github.com/ryantfowler" class="avatar" target="_blank">
34-
<img src="{{site.baseurl}}/i/contributors/ryan-fowler.png" alt="Ryan Fowler" />
35-
</a>
36-
<h5 class="name"><a href="https://github.com/ryantfowler" target="_blank">Ryan Fowler</a></h5>
37-
<p class="role">Software Engineer</p>
38-
</div>
10+
<div class="devdocs-contributors" data-contributors-limit="5" data-period-types="monthly"></div>
3911

40-
<div>
41-
<a href="{{ site.baseurl}}/guides/v2.1/contributor-guide/contributing_docs.html" class="btn btn-large btn-primary">Become a Contributor</a>
12+
<div class="home-contributors-buttons">
13+
<a href="{{ page.baseurl }}/contributor-guide/contributing_docs.html" class="btn btn-large btn-primary">Become a Contributor</a>
4214
</div>
4315

4416
</div>

Diff for: ‎_includes/layout/footer-scripts.html

+2
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,5 @@
2121
document.getElementsByTagName('head')[0].appendChild(s);
2222
})();
2323
</script>
24+
25+
<script src="{{ site.baseurl }}/common/js/devdocs.min.js"></script>

Diff for: ‎_includes/layout/header-styles.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<link rel="stylesheet" href="{{ site.baseurl }}/common/css/devdocs.css" />

Diff for: ‎common/css/devdocs.css

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎common/js/app.min.js

-1
This file was deleted.

Diff for: ‎common/js/devdocs.min.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎guides/v2.0/contributor-guide/quarterly-contributors.md

+3-60
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
---
22
layout: default
33
group: contributor
4-
subgroup: contributor_docs
5-
title: Quarterly Contributors
6-
menu_title: Quarterly Contributors
4+
title: DevDocs Contributors
75
menu_order: 1000
86
version: 2.0
97
github_link: contributor-guide/quarterly-contributors.md
@@ -14,67 +12,12 @@ Thanks to the following community members, partners, and Magento fans who helped
1412

1513
We appreciate all the typo fixes, code corrections, comments in issues, and clarifications that our contributors provide.
1614

17-
{% include home/contributors.html %}
18-
19-
<br/>
20-
21-
The following table lists the community members who created pull requests and issues for this quarter.
22-
23-
PR contributors|Issue contributors
24-
:-----:|:-----:
25-
[likemusic](https://github.com/likemusic)|[Prutha29](https://github.com/Prutha29)
26-
[chickenland](https://github.com/chickenland)|[embed0](https://github.com/embed0)
27-
[chris-pook](https://github.com/chris-pook)|[camdixon](https://github.com/camdixon)
28-
[ihor-sviziev](https://github.com/ihor-sviziev)|[vovsky](https://github.com/vovsky)
29-
[rhoerr](https://github.com/rhoerr)|[lazyguru](https://github.com/lazyguru)
30-
[hostep](https://github.com/hostep)|[roman204](https://github.com/roman204)
31-
[avoelkl](https://github.com/avoelkl)|[osrecio](https://github.com/osrecio)
32-
[rogyar](https://github.com/rogyar)|[fdrechsler](https://github.com/fdrechsler)
33-
[osrecio](https://github.com/osrecio)|[adamrandazzo](https://github.com/adamrandazzo)
34-
[erikhansen](https://github.com/erikhansen)|[McFizh](https://github.com/McFizh)
35-
[DavidLambuer](https://github.com/DavidLambauer)|[erichagz](https://github.com/erichagz)
36-
[JosephMaxwell](https://github.com/JosephMaxwell)|[rossmc](https://github.com/rossmc)
37-
[nshiff](https://github.com/nshiff)|[36serg6](https://github.com/36serg6)
38-
[rafaelstz](https://github.com/rafaelstz)|[kunal1234gh](https://github.com/kunal1234gh)
39-
[asrar7787](https://github.com/asrar7787)|[iunia27](https://github.com/iunia27)
40-
|[zaibi099](https://github.com/zaibi099)
41-
|[tiwarimukesh](https://github.com/tiwarimukesh)
42-
|[SunshineTech](https://github.com/SunshineTech)
43-
|[documarezc](https://github.com/documarezc)
44-
|[mpingu](https://github.com/mpingu)
45-
|[hostep](https://github.com/hostep)
46-
|[aryaashwani](https://github.com/aryaashwani)
47-
|[danistor](https://github.com/danistor)
48-
|[timri](https://github.com/timri)
49-
|[ZariMatan](https://github.com/ZariMatan)
50-
|[koenner01](https://github.com/koenner01)
51-
|[likemusic](https://github.com/likemusic)
52-
|[bgronek](https://github.com/bgronek)
53-
|[korostii](https://github.com/korostii)
54-
|[hjsprite](https://github.com/hjsprite)
55-
|[vmistrybas](https://github.com/vmistrybas)
56-
|[KarlComSe](https://github.com/KarlComSe)
57-
|[csned](https://github.com/csned)
58-
|[terolahtinen](https://github.com/terolahtinen)
59-
|[mehdiagharlou](https://github.com/mehdiagharlou)
60-
|[allamsettiramesh](https://github.com/allamsettiramesh)
61-
|[valugi](https://github.com/valugi)
62-
|[DavidLambuer](https://github.com/DavidLambauer)
63-
|[kevingimbel](https://github.com/kevingimbel)
64-
|[drdreamm](https://github.com/drdreamm)
65-
|[milansimek](https://github.com/milansimek)
66-
|[yogeshsyscraft](https://github.com/yogeshsyscraft)
67-
|[WaPoNe](https://github.com/WaPoNe)
68-
|[Igloczek](https://github.com/Igloczek)
69-
|[lalittmohan](https://github.com/lalittmohan)
70-
|[arthurlataks](https://github.com/arthurlataks)
71-
|[bmxmale](https://github.com/bmxmale)
72-
|[maderlock](https://github.com/maderlock)
73-
7415
Follow the easy instructions on [how to contribute to DevDocs][0] to join these contributors!
7516

7617
Always feel free to [email us][1] with any questions.
7718

19+
<div class="devdocs-contributors"></div>
20+
7821

7922
[0]: {{page.baseurl}}/contributor-guide/contributing_docs.html
8023
[1]: mailto:[email protected]

Diff for: ‎guides/v2.1/contributor-guide/quarterly-contributors.md

+3-50
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: default
33
group: contributor
4-
title: Quarterly Contributors
4+
title: DevDocs Contributors
55
version: 2.1
66
github_link: contributor-guide/quarterly-contributors.md
77
redirect_from: /guides/v2.0/howdoi/howdoi_bios.html
@@ -11,59 +11,12 @@ Thanks to the following community members, partners, and Magento fans who helped
1111

1212
We appreciate all the typo fixes, code corrections, comments in issues, and clarifications that our contributors provide.
1313

14-
{% include home/contributors.html %}
15-
16-
<br/>
17-
18-
The following table lists the community members who created pull requests and issues for this quarter.
19-
20-
**PR contributors**|**Issue contributors**
21-
:-----:|:-----:
22-
[Shreyas-Echidna](https://github.com/Shreyas-Echidna)|[vinkiel](https://github.com/vinkiel)
23-
[korostii](https://github.com/korostii)|[josephmcdermott](https://github.com/josephmcdermott)
24-
[suhasdhoke](https://github.com/suhasdhoke)|[markoshust](https://github.com/markoshust)
25-
[hostep](https://github.com/hostep)|[kalpmehta](https://github.com/kalpmehta)
26-
[vinkiel](https://github.com/vinkiel)|[chris-pook](https://github.com/chris-pook)
27-
[dougkm](https://github.com/dougkm)|[owenju](https://github.com/owenju)
28-
[kirkmadera](https://github.com/kirkmadera)|[roman-snitko-vaimo](https://github.com/roman-snitko-vaimo)
29-
[SpencerRohan](https://github.com/SpencerRohan)|[36serg6](https://github.com/36serg6)
30-
[ravnarayan](https://github.com/ravnarayan)|[likemusic](https://github.com/likemusic)
31-
[camdixon](https://github.com/camdixon)|[briscoda](https://github.com/briscoda)
32-
[Dx3webs](https://github.com/Dx3webs)|[LukeHandle](https://github.com/LukeHandle)
33-
[zennco](https://github.com/zennco)|[pmclain](https://github.com/pmclain)
34-
[ifolco](https://github.com/lfolco)|[lewisvoncken](https://github.com/lewisvoncken)
35-
[sfritzsche](https://github.com/sfritzsche)|[oddyssey](https://github.com/oddyssey)
36-
[PascalBrouwers](https://github.com/PascalBrouwers)|[Vinai](https://github.com/Vinai)
37-
[xpoback](https://github.com/xpoback)|[RakeshJesadiya](https://github.com/RakeshJesadiya)
38-
[dgoldfeder](https://github.com/dgoldfeder)|[immanetize](https://github.com/immanetize)
39-
[gamort](https://github.com/gamort)|[bassplayer7](https://github.com/bassplayer7)
40-
[jaustinlam](https://github.com/jaustinlam)|[cmtickle](https://github.com/cmtickle)
41-
[clementblanco](https://github.com/clementblanco)|
42-
[xfrenette](https://github.com/xfrenette)|
43-
[Avinashsain](https://github.com/Avinashsain)|
44-
[sadon](https://github.com/sadon)|
45-
[geetikatina](https://github.com/geetikatina)|
46-
[patchee500](https://github.com/patchee500)|
47-
[jrapm](https://github.com/jrapm)|
48-
[ychadwick](https://github.com/ychadwick)|
49-
[wangzhi0417](https://github.com/wangzhi0417)|
50-
[AndyHodgesStemcell](https://github.com/AndyHodgesStemcell)|
51-
[Sharkozp](https://github.com/Sharkozp)|
52-
[Lewiscowles1986](https://github.com/Lewiscowles1986)|
53-
[rnicklin](https://github.com/rnicklin)|
54-
[SunshineTech](https://github.com/SunshineTech)|
55-
[istitutoculturaitaliana](https://github.com/istitutoculturaitaliana)|
56-
[surajtupe](https://github.com/surajtupe)|
57-
[ArvidBaa](https://github.com/ArvidBaa)|
58-
[shyang292](https://github.com/shyang292)|
59-
[rossmitchell](https://github.com/rossmitchell)|
60-
[Volvoxpl](https://github.com/Volvoxpl)|
61-
[neeta-wagento](https://github.com/neeta-wagento)|
62-
6314
Follow the easy instructions on [how to contribute to DevDocs][0] to join these contributors!
6415

6516
Always feel free to [email us][1] with any questions.
6617

18+
<div class="devdocs-contributors"></div>
19+
6720

6821
[0]: {{page.baseurl}}/contributor-guide/contributing_docs.html
6922
[1]: mailto:[email protected]

Diff for: ‎guides/v2.1/magento-devdocs-whatsnew.md

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ This page contains recent changes that we think you'd like to know about. We exc
1111

1212
Description | Versions applied to | New or Updated | Date
1313
-------------|--------------|----------------------|--------
14+
Added a new topic [Suite](http://devdocs.magento.com/guides/v2.2/magento-functional-testing-framework/release-2/suite.html) to the MFTF Guide along with documentation updates related to the 2.2.0 release of the framework.|2.2.x, 2.3.x|New topic|Apr 28
15+
Updates from the 2018 Imagine Docathon.|2.x|Technical changes|Apr 27
16+
Added [Error code mapping](http://devdocs.magento.com/guides/v2.3/payments-integrations/payment-gateway/error-code-mapper.html)|2.3.x|New topic|Apr 25
1417
Added the ability to configure a read-only connection to a non-master node to receive read-only traffic for [Redis](http://devdocs.magento.com/guides/v2.2/cloud/env/variables-deploy.html#redisuseslaveconnection) and for [MariaDB](http://devdocs.magento.com/guides/v2.2/cloud/env/variables-deploy.html#mysqluseslaveconnection).|2.1.x, 2.2.x, 2.3.x|New|Apr 24
1518
New [Smart wizards](http://devdocs.magento.com/guides/v2.2/cloud/env/smart-wizards.html) help you to verify your Cloud configuration follows best practices.|2.1.x, 2.2.x, 2.3.x|New|Apr 24
1619
Added [Marketplace EQP API](http://devdocs.magento.com/guides/v2.2/marketplace/eqp/api.html) reference documentation.|2.x|New topic|Apr 21

0 commit comments

Comments
 (0)