Skip to content

Commit

Permalink
Merge branch 'master' into release/8.2
Browse files Browse the repository at this point in the history
* master:
  8.1.2 release
  Prepare for release
  Update yoast seo dependency
  Update the changelog

# Conflicts:
#	css/dist/admin-global-811-rtl.css
#	css/dist/admin-global-811-rtl.min.css
#	css/dist/admin-global-811.css
#	css/dist/admin-global-811.min.css
#	css/dist/admin-global-812-rtl.css
#	css/dist/admin-global-812-rtl.min.css
#	css/dist/admin-global-812.css
#	css/dist/admin-global-812.min.css
#	css/dist/admin-global-82-RC3-rtl.css
#	css/dist/admin-global-82-RC3-rtl.min.css
#	css/dist/admin-global-82-RC3.css
#	css/dist/admin-global-82-RC3.min.css
#	css/dist/adminbar-811-rtl.css
#	css/dist/adminbar-811-rtl.min.css
#	css/dist/adminbar-811.css
#	css/dist/adminbar-811.min.css
#	css/dist/adminbar-812-rtl.css
#	css/dist/adminbar-812-rtl.min.css
#	css/dist/adminbar-812.css
#	css/dist/adminbar-812.min.css
#	css/dist/adminbar-82-RC3-rtl.css
#	css/dist/adminbar-82-RC3-rtl.min.css
#	css/dist/adminbar-82-RC3.css
#	css/dist/adminbar-82-RC3.min.css
#	css/dist/alerts-811-rtl.css
#	css/dist/alerts-811-rtl.min.css
#	css/dist/alerts-811.css
#	css/dist/alerts-811.min.css
#	css/dist/alerts-812-rtl.css
#	css/dist/alerts-812-rtl.min.css
#	css/dist/alerts-812.css
#	css/dist/alerts-812.min.css
#	css/dist/alerts-82-RC3-rtl.css
#	css/dist/alerts-82-RC3-rtl.min.css
#	css/dist/alerts-82-RC3.css
#	css/dist/alerts-82-RC3.min.css
#	css/dist/dashboard-811-rtl.css
#	css/dist/dashboard-811-rtl.min.css
#	css/dist/dashboard-811.css
#	css/dist/dashboard-811.min.css
#	css/dist/dashboard-812-rtl.css
#	css/dist/dashboard-812-rtl.min.css
#	css/dist/dashboard-812.css
#	css/dist/dashboard-812.min.css
#	css/dist/dashboard-82-RC3-rtl.css
#	css/dist/dashboard-82-RC3-rtl.min.css
#	css/dist/dashboard-82-RC3.css
#	css/dist/dashboard-82-RC3.min.css
#	css/dist/edit-page-811-rtl.css
#	css/dist/edit-page-811-rtl.min.css
#	css/dist/edit-page-811.css
#	css/dist/edit-page-811.min.css
#	css/dist/edit-page-812-rtl.css
#	css/dist/edit-page-812-rtl.min.css
#	css/dist/edit-page-812.css
#	css/dist/edit-page-812.min.css
#	css/dist/edit-page-82-RC3-rtl.css
#	css/dist/edit-page-82-RC3-rtl.min.css
#	css/dist/edit-page-82-RC3.css
#	css/dist/edit-page-82-RC3.min.css
#	css/dist/featured-image-811-rtl.css
#	css/dist/featured-image-811-rtl.min.css
#	css/dist/featured-image-811.css
#	css/dist/featured-image-811.min.css
#	css/dist/featured-image-812-rtl.css
#	css/dist/featured-image-812-rtl.min.css
#	css/dist/featured-image-812.css
#	css/dist/featured-image-812.min.css
#	css/dist/featured-image-82-RC3-rtl.css
#	css/dist/featured-image-82-RC3-rtl.min.css
#	css/dist/featured-image-82-RC3.css
#	css/dist/featured-image-82-RC3.min.css
#	css/dist/filter-explanation-811-rtl.css
#	css/dist/filter-explanation-811-rtl.min.css
#	css/dist/filter-explanation-811.css
#	css/dist/filter-explanation-811.min.css
#	css/dist/filter-explanation-812-rtl.css
#	css/dist/filter-explanation-812-rtl.min.css
#	css/dist/filter-explanation-812.css
#	css/dist/filter-explanation-812.min.css
#	css/dist/filter-explanation-82-RC3-rtl.css
#	css/dist/filter-explanation-82-RC3-rtl.min.css
#	css/dist/filter-explanation-82-RC3.css
#	css/dist/filter-explanation-82-RC3.min.css
#	css/dist/inside-editor-811-rtl.css
#	css/dist/inside-editor-811-rtl.min.css
#	css/dist/inside-editor-811.css
#	css/dist/inside-editor-811.min.css
#	css/dist/inside-editor-812-rtl.css
#	css/dist/inside-editor-812-rtl.min.css
#	css/dist/inside-editor-812.css
#	css/dist/inside-editor-812.min.css
#	css/dist/inside-editor-82-RC3-rtl.css
#	css/dist/inside-editor-82-RC3-rtl.min.css
#	css/dist/inside-editor-82-RC3.css
#	css/dist/inside-editor-82-RC3.min.css
#	css/dist/metabox-811-rtl.css
#	css/dist/metabox-811-rtl.min.css
#	css/dist/metabox-811.css
#	css/dist/metabox-811.min.css
#	css/dist/metabox-812-rtl.css
#	css/dist/metabox-812-rtl.min.css
#	css/dist/metabox-812.css
#	css/dist/metabox-812.min.css
#	css/dist/metabox-82-RC3-rtl.css
#	css/dist/metabox-82-RC3-rtl.min.css
#	css/dist/metabox-82-RC3.css
#	css/dist/metabox-82-RC3.min.css
#	css/dist/metabox-primary-category-811-rtl.css
#	css/dist/metabox-primary-category-811-rtl.min.css
#	css/dist/metabox-primary-category-811.css
#	css/dist/metabox-primary-category-811.min.css
#	css/dist/metabox-primary-category-812-rtl.css
#	css/dist/metabox-primary-category-812-rtl.min.css
#	css/dist/metabox-primary-category-812.css
#	css/dist/metabox-primary-category-812.min.css
#	css/dist/metabox-primary-category-82-RC3-rtl.css
#	css/dist/metabox-primary-category-82-RC3-rtl.min.css
#	css/dist/metabox-primary-category-82-RC3.css
#	css/dist/metabox-primary-category-82-RC3.min.css
#	css/dist/search-appearance-811-rtl.css
#	css/dist/search-appearance-811-rtl.min.css
#	css/dist/search-appearance-811.css
#	css/dist/search-appearance-811.min.css
#	css/dist/search-appearance-812-rtl.css
#	css/dist/search-appearance-812-rtl.min.css
#	css/dist/search-appearance-812.css
#	css/dist/search-appearance-812.min.css
#	css/dist/search-appearance-82-RC3-rtl.css
#	css/dist/search-appearance-82-RC3-rtl.min.css
#	css/dist/search-appearance-82-RC3.css
#	css/dist/search-appearance-82-RC3.min.css
#	css/dist/structured-data-blocks-811-rtl.css
#	css/dist/structured-data-blocks-811.css
#	css/dist/structured-data-blocks-812-rtl.css
#	css/dist/structured-data-blocks-812-rtl.min.css
#	css/dist/structured-data-blocks-812.css
#	css/dist/structured-data-blocks-812.min.css
#	css/dist/structured-data-blocks-82-RC3-rtl.css
#	css/dist/structured-data-blocks-82-RC3.css
#	css/dist/toggle-switch-811-rtl.css
#	css/dist/toggle-switch-811-rtl.min.css
#	css/dist/toggle-switch-811.css
#	css/dist/toggle-switch-811.min.css
#	css/dist/toggle-switch-812-rtl.css
#	css/dist/toggle-switch-812-rtl.min.css
#	css/dist/toggle-switch-812.css
#	css/dist/toggle-switch-812.min.css
#	css/dist/toggle-switch-82-RC3-rtl.css
#	css/dist/toggle-switch-82-RC3-rtl.min.css
#	css/dist/toggle-switch-82-RC3.css
#	css/dist/toggle-switch-82-RC3.min.css
#	css/dist/wpseo-dismissible-811-rtl.css
#	css/dist/wpseo-dismissible-811-rtl.min.css
#	css/dist/wpseo-dismissible-811.css
#	css/dist/wpseo-dismissible-811.min.css
#	css/dist/wpseo-dismissible-812-rtl.css
#	css/dist/wpseo-dismissible-812-rtl.min.css
#	css/dist/wpseo-dismissible-812.css
#	css/dist/wpseo-dismissible-812.min.css
#	css/dist/wpseo-dismissible-82-RC3-rtl.css
#	css/dist/wpseo-dismissible-82-RC3-rtl.min.css
#	css/dist/wpseo-dismissible-82-RC3.css
#	css/dist/wpseo-dismissible-82-RC3.min.css
#	css/dist/yoast-components-811-rtl.css
#	css/dist/yoast-components-811-rtl.min.css
#	css/dist/yoast-components-811.css
#	css/dist/yoast-components-811.min.css
#	css/dist/yoast-components-812-rtl.css
#	css/dist/yoast-components-812-rtl.min.css
#	css/dist/yoast-components-812.css
#	css/dist/yoast-components-812.min.css
#	css/dist/yoast-components-82-RC3-rtl.css
#	css/dist/yoast-components-82-RC3-rtl.min.css
#	css/dist/yoast-components-82-RC3.css
#	css/dist/yoast-components-82-RC3.min.css
#	css/dist/yoast-extensions-811-rtl.css
#	css/dist/yoast-extensions-811-rtl.min.css
#	css/dist/yoast-extensions-811.css
#	css/dist/yoast-extensions-811.min.css
#	css/dist/yoast-extensions-812-rtl.css
#	css/dist/yoast-extensions-812-rtl.min.css
#	css/dist/yoast-extensions-812.css
#	css/dist/yoast-extensions-812.min.css
#	css/dist/yoast-extensions-82-RC3-rtl.css
#	css/dist/yoast-extensions-82-RC3-rtl.min.css
#	css/dist/yoast-extensions-82-RC3.css
#	css/dist/yoast-extensions-82-RC3.min.css
#	css/dist/yst_plugin_tools-811-rtl.css
#	css/dist/yst_plugin_tools-811-rtl.min.css
#	css/dist/yst_plugin_tools-811.css
#	css/dist/yst_plugin_tools-811.min.css
#	css/dist/yst_plugin_tools-812-rtl.css
#	css/dist/yst_plugin_tools-812-rtl.min.css
#	css/dist/yst_plugin_tools-812.css
#	css/dist/yst_plugin_tools-812.min.css
#	css/dist/yst_plugin_tools-82-RC3-rtl.css
#	css/dist/yst_plugin_tools-82-RC3-rtl.min.css
#	css/dist/yst_plugin_tools-82-RC3.css
#	css/dist/yst_plugin_tools-82-RC3.min.css
#	css/dist/yst_seo_score-811-rtl.css
#	css/dist/yst_seo_score-811-rtl.min.css
#	css/dist/yst_seo_score-811.css
#	css/dist/yst_seo_score-811.min.css
#	css/dist/yst_seo_score-812-rtl.css
#	css/dist/yst_seo_score-812-rtl.min.css
#	css/dist/yst_seo_score-812.css
#	css/dist/yst_seo_score-812.min.css
#	css/dist/yst_seo_score-82-RC3-rtl.css
#	css/dist/yst_seo_score-82-RC3-rtl.min.css
#	css/dist/yst_seo_score-82-RC3.css
#	css/dist/yst_seo_score-82-RC3.min.css
#	js/dist/analysis-811.js
#	js/dist/analysis-812.js
#	js/dist/analysis-82-RC3.js
#	js/dist/commons-811.js
#	js/dist/commons-812.js
#	js/dist/commons-82-RC3.js
#	js/dist/commons-82-RC3.min.js
#	js/dist/components-811.js
#	js/dist/components-812.js
#	js/dist/components-82-RC3.js
#	js/dist/configuration-wizard-811.js
#	js/dist/configuration-wizard-812.js
#	js/dist/configuration-wizard-82-RC3.js
#	js/dist/search-appearance-811.js
#	js/dist/search-appearance-812.js
#	js/dist/search-appearance-82-RC3.js
#	js/dist/wp-seo-admin-811.js
#	js/dist/wp-seo-admin-811.min.js
#	js/dist/wp-seo-admin-812.js
#	js/dist/wp-seo-admin-812.min.js
#	js/dist/wp-seo-admin-82-RC3.js
#	js/dist/wp-seo-admin-82-RC3.min.js
#	js/dist/wp-seo-admin-global-811.js
#	js/dist/wp-seo-admin-global-811.min.js
#	js/dist/wp-seo-admin-global-812.js
#	js/dist/wp-seo-admin-global-812.min.js
#	js/dist/wp-seo-admin-global-82-RC3.js
#	js/dist/wp-seo-admin-global-82-RC3.min.js
#	js/dist/wp-seo-admin-gsc-811.js
#	js/dist/wp-seo-admin-gsc-811.min.js
#	js/dist/wp-seo-admin-gsc-812.js
#	js/dist/wp-seo-admin-gsc-812.min.js
#	js/dist/wp-seo-admin-gsc-82-RC3.js
#	js/dist/wp-seo-admin-gsc-82-RC3.min.js
#	js/dist/wp-seo-admin-media-811.js
#	js/dist/wp-seo-admin-media-811.min.js
#	js/dist/wp-seo-admin-media-812.js
#	js/dist/wp-seo-admin-media-812.min.js
#	js/dist/wp-seo-admin-media-82-RC3.js
#	js/dist/wp-seo-admin-media-82-RC3.min.js
#	js/dist/wp-seo-analysis-worker-811.js
#	js/dist/wp-seo-analysis-worker-812.js
#	js/dist/wp-seo-analysis-worker-82-RC3.js
#	js/dist/wp-seo-api-811.js
#	js/dist/wp-seo-api-811.min.js
#	js/dist/wp-seo-api-812.js
#	js/dist/wp-seo-api-812.min.js
#	js/dist/wp-seo-api-82-RC3.js
#	js/dist/wp-seo-api-82-RC3.min.js
#	js/dist/wp-seo-bulk-editor-811.js
#	js/dist/wp-seo-bulk-editor-811.min.js
#	js/dist/wp-seo-bulk-editor-812.js
#	js/dist/wp-seo-bulk-editor-812.min.js
#	js/dist/wp-seo-bulk-editor-82-RC3.js
#	js/dist/wp-seo-bulk-editor-82-RC3.min.js
#	js/dist/wp-seo-dashboard-widget-811.js
#	js/dist/wp-seo-dashboard-widget-812.js
#	js/dist/wp-seo-dashboard-widget-82-RC3.js
#	js/dist/wp-seo-edit-page-811.js
#	js/dist/wp-seo-edit-page-811.min.js
#	js/dist/wp-seo-edit-page-812.js
#	js/dist/wp-seo-edit-page-812.min.js
#	js/dist/wp-seo-edit-page-82-RC3.js
#	js/dist/wp-seo-edit-page-82-RC3.min.js
#	js/dist/wp-seo-featured-image-811.js
#	js/dist/wp-seo-featured-image-811.min.js
#	js/dist/wp-seo-featured-image-812.js
#	js/dist/wp-seo-featured-image-812.min.js
#	js/dist/wp-seo-featured-image-82-RC3.js
#	js/dist/wp-seo-featured-image-82-RC3.min.js
#	js/dist/wp-seo-filter-explanation-811.js
#	js/dist/wp-seo-filter-explanation-811.min.js
#	js/dist/wp-seo-filter-explanation-812.js
#	js/dist/wp-seo-filter-explanation-812.min.js
#	js/dist/wp-seo-filter-explanation-82-RC3.js
#	js/dist/wp-seo-filter-explanation-82-RC3.min.js
#	js/dist/wp-seo-help-center-811.js
#	js/dist/wp-seo-help-center-812.js
#	js/dist/wp-seo-help-center-82-RC3.js
#	js/dist/wp-seo-metabox-811.js
#	js/dist/wp-seo-metabox-811.min.js
#	js/dist/wp-seo-metabox-812.js
#	js/dist/wp-seo-metabox-812.min.js
#	js/dist/wp-seo-metabox-82-RC3.js
#	js/dist/wp-seo-metabox-82-RC3.min.js
#	js/dist/wp-seo-metabox-category-811.js
#	js/dist/wp-seo-metabox-category-811.min.js
#	js/dist/wp-seo-metabox-category-812.js
#	js/dist/wp-seo-metabox-category-812.min.js
#	js/dist/wp-seo-metabox-category-82-RC3.js
#	js/dist/wp-seo-metabox-category-82-RC3.min.js
#	js/dist/wp-seo-modal-811.js
#	js/dist/wp-seo-modal-812.js
#	js/dist/wp-seo-modal-812.min.js
#	js/dist/wp-seo-modal-82-RC3.js
#	js/dist/wp-seo-network-admin-811.js
#	js/dist/wp-seo-network-admin-811.min.js
#	js/dist/wp-seo-network-admin-812.js
#	js/dist/wp-seo-network-admin-812.min.js
#	js/dist/wp-seo-network-admin-82-RC3.js
#	js/dist/wp-seo-network-admin-82-RC3.min.js
#	js/dist/wp-seo-post-scraper-811.js
#	js/dist/wp-seo-post-scraper-812.js
#	js/dist/wp-seo-post-scraper-82-RC3.js
#	js/dist/wp-seo-quick-edit-handler-811.js
#	js/dist/wp-seo-quick-edit-handler-811.min.js
#	js/dist/wp-seo-quick-edit-handler-812.js
#	js/dist/wp-seo-quick-edit-handler-812.min.js
#	js/dist/wp-seo-quick-edit-handler-82-RC3.js
#	js/dist/wp-seo-quick-edit-handler-82-RC3.min.js
#	js/dist/wp-seo-recalculate-811.js
#	js/dist/wp-seo-recalculate-811.min.js
#	js/dist/wp-seo-recalculate-812.js
#	js/dist/wp-seo-recalculate-812.min.js
#	js/dist/wp-seo-recalculate-82-RC3.js
#	js/dist/wp-seo-recalculate-82-RC3.min.js
#	js/dist/wp-seo-reindex-links-811.js
#	js/dist/wp-seo-reindex-links-811.min.js
#	js/dist/wp-seo-reindex-links-812.js
#	js/dist/wp-seo-reindex-links-812.min.js
#	js/dist/wp-seo-reindex-links-82-RC3.js
#	js/dist/wp-seo-reindex-links-82-RC3.min.js
#	js/dist/wp-seo-replacevar-plugin-811.js
#	js/dist/wp-seo-replacevar-plugin-812.js
#	js/dist/wp-seo-replacevar-plugin-82-RC3.js
#	js/dist/wp-seo-shortcode-plugin-811.js
#	js/dist/wp-seo-shortcode-plugin-811.min.js
#	js/dist/wp-seo-shortcode-plugin-812.js
#	js/dist/wp-seo-shortcode-plugin-812.min.js
#	js/dist/wp-seo-shortcode-plugin-82-RC3.js
#	js/dist/wp-seo-shortcode-plugin-82-RC3.min.js
#	js/dist/wp-seo-structured-data-blocks-812.js
#	js/dist/wp-seo-term-scraper-811.js
#	js/dist/wp-seo-term-scraper-812.js
#	js/dist/wp-seo-term-scraper-82-RC3.js
#	js/dist/wp-seo-used-keywords-assessment-811.js
#	js/dist/wp-seo-used-keywords-assessment-811.min.js
#	js/dist/wp-seo-used-keywords-assessment-812.js
#	js/dist/wp-seo-used-keywords-assessment-812.min.js
#	js/dist/wp-seo-used-keywords-assessment-82-RC3.js
#	js/dist/wp-seo-used-keywords-assessment-82-RC3.min.js
#	js/dist/wp-seo-wp-globals-backport-811.js
#	js/dist/wp-seo-wp-globals-backport-811.min.js
#	js/dist/wp-seo-wp-globals-backport-812.js
#	js/dist/wp-seo-wp-globals-backport-812.min.js
#	js/dist/wp-seo-wp-globals-backport-82-RC3.js
#	js/dist/wp-seo-wp-globals-backport-82-RC3.min.js
#	package.json
#	readme.txt
#	wp-seo-main.php
#	wp-seo.php
#	yarn.lock
  • Loading branch information
