Merge branch 'master' into patch-7

Author: dobooth

.gitignore

@@ -30,3 +30,4 @@ _algolia_api_key
 
 /mbi/
 /page-builder/
+/guides/m1x/

_checks/html-check-hook.rb

@@ -6,7 +6,7 @@
 #
 require 'html-proofer'
 require 'yaml'
-require_relative '../rakelib/double-slash-check.rb'
+require_relative '../rakelib/lib/double-slash-check.rb'
 
 Jekyll::Hooks.register :site, :post_write do |site|
   # Do nothing unless 'site.check_links' is set

_data/main-nav.yml

@@ -29,7 +29,7 @@
     - label: Installation Guide
       url: /install-gde/bk-install-guide.html
 
-    - label: Extension Update and System Upgrade Guide
+    - label: Software Update Guide
       url: /comp-mgr/bk-compman-upgrade-guide.html
       exclude_versions: ['2.0', '2.1']
 
@@ -179,6 +179,11 @@
     - label: Order Management
       url: http://omsdocs.magento.com/en/
 
+    - label: Page Builder
+      url: /page-builder/docs/index.html
+      exclude_versions: ['2.0', '2.1', '2.2']
+      versionless: true
+
     - label: Payment Integrations
       url: /payments-integrations/bk-payments-integrations.html
 

_data/toc/page-builder.yml

@@ -0,0 +1,165 @@
+label: Page Builder
+versionless: true
+pages:
+- label: What is Page Builder?
+  url: /page-builder/docs/
+  versionless: true
+
+- label: 'Getting started'
+  versionless: true
+  children:
+  - label: Install Page Builder
+    url: /page-builder/docs/getting-started/install-pagebuilder.html
+    versionless: true
+
+  - label: View Page Builder
+    url: /page-builder/docs/getting-started/view-pagebuilder.html
+    versionless: true
+
+  - label: Install Page Builder Examples
+    url: /page-builder/docs/getting-started/install-pagebuilder-examples.html
+    versionless: true
+
+- label: 'Extend a content type'
+  versionless: true
+  children:
+  - label: Overview
+    url: /page-builder/docs/extend-existing-content-type/overview.html
+    versionless: true
+
+- label: 'Create a content type'
+  versionless: true
+  children:
+  - label: Overview
+    url: /page-builder/docs/create-custom-content-type/overview.html
+    versionless: true
+
+  - label: Step 1. Add configuration
+    url: /page-builder/docs/create-custom-content-type/step-1-add-configuration.html
+    versionless: true
+
+  - label: Step 2. Add templates
+    url: /page-builder/docs/create-custom-content-type/step-2-add-templates.html
+    versionless: true
+
+  - label: Step 3. Add components
+    url: /page-builder/docs/create-custom-content-type/step-3-add-components.html
+    versionless: true
+
+  - label: Step 4. Add form
+    url: /page-builder/docs/create-custom-content-type/step-4-add-form.html
+    versionless: true
+
+  - label: Step 5. Add styles
+    url: /page-builder/docs/create-custom-content-type/step-5-add-styles.html
+    versionless: true
+
+  - label: Step 6. Add an icon
+    url: /page-builder/docs/create-custom-content-type/step-6-add-icon.html
+    versionless: true
+
+  - label: What's next?
+    url: /page-builder/docs/create-custom-content-type/whats-next.html
+    versionless: true
+
+- label: How-Tos
+  versionless: true
+  children:
+  - label: How to add additional configurations
+    url: /page-builder/docs/how-to/how-to-add-additional-configurations.html
+    versionless: true
+
+  - label: How to customize the panel
+    url: /page-builder/docs/how-to/how-to-customize-panel.html
+    versionless: true
+
+  - label: How to add icons and images
+    url: /page-builder/docs/how-to/how-to-add-icons-images.html
+    versionless: true
+
+  - label: How to add a block chooser
+    url: /page-builder/docs/how-to/how-to-add-block-chooser.html
+    versionless: true
+
+  - label: How to use full-width layouts
+    url: /page-builder/docs/how-to/how-to-use-full-width-layouts.html
+    versionless: true
+
+  - label: How to change breakpoints
+    url: /page-builder/docs/how-to/how-to-change-breakpoints.html
+    versionless: true
+
+  - label: How to customize selectors
+    url: /page-builder/docs/how-to/how-to-customize-selectors.html
+    versionless: true
+
+  - label: How to apply product conditions
+    url: /page-builder/docs/how-to/how-to-apply-product-conditions.html
+    versionless: true
+
+  - label: How to use server-side previews
+    url: /page-builder/docs/how-to/how-to-use-server-side-previews.html
+    versionless: true
+
+  - label: How to create a container content type
+    url: /page-builder/docs/how-to/how-to-create-container-content-type.html
+    versionless: true
+
+  - label: How to add an image uploader
+    url: /page-builder/docs/how-to/how-to-add-image-uploader.html
+    versionless: true
+
+  - label: How to add a storefront widget
+    url: /page-builder/docs/how-to/how-to-add-storefront-widget.html
+    versionless: true
+
+  - label: How to add a text editor
+    url: /page-builder/docs/how-to/how-to-add-text-editor.html
+    versionless: true
+
+  - label: How to add a custom toolbar
+    url: /page-builder/docs/how-to/how-to-add-custom-toolbar.html
+    versionless: true
+
+  - label: How to use Page Builder for product attributes
+    url: /page-builder/docs/how-to/how-to-use-pagebuilder-for-product-attributes.html
+    versionless: true
+
+  - label: How to deactivate Page Builder
+    url: /page-builder/docs/how-to/how-to-deactivate-pagebuilder.html
+    versionless: true
+
+- label: Reference
+  versionless: true
+  children:
+  - label: Architecture
+    url: /page-builder/docs/reference/architecture.html
+    versionless: true
+
+  - label: Configurations
+    url: /page-builder/docs/reference/configurations.html
+    versionless: true
+
+  - label: Datastore
+    url: /page-builder/docs/reference/data-store.html
+    versionless: true
+
+  - label: Events
+    url: /page-builder/docs/reference/events.html
+    versionless: true
+
+  - label: Knockout bindings
+    url: /page-builder/docs/reference/knockout-bindings.html
+    versionless: true
+
+- label: Release notes
+  url: /page-builder/docs/release-notes.html
+  versionless: true
+
+- label: Component status
+  url: /page-builder/docs/comp-status2.html
+  versionless: true
+
+- label: Contribution guide
+  url: https://github.com/magento/magento2-page-builder/blob/develop/CONTRIBUTING.md
+  versionless: true

