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

Commit

Permalink
Merge branch 'develop' of https://github.com/magento/devdocs_internal …
Browse files Browse the repository at this point in the history 
…into yb_theme

# Conflicts:
#	css/app.css
#	scss/app.scss
#	scss/partials/_home.scss
  • Loading branch information
@belbiy
belbiy committed Apr 30, 2018
2 parents 1a34819 + e8d4ea7 commit fab1778
Show file tree
Hide file tree
Showing 36 changed files with 579 additions and 155 deletions.
2 changes: 1 addition & 1 deletion _data/toc/contributor-guide.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pages:
- label: Suggested topics for contribution
url: /contributor-guide/contributing_docs_suggested.html

- label: Quarterly Contributors
- label: DevDocs Contributors
url: /contributor-guide/quarterly-contributors.html

- label: Community maintainers
Expand Down
42 changes: 7 additions & 35 deletions _includes/home/contributors.html
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,16 @@
<section class="home-contributors">
<div class="container">
<h2>Top Recent Contributors</h2>
<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>

<div class="contributor">
<a href="https://github.com/RakeshJesadiya" class="avatar" target="_blank">
<img src="{{site.baseurl}}/i/contributors/rakesh-jesadiya.png" alt="Rakesh Jesadiya" />
</a>
<h5 class="name"><a href="https://github.com/RakeshJesadiya" target="_blank">Rakesh Jesadiya</a></h5>
<p class="role">Magento Developer</p>
</div>

<div class="contributor">
<a href="https://github.com/lbajsarowicz" class="avatar" target="_blank">
<img src="{{site.baseurl}}/i/contributors/lukasz-bajsarowicz.jpeg" alt="Lukasz Bajsarowicz" />
</a>
<h5 class="name"><a href="https://github.com/lbajsarowicz" target="_blank">Lukasz Bajsarowicz</a></h5>
<p class="role">Magento Developer</p>
</div>
<h2>Top Monthly Contributors</h2>

<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! See <a href="{{ page.baseurl }}/contributor-guide/quarterly-contributors.html">all contributors</a>.
</p>

<div class="contributor">
<a href="https://github.com/asrar7787" class="avatar" target="_blank">
<img src="{{site.baseurl}}/i/contributors/asrar-alam.jpeg" alt="Asrar Alam" />
</a>
<h5 class="name"><a href="https://github.com/asrar7787" target="_blank">Asrar Alam</a></h5>
<p class="role">Magento Developer</p>
</div>


<div class="contributor">
<a href="https://github.com/ryantfowler" class="avatar" target="_blank">
<img src="{{site.baseurl}}/i/contributors/ryan-fowler.png" alt="Ryan Fowler" />
</a>
<h5 class="name"><a href="https://github.com/ryantfowler" target="_blank">Ryan Fowler</a></h5>
<p class="role">Software Engineer</p>
</div>
<div class="devdocs-contributors" data-contributors-limit="5" data-period-types="monthly"></div>

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

</div>
Expand Down
2 changes: 2 additions & 0 deletions _includes/layout/footer-scripts.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@
document.getElementsByTagName('head')[0].appendChild(s);
})();
</script>

<script src="{{ site.baseurl }}/common/js/devdocs.min.js"></script>
1 change: 1 addition & 0 deletions _includes/layout/header-styles.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<link rel="stylesheet" href="{{ site.baseurl }}/common/css/devdocs.css" />
1 change: 1 addition & 0 deletions common/css/devdocs.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion common/js/app.min.js
View file

This file was deleted.

1 change: 1 addition & 0 deletions common/js/devdocs.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 3 additions & 60 deletions guides/v2.0/contributor-guide/quarterly-contributors.md
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
---
layout: default
group: contributor
subgroup: contributor_docs
title: Quarterly Contributors
menu_title: Quarterly Contributors
title: DevDocs Contributors
menu_order: 1000
version: 2.0
github_link: contributor-guide/quarterly-contributors.md
Expand All @@ -14,67 +12,12 @@ Thanks to the following community members, partners, and Magento fans who helped

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

{% include home/contributors.html %}

<br/>

The following table lists the community members who created pull requests and issues for this quarter.

