diff --git a/app/code/Magento/Analytics/etc/di.xml b/app/code/Magento/Analytics/etc/di.xml index 56657b58475d30d4c810ead21db3c2264b9d2851..b9bb9cc9ff00c0b2ce770d2acc385f0570bdcc63 100644 --- a/app/code/Magento/Analytics/etc/di.xml +++ b/app/code/Magento/Analytics/etc/di.xml @@ -254,4 +254,22 @@ <argument name="responseResolver" xsi:type="object">NotifyDataChangedResponseResolver</argument> </arguments> </type> + <type name="Magento\Config\Model\Config\TypePool"> + <arguments> + <argument name="sensitive" xsi:type="array"> + <item name="analytics/url/signup" xsi:type="string">1</item> + <item name="analytics/url/update" xsi:type="string">1</item> + <item name="analytics/url/bi_essentials" xsi:type="string">1</item> + <item name="analytics/url/otp" xsi:type="string">1</item> + <item name="analytics/url/report" xsi:type="string">1</item> + <item name="analytics/url/notify_data_changed" xsi:type="string">1</item> + <item name="analytics/general/token" xsi:type="string">1</item> + </argument> + <argument name="environment" xsi:type="array"> + <item name="crontab/default/jobs/analytics_collect_data/schedule/cron_expr" xsi:type="string">1</item> + <item name="crontab/default/jobs/analytics_update/schedule/cron_expr" xsi:type="string">1</item> + <item name="crontab/default/jobs/analytics_subscribe/schedule/cron_expr" xsi:type="string">1</item> + </argument> + </arguments> + </type> </config> diff --git a/app/code/Magento/ReleaseNotification/i18n/en_US.csv b/app/code/Magento/ReleaseNotification/i18n/en_US.csv index 0f4a1f87b8b4e551a6ca7c61d3072d807ba7dd1f..4a3cd02782b9c52c498cc9a24551173740c04004 100644 --- a/app/code/Magento/ReleaseNotification/i18n/en_US.csv +++ b/app/code/Magento/ReleaseNotification/i18n/en_US.csv @@ -15,7 +15,7 @@ payment and shipping information to skip tedious checkout steps.</p> </div> <div class=""email-marketing-highlight""> - <h3>Email Marketing Automation</span></h3> + <h3>Email Marketing Automation</h3> <p>Send smarter, faster email campaigns with marketing automation from dotmailer, powered by your Magento store's live data.</p> </div> @@ -34,7 +34,7 @@ payment and shipping information to skip tedious checkout steps.</p> </div> <div class=""email-marketing-highlight""> - <h3>Email Marketing Automation</span></h3> + <h3>Email Marketing Automation</h3> <p>Send smarter, faster email campaigns with marketing automation from dotmailer, powered by your Magento store's live data.</p> </div> @@ -65,26 +65,26 @@ features include: </p> <ul> - <li><span>Configurable “Instant Purchase†button to place orders</span></li> + <li><span>Configurable “Instant Purchase†button to place orders.</span></li> <li><span>Support for all payment solutions using Braintree Vault, including Braintree Credit Card, Braintree PayPal, and PayPal Payflow Pro.</span></li> <li><span>Shipping to the customer’s default address using the lowest cost, available shipping - method</span></li> + method.</span></li> <li><span>Ability for developers to customize the Instant Purchase business logic to meet - merchant needs</span></li> + merchant needs.</span></li> </ul>","<p>Now you can deliver an Amazon-like experience with a new, streamlined checkout option. Logged-in customers can use previously-stored payment credentials and shipping information to skip steps, making the process faster and easier, especially for mobile shoppers. Key features include: </p> <ul> - <li><span>Configurable “Instant Purchase†button to place orders</span></li> + <li><span>Configurable “Instant Purchase†button to place orders.</span></li> <li><span>Support for all payment solutions using Braintree Vault, including Braintree Credit Card, Braintree PayPal, and PayPal Payflow Pro.</span></li> <li><span>Shipping to the customer’s default address using the lowest cost, available shipping - method</span></li> + method.</span></li> <li><span>Ability for developers to customize the Instant Purchase business logic to meet - merchant needs</span></li> + merchant needs.</span></li> </ul>" "Email Marketing Automation","Email Marketing Automation" "<p>Unlock an unparalleled level of insight and control of your eCommerce marketing with diff --git a/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml b/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml index 1ddfde5cafb9c6f80a63c4b923d4fed0221ecf9f..0364750d56a386a1a908787c09b0c6094657154e 100644 --- a/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml +++ b/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml @@ -73,7 +73,7 @@ payment and shipping information to skip tedious checkout steps.</p> </div> <div class="email-marketing-highlight"> - <h3>Email Marketing Automation</span></h3> + <h3>Email Marketing Automation</h3> <p>Send smarter, faster email campaigns with marketing automation from dotmailer, powered by your Magento store's live data.</p> </div> @@ -226,13 +226,13 @@ features include: </p> <ul> - <li><span>Configurable “Instant Purchase†button to place orders</span></li> + <li><span>Configurable “Instant Purchase†button to place orders.</span></li> <li><span>Support for all payment solutions using Braintree Vault, including Braintree Credit Card, Braintree PayPal, and PayPal Payflow Pro.</span></li> <li><span>Shipping to the customer’s default address using the lowest cost, available shipping - method</span></li> + method.</span></li> <li><span>Ability for developers to customize the Instant Purchase business logic to meet - merchant needs</span></li> + merchant needs.</span></li> </ul>]]> </item> </item>