Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
242a44f
Use updated way on how echo is done in phtml
arnoudhgz Aug 7, 2020
8c90df4
Added link to public Slack workspace invite
Aug 7, 2020
2f36b2a
Typing mistake
ejaz-alam Aug 7, 2020
974a7cd
Update Composer.json examples
chandru-199 Aug 9, 2020
f09cfe5
Grammar fix
dobooth Aug 10, 2020
3682653
Merge branch 'master' into aliejaz55-layout-patch-1
dobooth Aug 10, 2020
59ee5af
Merge pull request #7697 from magento/aliejaz55-layout-patch-1
dobooth Aug 10, 2020
9f29b45
Merge branch 'master' into patch-1
dobooth Aug 10, 2020
e640ffe
Merge pull request #7693 from igorin/patch-1
dobooth Aug 10, 2020
2e65e7e
Merge branch 'master' into arnoudhgz-patch-1
dobooth Aug 10, 2020
066212e
Merge pull request #7691 from magento/arnoudhgz-patch-1
dobooth Aug 10, 2020
dca499b
Merge branch 'master' into Update-composer.json
dobooth Aug 10, 2020
a9f35f3
Merge pull request #7706 from chandru-199/Update-composer.json
dobooth Aug 10, 2020
4bab278
Export option typo
DominicWatts Aug 10, 2020
14f4628
Merge branch 'master' into DominicWatts-patch-1
dobooth Aug 11, 2020
999ebbb
Merge master
dobooth Aug 11, 2020
41be5ac
Merge pull request #7713 from magento/DominicWatts-patch-1
dobooth Aug 11, 2020
7c03dc8
Added release notes link to B2B Guide
dobooth Aug 12, 2020
b232c4a
Fix proper menu label
hardyjohnson Aug 12, 2020
2fd6edb
Merge master
dobooth Aug 12, 2020
d3ac2fc
Merge pull request #7733 from magento/hardyjohnson-patch-1
dobooth Aug 12, 2020
97c76a2
Merge branch 'master' into dobooth-patch-1
dobooth Aug 13, 2020
451e436
Merge pull request #7729 from magento/dobooth-patch-1
dobooth Aug 13, 2020
428b837
Merge branch 'master' into small-changes
dobooth Aug 14, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/_data/toc/b2b-developer-guide.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,5 @@ pages:

- label: Develop B2B extensions
url: /b2b/extensions.html
- label: B2B Release Notes
url: /release-notes/b2b-release-notes.html
2 changes: 1 addition & 1 deletion src/guides/v2.3/config-guide/multi-site/ms_websites.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Creating a root category is optional, but we show how to do it in this tutorial
{% collapsible To create a root category: %}

1. Log in to the Magento Admin as a user authorized to create categories.
1. Click **Products** > **Categories**.
1. Click **Catalog** > **Categories**.
1. Click **Add Root Category**.
1. In the **Category Name** field, enter a unique name to identify this category.
1. Make sure **Enable Category** is set to **Yes**.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Here is the example of composer.json file.
"AFL-3.0"
],
"require": {
"php": "~7.1.3||~7.2.0||~7.3.0"
"php": "~7.2.0||~7.3.0"
},
"autoload": {
"files": [ "registration.php" ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Refer to [Module version dependencies]({{ page.baseurl }}/extension-dev-guide/ve
"name": "your-name/module-Acme",
"description": "Test component for Magento 2",
"require": {
"php": "~7.1.3||~7.2.0",
"php": "~7.2.0||~7.3.0",
"magento/module-store": "102.1",
"magento/module-catalog": "102.1",
"magento/module-catalog-inventory": "102.1",
Expand Down
4 changes: 2 additions & 2 deletions src/guides/v2.3/extension-dev-guide/package/package_module.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ The following example is a `composer.json` for a metapackage:
"version": "2.0.0",
"type": "metapackage",
"require": {
"php": "~7.1.3|~7.2.0",
"php": "~7.2.0||~7.3.0",
"zendframework/zend-stdlib": "~2.4.6",
"zendframework/zend-code": "~2.4.6",
"zendframework/zend-server": "~2.4.6",
Expand Down Expand Up @@ -99,7 +99,7 @@ The following example is a `composer.json` file for a module:
"AFL-3.0"
],
"require": {
"php": "~7.1.3|~7.2.0",
"php": "~7.2.0||~7.3.0",
"magento/framework": "~100.0.4"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ Extending layout:
In layout files you can change the elements order on a page. This can be done using one of the following:

- [`<move>` instruction]({{page.baseurl}}/frontend-dev-guide/layouts/xml-instructions.html#fedg_layout_xml-instruc_ex_mv): allows changing elements' order and parent.
- [`before` and `after` attributes of `<block>`]({{page.baseurl}}/frontend-dev-guide/layouts/xml-instructions.html#fedg_xml-instrux_before-after): allows changing elements' order within one parent.
- [`before` and `after` attributes of `<block>`]({{page.baseurl}}/frontend-dev-guide/layouts/xml-instructions.html#fedg_xml-instrux_before-after): sets the order of elements within a parent.

**Example of `<move>` usage:**
put the stock availability and SKU blocks next to the product price on a product page.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ To ensure that your new string is added to the dictionary and translated, use th
For example:

```php
<?php echo __('Create Backup') ?>
<?= __('Create Backup') ?>
```

If your string contains a variable, to add a placeholder for this variable in the dictionary, use syntax similar to the following:

```php
<?php echo __('Hello %1', $yourVariable) ?>
<?= __('Hello %1', $yourVariable) ?>
```

In this example, the _'Hello %1'_ string is added to the dictionary when the i18n tool is run.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ ComponentRegistrar::register(
"name": "vendor/custom-shipping",
"description": "Custom shipping module",
"require": {
"php": "~7.1.3||~7.2.0",
"php": "~7.2.0||~7.3.0",
"magento/framework": "102.0.*",
"magento/module-backend": "101.0.*",
"magento/module-catalog": "103.0.*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ group: ui-components-guide
title: ExportButton component
---

The ExportButton component implements the ability to export grid data to the specified data format (cvs, xml, and so on).
The ExportButton component implements the ability to export grid data to the specified data format (csv, xml, and so on).

## Configuration options

Expand Down
2 changes: 1 addition & 1 deletion src/marketplace/eqp/v1/help.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Use these resources if you need additional help.

**Slack:**

- workspace: Magento Community Engineering
- workspace: [Magento Community Engineering](https://opensource.magento.com/slack)
- channel: **# marketplace-eqp-api**

**Email:**
Expand Down