_data/toc/release-notes.yml

@@ -258,3 +258,8 @@ pages:
     - label: Inventory management
       url: /release-notes/inventory-management.html
       exclude_versions: ["2.0", "2.1", "2.2"]
+
+    - label: Page Builder
+      url: /page-builder/docs/release-notes.html
+      exclude_versions: ["2.0", "2.1", "2.2"]
+      versionless: true

_data/whats-new.yml

@@ -4,8 +4,37 @@ description: |
   We exclude from this list proofreading, spelling checks, and all minor updates.
 link: /whats-new.html
 thread: /whatsnew-feed.xml
-updated: Mon Mar  4 13:13:10 2019
+updated: Mon Mar 11 10:18:26 2019
 entries:
+- description: Added a technical guideline [6.4.4.13](https://devdocs.magento.com/guides/v2.3/coding-standards/technical-guidelines.html#64-service-contracts-application-layer).
+  versions: 2.2.x, 2.3.x
+  type: Major update
+  date: March  5, 2019
+  link: https://github.com/magento/devdocs/pull/3870
+- description: Moved source files of the Magento 1 documentation to [magento/devdocs-m1](https://github.com/magento/devdocs-m1).
+  versions: 1.x
+  type: Major update
+  date: March  5, 2019
+  link: https://github.com/magento/devdocs/pull/3868
+- description: Corrected the data type for the `company_id` and `available_limit`
+    parameters for the [company credit API operations](https://devdocs.magento.com/guides/v2.3/b2b/credit-manage.html)
+    in Magento Commerce for B2B.
+  versions: 2.2.x, 2.3.x
+  type: Technical changes
+  date: March  5, 2019
+  link: https://github.com/magento/devdocs/pull/3865
+- description: Update [community contribution guidelines](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#porting)
+    about porting
+  versions: 2.x
+  type: Major update
+  date: March  4, 2019
+  link: https://github.com/magento/devdocs/pull/3850
+- description: Fixed the incorrect `composer install` command in [Set up an Embedded
+    MFTF](https://devdocs.magento.com/mftf/2.3/getting-started.html#setup-framework).
+  versions: 2.3.x
+  type: Technical changes
+  date: March  4, 2019
+  link: https://github.com/magento/devdocs/pull/3863
 - description: Added a section about [Required System Dependencies](http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html#required-system-dependencies)<br/>Added
     a section about [Unsupported Operating Systems](http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html#unsupported-operating-systems)
   versions: 2.3.x

_includes/contributor/labels.md

@@ -3,7 +3,6 @@
 
 Release line labels indicate the specific Magento release lines affected by the issue or PR. For example, if working on a fix for 2.2.6, you would apply the Release Line: 2.2. This effectively includes all releases in this line.
 
-* `Release Line: 2.1`
 * `Release Line: 2.2`
 * `Release Line: 2.3`
 
@@ -90,10 +89,9 @@ Labels applied to issues through verification and completion. For details on the
 * `Issue: Cannot Reproduce` - Gate 3 failed. The issue could not be reproduced or validated. Previous label `Cannot Reproduce`.
 * `Issue: Confirmed` - Gate 3 passed. Manual verification of the issue description and reproduction steps was confirmed. Previous label `G3 Passed`.
 * `Issue: Ready for Work` - Gate 4 passed. The issue is acknowledged and added to the backlog for open development. Previous label `acknowledged`.
-* `Reproduced on 2.1.x` - The Community Engineering Team reproduced the issue on latest 2.1.x release.
 * `Reproduced on 2.2.x` - The Community Engineering Team reproduced the issue on latest 2.2.x release.
 * `Reproduced on 2.3.x` - The Community Engineering Team reproduced the issue on latest 2.3.x release.
-* `Fixed in 2.1.x` - The issue has been fixed in one of the 2.1.x releases or in 2.1-develop branch and will be available with the upcoming patch release.
+
 * `Fixed in 2.2.x` - The issue has been fixed in one of the 2.2.x releases or in 2.2-develop branch and will be available with the upcoming patch release.
 * `Fixed in 2.3.x` - The issue has been fixed in one of the 2.3.x releases or in 2.3-develop branch and will be available with the upcoming patch release.
 * `non-issue` - A described behavior in the issue description is valid and shouldn't be changed in Magento code base.

_includes/contributor/rewards.md

@@ -46,6 +46,7 @@ Test coverage | 10 | Contribution contains fix or improvement and new tests or t
 MFTF test coverage| 10 | Contribution contains MFTF tests
 Bug fix | 10 | Contribution fixes one or more known issues from GitHub
 Author of Ported Issue | 5 | Additional points for a contribution that ports (up or back port) a previous PR across release lines by another contributor
+Issue Triage | 3 | Public issue report is verified and confirmed
 {:style="table-layout:auto;"}
 
 ## DevDocs awards and points

_includes/layout/after-site-header.html

@@ -1,5 +1,5 @@
-{% if page.guide_version == "2.0" %}
+{% if page.group == "page-builder" %}
 <div class="message-banner">
-  <a href="{{ site.baseurl }}/guides/v2.0/release-notes/ReleaseNotes2.0.18CE.html" target="_blank">Magento 2.0.18</a> is the final 2.0.x release. After March 2018, Magento 2.0.x will no longer receive security patches, quality fixes, or documentation updates.</br> To maintain your site's performance, security, and PCI compliance, upgrade to the latest version of Magento.
+  Please note that the Page Builder docs are still in beta. Only partners have access to the pre-release code.
 </div>
 {% endif %}

_includes/layout/footer-scripts.html

@@ -28,3 +28,7 @@
 <script type="text/javascript">_satellite.pageBottom();</script>
 
 {% endif %}
+
+{% if page.url contains "cloud/" %}
+<script type="text/javascript" src="{{ site.baseurl }}/common/js/survey.js"></script>
+{% endif %}

_includes/webapi/services22.md

@@ -107,6 +107,7 @@ The Web APIs for {{site.data.var.ee}} (formerly Magento Enterprise Edition) are
     customerCustomerRepositoryV1
     customerGroupManagementV1
     customerGroupRepositoryV1
+    customerCustomerGroupConfigV1
 
 ### Directory
     directoryCountryInformationAcquirerV1

_includes/webapi/services23.md

@@ -110,6 +110,7 @@ The Web APIs for {{site.data.var.ee}} (formerly Magento Enterprise Edition) are
     customerCustomerRepositoryV1
     customerGroupManagementV1
     customerGroupRepositoryV1
+    customerCustomerGroupConfigV1
 
 ### Directory
     directoryCountryInformationAcquirerV1

_includes/webapi/tutorials/configure-shipping-methods.md

@@ -10,6 +10,6 @@ Free shipping | `freeshipping` | No
 
 To change which offline shipping methods are available:
 
-1. Select **Stores** > **Configuration** > **Sales** > **Shipping Methods** in Admin.
+1. Select **Stores** > **Settings** > **Configuration** > **Sales** > **Shipping Methods** in Admin.
 2. Enable or disable the shipping methods as desired.
 3. Click **Save Config**.

_includes/webapi/tutorials/set-payment-methods.md

@@ -10,6 +10,6 @@ Zero Subtotal Checkout | `free` | Yes
 
 In this tutorial, configure Magento to accept bank transfer payments. To allow bank transfer payments (or any other offline payment method) as a payment method:
 
-1. Log in to {% glossarytooltip 29ddb393-ca22-4df9-a8d4-0024d75739b1 %}Admin{% endglossarytooltip %} and select **Stores** > **Configuration** > **Sales** > **Payment Methods**.
+1. Log in to {% glossarytooltip 29ddb393-ca22-4df9-a8d4-0024d75739b1 %}Admin{% endglossarytooltip %} and select **Stores** > **Settings** > **Configuration** > **Sales** > **Payment Methods**.
 2. Enable the {% glossarytooltip 422b0fa8-b181-4c7c-93a2-c553abb34efd %}payment method{% endglossarytooltip %}.
 3. Click **Save Config**.

common/js/survey.js

@@ -0,0 +1,36 @@
+
+$(function() {
+
+  // Fist, check if browser supports storing the data
+  if (typeof localStorage !== 'undefined') {
+
+    var surveyName = "Cloud survey 2 done";
+
+    // Only show if user didn't interact with the banner
+    if ( !localStorage.getItem(surveyName) ) {
+
+      // Build banner text
+      var $banner = $('<div class="bs-callout" style="display:none; text-align:left; max-width: 1024px; margin-top: 50px;"><h2>Hello Magento Community!</h2><p>We at Magento believe in listening to our community, as they play an important role in building valuable products in the future!  If you want to make an impact on Magento Cloud please share your feedback through this survey.</p><p>Thank you in advance for participating in our survey. Your feedback is 100% confidential and will not be shared outside of Magento.</p> <button data-href="https://www.surveymonkey.com/r/CloudFeatures_LP2" class="btn btn-primary btn-large">OK, I will help</button> <button class="btn btn-large">No, thanks</button> </div>');
+      
+      // Assign events
+      $banner.find('a, button').on('click', function () {
+
+        var $this = $(this);
+        localStorage.setItem(surveyName , true);
+        $banner.delay(100).slideUp(400);
+
+        if ( $this.data('href') ) {
+          window.open( $this.data('href'), '_blank' );
+        }
+      });
+
+      // Insert banner in place
+      $banner.appendTo('.content-wrap');
+
+      // Show banner
+      $banner.delay(500).slideDown(400);
+    }
+  }
+  
+});
+