Andy Meerwaldt committed Sep 5, 2018
2 parents 8bb5954 + 8ed6a66 commit 310061e
Show file tree
Hide file tree
Showing 138 changed files with 73,300 additions and 54,440 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
.schema-how-to-duration .schema-how-to-duration-input[type="number"] {
width: 40px;
margin: 0 2px;
padding: 6px 4px;
text-align: center;
text-align: left;

-moz-appearance: textfield;
}
Expand Down Expand Up @@ -42,12 +41,6 @@ input + button.schema-how-to-duration-button.components-icon-button {
margin: 8px 0;
}

legend.schema-how-to-duration-legend {
float: right;
margin-top: 8px;
margin-left: 4px;
}

.schema-how-to-step {
position: relative;
margin: 4px 0;
Expand All @@ -73,12 +66,6 @@ legend.schema-how-to-duration-legend {
text-align: left;
}

.schema-how-to-step-name,
.schema-faq-title,
.schema-faq-question-question {
font-weight: 600;
}

.schema-how-to-step-button-container {
text-align: left;
}
Expand All @@ -92,10 +79,6 @@ legend.schema-how-to-duration-legend {
box-shadow: none;
}

#schema-how-to-duration-days {
margin-left: 8px;
}

.schema-faq-question {
position: relative;
margin: 4px 0;
Expand Down
1 change: 1 addition & 0 deletions css/dist/structured-data-blocks-812-rtl.min.css

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

Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
.schema-how-to-duration .schema-how-to-duration-input[type="number"] {
width: 40px;
margin: 0 2px;
padding: 6px 4px;
text-align: center;
text-align: right;

-moz-appearance: textfield;
}
Expand Down Expand Up @@ -42,12 +41,6 @@ input + button.schema-how-to-duration-button.components-icon-button {
margin: 8px 0;
}

legend.schema-how-to-duration-legend {
float: left;
margin-top: 8px;
margin-right: 4px;
}

.schema-how-to-step {
position: relative;
margin: 4px 0;
Expand All @@ -73,12 +66,6 @@ legend.schema-how-to-duration-legend {
text-align: right;
}

.schema-how-to-step-name,
.schema-faq-title,
.schema-faq-question-question {
font-weight: 600;
}

.schema-how-to-step-button-container {
text-align: right;
}
Expand All @@ -92,10 +79,6 @@ legend.schema-how-to-duration-legend {
box-shadow: none;
}

#schema-how-to-duration-days {
margin-right: 8px;
}

.schema-faq-question {
position: relative;
margin: 4px 0;
Expand Down
1 change: 1 addition & 0 deletions css/dist/structured-data-blocks-812.min.css

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

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 310061e

Please sign in to comment.