PR contributors|Issue contributors
:-----:|:-----:
[likemusic](https://github.com/likemusic)|[Prutha29](https://github.com/Prutha29)
[chickenland](https://github.com/chickenland)|[embed0](https://github.com/embed0)
[chris-pook](https://github.com/chris-pook)|[camdixon](https://github.com/camdixon)
[ihor-sviziev](https://github.com/ihor-sviziev)|[vovsky](https://github.com/vovsky)
[rhoerr](https://github.com/rhoerr)|[lazyguru](https://github.com/lazyguru)
[hostep](https://github.com/hostep)|[roman204](https://github.com/roman204)
[avoelkl](https://github.com/avoelkl)|[osrecio](https://github.com/osrecio)
[rogyar](https://github.com/rogyar)|[fdrechsler](https://github.com/fdrechsler)
[osrecio](https://github.com/osrecio)|[adamrandazzo](https://github.com/adamrandazzo)
[erikhansen](https://github.com/erikhansen)|[McFizh](https://github.com/McFizh)
[DavidLambuer](https://github.com/DavidLambauer)|[erichagz](https://github.com/erichagz)
[JosephMaxwell](https://github.com/JosephMaxwell)|[rossmc](https://github.com/rossmc)
[nshiff](https://github.com/nshiff)|[36serg6](https://github.com/36serg6)
[rafaelstz](https://github.com/rafaelstz)|[kunal1234gh](https://github.com/kunal1234gh)
[asrar7787](https://github.com/asrar7787)|[iunia27](https://github.com/iunia27)
|[zaibi099](https://github.com/zaibi099)
|[tiwarimukesh](https://github.com/tiwarimukesh)
|[SunshineTech](https://github.com/SunshineTech)
|[documarezc](https://github.com/documarezc)
|[mpingu](https://github.com/mpingu)
|[hostep](https://github.com/hostep)
|[aryaashwani](https://github.com/aryaashwani)
|[danistor](https://github.com/danistor)
|[timri](https://github.com/timri)
|[ZariMatan](https://github.com/ZariMatan)
|[koenner01](https://github.com/koenner01)
|[likemusic](https://github.com/likemusic)
|[bgronek](https://github.com/bgronek)
|[korostii](https://github.com/korostii)
|[hjsprite](https://github.com/hjsprite)
|[vmistrybas](https://github.com/vmistrybas)
|[KarlComSe](https://github.com/KarlComSe)
|[csned](https://github.com/csned)
|[terolahtinen](https://github.com/terolahtinen)
|[mehdiagharlou](https://github.com/mehdiagharlou)
|[allamsettiramesh](https://github.com/allamsettiramesh)
|[valugi](https://github.com/valugi)
|[DavidLambuer](https://github.com/DavidLambauer)
|[kevingimbel](https://github.com/kevingimbel)
|[drdreamm](https://github.com/drdreamm)
|[milansimek](https://github.com/milansimek)
|[yogeshsyscraft](https://github.com/yogeshsyscraft)
|[WaPoNe](https://github.com/WaPoNe)
|[Igloczek](https://github.com/Igloczek)
|[lalittmohan](https://github.com/lalittmohan)
|[arthurlataks](https://github.com/arthurlataks)
|[bmxmale](https://github.com/bmxmale)
|[maderlock](https://github.com/maderlock)

Follow the easy instructions on [how to contribute to DevDocs][0] to join these contributors!

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

<div class="devdocs-contributors"></div>


[0]: {{page.baseurl}}/contributor-guide/contributing_docs.html
[1]: mailto:DL-Magento-Doc-Feedback@magento.com
53 changes: 3 additions & 50 deletions guides/v2.1/contributor-guide/quarterly-contributors.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: default
group: contributor
title: Quarterly Contributors
title: DevDocs Contributors
version: 2.1
github_link: contributor-guide/quarterly-contributors.md
redirect_from: /guides/v2.0/howdoi/howdoi_bios.html
Expand All @@ -11,59 +11,12 @@ Thanks to the following community members, partners, and Magento fans who helped

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

{% include home/contributors.html %}

<br/>

The following table lists the community members who created pull requests and issues for this quarter.

**PR contributors**|**Issue contributors**
:-----:|:-----:
[Shreyas-Echidna](https://github.com/Shreyas-Echidna)|[vinkiel](https://github.com/vinkiel)
[korostii](https://github.com/korostii)|[josephmcdermott](https://github.com/josephmcdermott)
[suhasdhoke](https://github.com/suhasdhoke)|[markoshust](https://github.com/markoshust)
[hostep](https://github.com/hostep)|[kalpmehta](https://github.com/kalpmehta)
[vinkiel](https://github.com/vinkiel)|[chris-pook](https://github.com/chris-pook)
[dougkm](https://github.com/dougkm)|[owenju](https://github.com/owenju)
[kirkmadera](https://github.com/kirkmadera)|[roman-snitko-vaimo](https://github.com/roman-snitko-vaimo)
[SpencerRohan](https://github.com/SpencerRohan)|[36serg6](https://github.com/36serg6)
[ravnarayan](https://github.com/ravnarayan)|[likemusic](https://github.com/likemusic)
[camdixon](https://github.com/camdixon)|[briscoda](https://github.com/briscoda)
[Dx3webs](https://github.com/Dx3webs)|[LukeHandle](https://github.com/LukeHandle)
[zennco](https://github.com/zennco)|[pmclain](https://github.com/pmclain)
[ifolco](https://github.com/lfolco)|[lewisvoncken](https://github.com/lewisvoncken)
[sfritzsche](https://github.com/sfritzsche)|[oddyssey](https://github.com/oddyssey)
[PascalBrouwers](https://github.com/PascalBrouwers)|[Vinai](https://github.com/Vinai)
[xpoback](https://github.com/xpoback)|[RakeshJesadiya](https://github.com/RakeshJesadiya)
[dgoldfeder](https://github.com/dgoldfeder)|[immanetize](https://github.com/immanetize)
[gamort](https://github.com/gamort)|[bassplayer7](https://github.com/bassplayer7)
[jaustinlam](https://github.com/jaustinlam)|[cmtickle](https://github.com/cmtickle)
[clementblanco](https://github.com/clementblanco)|
[xfrenette](https://github.com/xfrenette)|
[Avinashsain](https://github.com/Avinashsain)|
[sadon](https://github.com/sadon)|
[geetikatina](https://github.com/geetikatina)|
[patchee500](https://github.com/patchee500)|
[jrapm](https://github.com/jrapm)|
[ychadwick](https://github.com/ychadwick)|
[wangzhi0417](https://github.com/wangzhi0417)|
[AndyHodgesStemcell](https://github.com/AndyHodgesStemcell)|
[Sharkozp](https://github.com/Sharkozp)|
[Lewiscowles1986](https://github.com/Lewiscowles1986)|
[rnicklin](https://github.com/rnicklin)|
[SunshineTech](https://github.com/SunshineTech)|
[istitutoculturaitaliana](https://github.com/istitutoculturaitaliana)|
[surajtupe](https://github.com/surajtupe)|
[ArvidBaa](https://github.com/ArvidBaa)|
[shyang292](https://github.com/shyang292)|
[rossmitchell](https://github.com/rossmitchell)|
[Volvoxpl](https://github.com/Volvoxpl)|
[neeta-wagento](https://github.com/neeta-wagento)|

Follow the easy instructions on [how to contribute to DevDocs][0] to join these contributors!

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

<div class="devdocs-contributors"></div>


[0]: {{page.baseurl}}/contributor-guide/contributing_docs.html
[1]: mailto:DL-Magento-Doc-Feedback@magento.com
3 changes: 3 additions & 0 deletions guides/v2.1/magento-devdocs-whatsnew.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ This page contains recent changes that we think you'd like to know about. We exc

Description | Versions applied to | New or Updated | Date
-------------|--------------|----------------------|--------
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
Updates from the 2018 Imagine Docathon.|2.x|Technical changes|Apr 27
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
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
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
Added [Marketplace EQP API](http://devdocs.magento.com/guides/v2.2/marketplace/eqp/api.html) reference documentation.|2.x|New topic|Apr 21
Expand Down
Loading

0 comments on commit fab1778

Please sign in to comment.