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

Sync master with develop #6024

Merged
merged 129 commits into from
Nov 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
fba0291
Update first-time-setup-import-import.md
luanalves Sep 1, 2019
6c3af6e
Merge pull request #1 from luanalves/luanalves-patch-1
luanalves Sep 1, 2019
cf4ba8c
adding new information from stopwords elasticsearch
luanwebjump Nov 2, 2019
ae615bd
Merge branch 'master' into feature/elasticsearch-stopwords
luanwebjump Nov 2, 2019
7bdfe07
settings
luanwebjump Nov 2, 2019
5d72175
settings
luanwebjump Nov 2, 2019
1550bbb
settings spaces
luanwebjump Nov 2, 2019
824a676
settings by MD029
luanwebjump Nov 2, 2019
846f5d8
settings by MD029
luanwebjump Nov 3, 2019
3059812
adding variable from github url tree
luanwebjump Nov 4, 2019
6b120eb
adding url variable
luanwebjump Nov 4, 2019
8ea949f
adding fix MD009
luanwebjump Nov 4, 2019
436d189
Updated repo path
dobooth Nov 11, 2019
611a168
Merge branch 'master' into db_mftf_yml
dobooth Nov 11, 2019
7c12323
Merge branch 'master' into db_mftf_yml
dobooth Nov 11, 2019
aa13aae
Fixed double quotes.
dobooth Nov 11, 2019
3034063
Fixed incorrect module dependency examples
drpayyne Nov 12, 2019
f8883e4
update file extension
hguthrie Nov 12, 2019
8d5649d
Fix small grammatical issue
Nov 12, 2019
f8c4b09
Merge branch 'master' into hg-mc4655-blackfireyaml
dobooth Nov 12, 2019
0ccec6a
Merge pull request #5977 from magento/hg-mc4655-blackfireyaml
dobooth Nov 12, 2019
9599d71
Fixed incorrect link syntax
drpayyne Nov 12, 2019
436c427
Merge branch 'master' into collapsible-widget-grammar
dobooth Nov 12, 2019
6da5a5e
Merge master
dobooth Nov 12, 2019
abba21e
Merge pull request #5978 from enderandpeter/collapsible-widget-grammar
dobooth Nov 12, 2019
124c764
Fix staging
dshevtsov Nov 12, 2019
7f83d4b
Merge pull request #5979 from drpayyne/patch-45
dobooth Nov 12, 2019
8d49d1f
Merge branch 'master' into patch-44
dobooth Nov 12, 2019
c5ffa72
Merge pull request #5976 from drpayyne/patch-44
dobooth Nov 12, 2019
eb798f1
Fix staging
dshevtsov Nov 12, 2019
1f904a5
Merge branch 'master' into ds_fix-staging-build
dshevtsov Nov 12, 2019
b4afe87
Merge pull request #5985 from magento/ds_fix-staging-build
dshevtsov Nov 12, 2019
9a5c19e
Merge branch 'master' into db_mftf_yml
dobooth Nov 12, 2019
ba65275
Improving the Range UiComponent
eduard13 Nov 13, 2019
27636ac
Improving the Checkbox UiComponent documentation
eduard13 Nov 13, 2019
d74e9a2
magento/devdocs#: Add deleteCustomerAddress mutation API errors
atwixfirster Nov 13, 2019
e27ca2a
Adding the widget available options
eduard13 Nov 13, 2019
ab6a633
Update theme-create.md
Serhii190336 Nov 13, 2019
868d11d
Product availability updates (#5984)
jeff-matthews Nov 13, 2019
f0a0fc0
magento/devdocs#: Add updateCustomerAddress mutation API errors
atwixfirster Nov 13, 2019
7e4b4c4
Merge branch 'master' into widget-options
dobooth Nov 13, 2019
b55278d
Editing for grammar
keharper Nov 13, 2019
7e30a34
Editing for grammar
keharper Nov 13, 2019
caf30ac
Merge pull request #5989 from eduard13/widget-options
dobooth Nov 13, 2019
e956a4c
Merge branch 'master' into api-errors-updateCustomerAddress
dobooth Nov 13, 2019
ef0c347
Merge master
dobooth Nov 13, 2019
646dcae
Merge pull request #5991 from atwixfirster/api-errors-updateCustomerA…
dobooth Nov 13, 2019
2ac9138
Merge branch 'master' into api-errors-deleteCustomerAddress
dobooth Nov 13, 2019
50b1d26
Merge pull request #5988 from atwixfirster/api-errors-deleteCustomerA…
dobooth Nov 13, 2019
e4cfc12
Table formatting
dobooth Nov 13, 2019
37954a5
Merge branch 'master' into ui-range-comp
dobooth Nov 13, 2019
4791a4f
Merge pull request #5986 from eduard13/ui-range-comp
dobooth Nov 13, 2019
7bda0bb
Merge branch 'master' into ui-checkbox-comp
dobooth Nov 13, 2019
44c5abc
Grammar
dobooth Nov 13, 2019
f2a57dd
magento/devdocs#: Extends information about creating a dynamic row sy…
atwixfirster Nov 13, 2019
9a3f96e
Add site switcher to the header (#5983)
belbiy Nov 13, 2019
074a08a
Add contributor metadata info
shrielenee Nov 13, 2019
c197586
Removed workflows file
jeff-matthews Nov 13, 2019
43bd4f9
Merge pull request #5995 from magento/remove-workflows
dshevtsov Nov 13, 2019
e924b10
Merge branch 'master' into ui-checkbox-comp
dobooth Nov 13, 2019
5d2679a
Merge pull request #5987 from eduard13/ui-checkbox-comp
dobooth Nov 13, 2019
193c25f
Change wording
shrielenee Nov 13, 2019
8e1dc57
Merge branch 'master' into spangler-contribmeta
shrielenee Nov 14, 2019
0465630
Merge master
dobooth Nov 14, 2019
5d923f0
Merge branch 'master' into update-dynamic-rows-content
dobooth Nov 14, 2019
0689c6b
Merge pull request #5994 from magento/spangler-contribmeta
dobooth Nov 14, 2019
e7298ff
Added PHP note
hickskenh Nov 14, 2019
b0656b2
Small grammar fix
dobooth Nov 14, 2019
d56e48b
Merge pull request #5992 from atwixfirster/update-dynamic-rows-content
dobooth Nov 14, 2019
68b8917
[ImgBot] Optimize images
ImgBotApp Nov 14, 2019
749e32b
Update database-caching.md
gustavolcdev Nov 14, 2019
f815c33
Adding new example
GDauer Nov 14, 2019
e36478e
Update create-cache-type.md
gustavolcdev Nov 14, 2019
e85fac2
Update lifecycle.md
gustavolcdev Nov 14, 2019
b37f6aa
Add rake index with dry run
dshevtsov Nov 15, 2019
b2b0509
Cloud 2002.0.22 (#5997)
meker12 Nov 15, 2019
bd4c67d
Update rake multirepo:init
dshevtsov Nov 15, 2019
fd7df58
Merge branch 'master' into patch-3
dobooth Nov 15, 2019
c8276ca
Merge master
dobooth Nov 15, 2019
bb85f52
Merge pull request #6003 from gustavo11star/patch-3
dobooth Nov 15, 2019
65fea69
Merge branch 'master' into patch-2
dobooth Nov 15, 2019
89ac927
Merge pull request #6002 from gustavo11star/patch-2
dobooth Nov 15, 2019
9225af4
Merge branch 'master' into patch-1
dobooth Nov 15, 2019
5bfd82c
Merge pull request #6000 from gustavo11star/patch-1
dobooth Nov 15, 2019
675ea04
Merge branch 'master' into patch-1
dobooth Nov 15, 2019
699927a
Merge branch 'master' into patch-1
dobooth Nov 15, 2019
93fed52
Merge pull request #5990 from Serj190336/patch-1
dobooth Nov 15, 2019
4c0cff6
Typo fix
dobooth Nov 15, 2019
514a291
Merge branch 'master' into imgbot
dobooth Nov 15, 2019
34fca11
Update rake index
dshevtsov Nov 15, 2019
5ae5eed
Refactor rake init
dshevtsov Nov 15, 2019
f6522d6
Merge pull request #5999 from magento/imgbot
dobooth Nov 15, 2019
3c3f56c
Merge branch 'master' into dobooth-patch-1
dobooth Nov 15, 2019
72bbdfc
Merge master
dobooth Nov 15, 2019
66031b2
Merge pull request #6006 from magento/dobooth-patch-1
dobooth Nov 15, 2019
1ee7ed6
Update rake mutirepo tasks
dshevtsov Nov 15, 2019
f3c9a27
Formatting
dshevtsov Nov 15, 2019
519c3b5
Formatting
dobooth Nov 15, 2019
57df06c
Merge branch 'master' into patch-1
dobooth Nov 15, 2019
cc573a7
Merge pull request #6001 from GDauer/patch-1
dobooth Nov 15, 2019
720dd5a
Merge branch 'master' into small-changes
dobooth Nov 15, 2019
8b6c36d
Merge pull request #6007 from magento/small-changes
dobooth Nov 15, 2019
b3c5cab
Add caution for 'rake multirepo:reinit'
dshevtsov Nov 15, 2019
a54ae19
Merge branch 'master' into ds_rake-index
dshevtsov Nov 15, 2019
3f42290
Merge pull request #6008 from magento/ds_rake-index
dshevtsov Nov 15, 2019
c8006ce
Remove typos in command
dobooth Nov 15, 2019
acbcdf8
Merge pull request #6009 from magento/dobooth-patch-1
dobooth Nov 15, 2019
bd9163a
Update guides/v2.3/security/google-recaptcha.md
hickskenh Nov 15, 2019
095cdec
Merge branch 'master' into PHP-update-for-reCAPTCHA
hickskenh Nov 15, 2019
bd3533c
fixed broken link
hickskenh Nov 15, 2019
a2e9d8f
removing variable and remove link for example
luanwebjump Nov 16, 2019
c0e260d
Added JS script name resolution examples
drpayyne Nov 17, 2019
c219301
Merge pull request #5998 from magento/PHP-update-for-reCAPTCHA
hickskenh Nov 18, 2019
d8c962c
Added note for ece-tools patch process fix (#6004)
meker12 Nov 18, 2019
68f4b27
Merge branch 'master' into feature/elasticsearch-stopwords
dobooth Nov 18, 2019
dfe5c5d
Updates yml. Delete unused file.
dobooth Nov 18, 2019
c130a5d
Fixed typo.
dobooth Nov 18, 2019
4bb5fb5
Merge branch 'master' into db_mftf_yml
dobooth Nov 18, 2019
a36c9e8
Linting
dobooth Nov 18, 2019
15313ca
Merge pull request #5917 from luanalves/feature/elasticsearch-stopwords
dobooth Nov 18, 2019
23bbb9e
Grammar and formatting
dobooth Nov 18, 2019
5e36f22
Merge branch 'master' into patch-46
dobooth Nov 18, 2019
a193df2
Trailing spaces
dobooth Nov 18, 2019
fb12795
Merge pull request #6014 from drpayyne/patch-46
dobooth Nov 18, 2019
038e889
Merge branch 'master' into db_mftf_yml
dobooth Nov 18, 2019
99227ee
Merge pull request #5965 from magento/db_mftf_yml
dobooth Nov 18, 2019
502840c
Markdown linting: Enable rule MD036 (emphasis used instead of a heade…
jeff-matthews Nov 18, 2019
54b97f1
fix merge errors
keharper Nov 18, 2019
b6f1bc0
fix linting problems for text added in 2.3.4
keharper Nov 18, 2019
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ruby -v

### Install the latest Ruby (if the Ruby version is less than 2.4)

**MacOS users**
**MacOS users:**

1. Install Homebrew. See the [Homebrew site](https://brew.sh) for instructions.
1. Use Homebrew to install the latest stable version of Ruby:
Expand All @@ -37,7 +37,7 @@ ruby -v
brew install ruby
```

**Unix, Windows, and other OS users**
**Unix, Windows, and other OS users:**

See the [Ruby site](https://www.ruby-lang.org/en/documentation/installation) for instructions.

Expand Down
2 changes: 1 addition & 1 deletion _checks/styles/style-rules-prod
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ rule 'MD032'
exclude_rule 'MD033'
exclude_rule 'MD034'
rule 'MD035'
exclude_rule 'MD036'
rule 'MD036'
rule 'MD037'
rule 'MD038'
exclude_rule 'MD039'
Expand Down
5,673 changes: 0 additions & 5,673 deletions _data/actiongroups.yml

This file was deleted.

1,164 changes: 582 additions & 582 deletions _data/codebase/mftf/action-groups.yml

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions guides/v2.2/b2b/company-object.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ functional_areas:

This section describes the REST endpoints used to manage `Company` objects.

**Service Name**
**Service Name:**

`companyCompanyRepositoryV1`

**REST Endpoints**
**REST Endpoints:**

```json
POST /V1/company/
Expand All @@ -30,7 +30,7 @@ DELETE /V1/company/:companyId
GET /V1/company/
```

**CompanyInterface Parameters**
**CompanyInterface Parameters:**

The following table lists the parameters defined in `CompanyInterface`.

Expand Down Expand Up @@ -61,11 +61,11 @@ Name | Description | Format | Requirements

The following example creates a company and assigns the default shared catalog (`customer_group_id`). The company admin (`super_user_id`) must be a previously-defined `customer_id`.

**Sample Usage**
**Sample Usage:**

`POST <host>/rest/<store_code>/V1/company/`

**Payload**
**Payload:**

```json
{
Expand All @@ -87,7 +87,7 @@ The following example creates a company and assigns the default shared catalog (
}
```

**Response**
**Response:**

```json
{
Expand Down Expand Up @@ -121,11 +121,11 @@ The following example creates a company and assigns the default shared catalog (

The following call changes the company status to Rejected (`2`) and explains why.

**Sample Usage**
**Sample Usage:**

`PUT <host>/rest/<store_code>/V1/company/2`

**Payload**
**Payload:**

```json
{
Expand All @@ -150,7 +150,7 @@ The following call changes the company status to Rejected (`2`) and explains why
}
```

**Response**
**Response:**

```json
{
Expand Down Expand Up @@ -183,15 +183,15 @@ The following call changes the company status to Rejected (`2`) and explains why
### Return all information about a company

This call returns detailed information about the specified company.
**Sample Usage**
**Sample Usage:**

`GET <host>/rest/<store_code>/V1/company/2`

**Payload**
**Payload:**

None

**Response**
**Response:**

```json
{
Expand Down Expand Up @@ -226,15 +226,15 @@ None

When you delete a company, Magento assigns the "Inactive" status to all company members. The system also removes company ID from the customer profile of all company members.

**Sample Usage**
**Sample Usage:**

`DELETE <host>/rest/<store_code>/V1/company/2`

**Payload**
**Payload:**

None

**Response**
**Response:**

`true`, indicating the request was successful

Expand All @@ -244,15 +244,15 @@ The following call returns all companies that are located in California (`region

See [Search using REST APIs]({{ page.baseurl }}/rest/performing-searches.html) for information about constructing a search query.

**Sample Usage**
**Sample Usage:**

`GET <host>/rest/<store_code>/V1/company?searchCriteria[filter_groups][0][filters][0][field]=region_id&searchCriteria[filter_groups][0][filters][0][value]=12&searchCriteria[filter_groups][0][filters][0][condition_type]=eq`

**Payload**
**Payload:**

None

**Response**
**Response:**

{% collapsible Show code sample %}
```json
Expand Down
52 changes: 26 additions & 26 deletions guides/v2.2/b2b/company-structures.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ functional_areas:

Company teams allow you to group company users by location, job responsibilities, or any criteria you choose. You can assign individual company users to a team with the company hierarchy endpoints.

**Service name**
**Service name:**

`companyTeamRepositoryV1`

**REST Endpoints**
**REST Endpoints:**

```terminal
POST /V1/team/:companyId
Expand All @@ -27,7 +27,7 @@ DELETE /V1/team/:teamId
GET /V1/team/
```

**Company team parameters**
**Company team parameters:**

Name | Description | Format | Requirements
--- | --- | --- | ---
Expand All @@ -39,11 +39,11 @@ description | An optional description of the team. | string | Optional

A newly-created team is placed under Company Admin in the company hierarchy.

**Sample Usage**
**Sample Usage:**

`POST <host>/rest/<store_code>/V1/team/2`

**Payload**
**Payload:**

```json
{
Expand All @@ -54,19 +54,19 @@ A newly-created team is placed under Company Admin in the company hierarchy.
}
```

**Response**
**Response:**

The team ID, such as `4`.

### Update a team

You can only change the name or description of a team.

**Sample Usage**
**Sample Usage:**

`PUT <host>/rest/<store_code>/V1/team/4`

**Payload**
**Payload:**

```json
{
Expand All @@ -77,23 +77,23 @@ You can only change the name or description of a team.
}
```

**Response**
**Response:**

`true`, indicating the request was successful

### Return all information about a team

The `GET` call returns the team `id`, `name`, and `description`.

**Sample Usage**
**Sample Usage:**

`GET <host>/rest/<store_code>/V1/team/4`

**Payload**
**Payload:**

Not applicable

**Response**
**Response:**

```json
{
Expand All @@ -107,15 +107,15 @@ Not applicable

You cannot delete a team if members are assigned to it.

**Sample Usage**
**Sample Usage:**

`DELETE <host>/rest/<store_code>/V1/team/4`

**Payload**
**Payload:**

Not applicable

**Response**
**Response:**

An empty array

Expand All @@ -125,15 +125,15 @@ The following query returns information about all teams (`team_id` &ge; `0`)

See [Search using REST APIs]({{ page.baseurl }}/rest/performing-searches.html) for information about constructing a search query.

**Sample Usage**
**Sample Usage:**

`GET <host>/rest/<store_code>/V1/team?searchCriteria[filter_groups][0][filters][0][field]=team_id&searchCriteria[filter_groups][0][filters][0][value]=0&searchCriteria[filter_groups][0][filters][0][condition_type]=gteq`

**Payload**
**Payload:**

Not applicable

**Response**
**Response:**
{% collapsible Show code sample %}

```json
Expand Down Expand Up @@ -175,11 +175,11 @@ In the B2B storefront, a buyer can view the company structure represented as a h

You can use REST endpoints to retrieve the current structure and move teams and buyers within the hierarchy. You cannot delete teams or buyers.

**Service name**
**Service name:**

`companyHierarchyV1`

**REST Endpoints**
**REST Endpoints:**

```terminal
GET /V1/hierarchy/:id
Expand All @@ -201,15 +201,15 @@ Admin (structure_id = 2)
| |-- Teresa Gomez (customer, structure_id = 5)
```

**Sample Usage**
**Sample Usage:**

`GET <host>/rest/<store_code>/V1/hierarchy/2`

**Payload**
**Payload:**

Not applicable

**Response**
**Response:**

{% collapsible Show code sample %}

Expand Down Expand Up @@ -265,19 +265,19 @@ Not applicable

The following example moves Bryce Martin (`structure_id = 4`) to the West team (`structure_id = 7`)

**Sample Usage**
**Sample Usage:**

`PUT <host>/rest/<store_code>/V1/hierarchy/move/5`

**Payload**
**Payload:**

```json
{
"newParentId": 7
}
```

**Response**
**Response:**

`[]` (an empty array)

Expand Down
Loading