From 2174c1a180ae1632caa8d860d959a47441d7b09e Mon Sep 17 00:00:00 2001 From: Ravi Chandra Date: Fri, 18 Jan 2019 16:40:23 +0530 Subject: [PATCH 01/24] Fix featured image delete push issue --- includes/classes/API/SubscriptionsController.php | 3 +++ includes/rest-api.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/includes/classes/API/SubscriptionsController.php b/includes/classes/API/SubscriptionsController.php index 10234df00..d3341db05 100644 --- a/includes/classes/API/SubscriptionsController.php +++ b/includes/classes/API/SubscriptionsController.php @@ -280,6 +280,9 @@ public function receive_item( $request ) { if ( ! empty( $request['post_data']['distributor_media'] ) ) { \Distributor\Utils\set_media( $request['post_id'], $request['post_data']['distributor_media'] ); + } else { + // remove any previously set featured image + delete_post_meta( $post->ID, '_thumbnail_id' ); } $response = new \WP_REST_Response(); diff --git a/includes/rest-api.php b/includes/rest-api.php index cb36cee3b..3e5531f50 100644 --- a/includes/rest-api.php +++ b/includes/rest-api.php @@ -113,6 +113,9 @@ function process_distributor_attributes( $post, $request, $update ) { if ( isset( $request['distributor_media'] ) ) { \Distributor\Utils\set_media( $post->ID, $request['distributor_media'] ); + } else { + // remove any previously set featured image + delete_post_meta( $post->ID, '_thumbnail_id' ); } /** From 5fc8da90a782a1def6eb6baa0316a834fc2cd109 Mon Sep 17 00:00:00 2001 From: Ravi Chandra Date: Fri, 18 Jan 2019 16:47:57 +0530 Subject: [PATCH 02/24] Use correct post_id property --- includes/classes/API/SubscriptionsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/classes/API/SubscriptionsController.php b/includes/classes/API/SubscriptionsController.php index d3341db05..8f44e5c28 100644 --- a/includes/classes/API/SubscriptionsController.php +++ b/includes/classes/API/SubscriptionsController.php @@ -282,7 +282,7 @@ public function receive_item( $request ) { \Distributor\Utils\set_media( $request['post_id'], $request['post_data']['distributor_media'] ); } else { // remove any previously set featured image - delete_post_meta( $post->ID, '_thumbnail_id' ); + delete_post_meta( (int) $request['post_id'], '_thumbnail_id' ); } $response = new \WP_REST_Response(); From 5afef48391203b8c952a09dd146f46151ee091a7 Mon Sep 17 00:00:00 2001 From: Anton Vanyukov Date: Tue, 4 Apr 2023 11:01:30 +1000 Subject: [PATCH 03/24] Allow user clicks on confirm dialog buttons --- assets/css/gutenberg-syndicated-post.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/assets/css/gutenberg-syndicated-post.scss b/assets/css/gutenberg-syndicated-post.scss index f6da7a8f2..a3787de97 100644 --- a/assets/css/gutenberg-syndicated-post.scss +++ b/assets/css/gutenberg-syndicated-post.scss @@ -17,6 +17,13 @@ body.dt-linked-post { cursor: default; } + /* Allow clicks on confirmation dialog buttons */ + .components-confirm-dialog button { + opacity: 1; + pointer-events: auto; + cursor: pointer; + } + .edit-post-header__settings, .components-time-picker, .react-datepicker, From 8ee42ea317c763f0b5cbe7e055b7197e88a174f6 Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Thu, 31 Aug 2023 08:53:24 -0500 Subject: [PATCH 04/24] Update includes/classes/API/SubscriptionsController.php Co-authored-by: Peter Wilson <519727+peterwilsoncc@users.noreply.github.com> --- includes/classes/API/SubscriptionsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/classes/API/SubscriptionsController.php b/includes/classes/API/SubscriptionsController.php index f87eb2bb6..01813cf6d 100644 --- a/includes/classes/API/SubscriptionsController.php +++ b/includes/classes/API/SubscriptionsController.php @@ -288,7 +288,7 @@ public function receive_item( $request ) { if ( ! empty( $request['post_data']['distributor_media'] ) ) { \Distributor\Utils\set_media( $request['post_id'], $request['post_data']['distributor_media'] ); } else { - // remove any previously set featured image + // Remove any previously set featured image. delete_post_meta( (int) $request['post_id'], '_thumbnail_id' ); } From 37e7a8852736053649839cdf767d5720488a9fb8 Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Thu, 31 Aug 2023 08:53:34 -0500 Subject: [PATCH 05/24] Update includes/rest-api.php Co-authored-by: Peter Wilson <519727+peterwilsoncc@users.noreply.github.com> --- includes/rest-api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/rest-api.php b/includes/rest-api.php index 7298d2747..67abdc838 100644 --- a/includes/rest-api.php +++ b/includes/rest-api.php @@ -118,7 +118,7 @@ function process_distributor_attributes( $post, $request, $update ) { if ( isset( $request['distributor_media'] ) ) { \Distributor\Utils\set_media( $post->ID, $request['distributor_media'] ); } else { - // remove any previously set featured image + // Remove any previously set featured image. delete_post_meta( $post->ID, '_thumbnail_id' ); } From 4f090c10e13b9532af11a878e6b938d8e6ec924c Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Tue, 5 Sep 2023 13:22:09 -0600 Subject: [PATCH 06/24] Upgrade Cypress to v13, upgrade to the latest version of our cypress-wp-utils package and upgrade wp-env --- package-lock.json | 265 +++++++++++++++++++++++++--------------------- package.json | 7 +- 2 files changed, 147 insertions(+), 125 deletions(-) diff --git a/package-lock.json b/package-lock.json index fb17111ca..fe3946b1f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,11 +12,11 @@ "mustache": "^4.2.0" }, "devDependencies": { - "@10up/cypress-wp-utils": "github:10up/cypress-wp-utils#build", - "@wordpress/env": "^5.0.0", + "@10up/cypress-wp-utils": "^0.2.0", + "@wordpress/env": "^5.16.0", "@wordpress/scripts": "^26.6.0", "compare-versions": "^4.1.3", - "cypress": "^10.8.0", + "cypress": "^13.1.0", "cypress-mochawesome-reporter": "^3.5.1", "eslint-plugin-cypress": "^2.12.1", "jsdoc": "^3.6.11", @@ -28,10 +28,10 @@ } }, "node_modules/@10up/cypress-wp-utils": { - "version": "0.1.0", - "resolved": "git+ssh://git@github.com/10up/cypress-wp-utils.git#52d9387f9e70530abfec1d2b4549a8a9225b0817", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@10up/cypress-wp-utils/-/cypress-wp-utils-0.2.0.tgz", + "integrity": "sha512-5gzamtHIFojT+wx0OzSAEeVY6FVrlcVPHVFH23uExkaqQhNsJvrnpdtqtT98wAYkXg56c1qDN7Ju7ZRTaNzP5g==", "dev": true, - "license": "MIT", "engines": { "node": ">=12.0" } @@ -2031,9 +2031,9 @@ } }, "node_modules/@cypress/request": { - "version": "2.88.10", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz", - "integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz", + "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -2049,9 +2049,9 @@ "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "~6.5.2", + "qs": "~6.10.3", "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", + "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", "uuid": "^8.3.2" }, @@ -4256,9 +4256,9 @@ } }, "node_modules/@wordpress/env": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-5.2.0.tgz", - "integrity": "sha512-FxsHCtP2+oKnWbv/GgN3hdjkKTdxS+edA0s807/Zbu30NKSJv3e4aemoxbb0GmqgGEBzbRMcgZ7IdVnWREGNeQ==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-5.16.0.tgz", + "integrity": "sha512-zx6UO8PuJBrQ34cfeedK1HlGHLFaj7oWzTo9tTt+noB79Ttqc4+a0lYwDqBLLJhlHU+cWgcyOP2lB6TboXH0xA==", "dev": true, "dependencies": { "chalk": "^4.0.0", @@ -5062,9 +5062,9 @@ } }, "node_modules/aws4": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", + "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==", "dev": true }, "node_modules/axe-core": { @@ -6785,15 +6785,15 @@ } }, "node_modules/cypress": { - "version": "10.8.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.8.0.tgz", - "integrity": "sha512-QVse0dnLm018hgti2enKMVZR9qbIO488YGX06nH5j3Dg1isL38DwrBtyrax02CANU6y8F4EJUuyW6HJKw1jsFA==", + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz", + "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==", "dev": true, "hasInstallScript": true, "dependencies": { - "@cypress/request": "^2.88.10", + "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", - "@types/node": "^14.14.31", + "@types/node": "^16.18.39", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", "arch": "^2.2.0", @@ -6805,10 +6805,10 @@ "check-more-types": "^2.24.0", "cli-cursor": "^3.1.0", "cli-table3": "~0.6.1", - "commander": "^5.1.0", + "commander": "^6.2.1", "common-tags": "^1.8.0", "dayjs": "^1.10.4", - "debug": "^4.3.2", + "debug": "^4.3.4", "enquirer": "^2.3.6", "eventemitter2": "6.4.7", "execa": "4.1.0", @@ -6823,12 +6823,13 @@ "listr2": "^3.8.3", "lodash": "^4.17.21", "log-symbols": "^4.0.0", - "minimist": "^1.2.6", + "minimist": "^1.2.8", "ospath": "^1.2.2", "pretty-bytes": "^5.6.0", + "process": "^0.11.10", "proxy-from-env": "1.0.0", "request-progress": "^3.0.0", - "semver": "^7.3.2", + "semver": "^7.5.3", "supports-color": "^8.1.1", "tmp": "~0.2.1", "untildify": "^4.0.0", @@ -6838,7 +6839,7 @@ "cypress": "bin/cypress" }, "engines": { - "node": ">=12.0.0" + "node": "^16.0.0 || ^18.0.0 || >=20.0.0" } }, "node_modules/cypress-mochawesome-reporter": { @@ -6877,11 +6878,20 @@ } }, "node_modules/cypress/node_modules/@types/node": { - "version": "14.18.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.29.tgz", - "integrity": "sha512-LhF+9fbIX4iPzhsRLpK5H7iPdvW8L4IwGciXQIOEcuF62+9nw/VQVsOViAOOGxY3OlOKGLFv0sWwJXdwQeTn6A==", + "version": "16.18.48", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.48.tgz", + "integrity": "sha512-mlaecDKQ7rIZrYD7iiKNdzFb6e/qD5I9U1rAhq+Fd+DWvYVs+G2kv74UFHmSOlg5+i/vF3XxuR522V4u8BqO+Q==", "dev": true }, + "node_modules/cypress/node_modules/commander": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, "node_modules/cypress/node_modules/extract-zip": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", @@ -6915,9 +6925,9 @@ } }, "node_modules/cypress/node_modules/semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -11703,30 +11713,6 @@ "node": ">= 6" } }, - "node_modules/jsdom/node_modules/tough-cookie": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", - "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", - "dev": true, - "dependencies": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jsdom/node_modules/universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -14970,6 +14956,15 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "dev": true, + "engines": { + "node": ">= 0.6.0" + } + }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -15161,12 +15156,18 @@ ] }, "node_modules/qs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", - "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", + "version": "6.10.4", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz", + "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==", "dev": true, + "dependencies": { + "side-channel": "^1.0.4" + }, "engines": { "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/querystringify": { @@ -17408,16 +17409,27 @@ } }, "node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dev": true, "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" }, "engines": { - "node": ">=0.8" + "node": ">=6" + } + }, + "node_modules/tough-cookie/node_modules/universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" } }, "node_modules/tr46": { @@ -18838,9 +18850,10 @@ }, "dependencies": { "@10up/cypress-wp-utils": { - "version": "git+ssh://git@github.com/10up/cypress-wp-utils.git#52d9387f9e70530abfec1d2b4549a8a9225b0817", - "dev": true, - "from": "@10up/cypress-wp-utils@github:10up/cypress-wp-utils#build" + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@10up/cypress-wp-utils/-/cypress-wp-utils-0.2.0.tgz", + "integrity": "sha512-5gzamtHIFojT+wx0OzSAEeVY6FVrlcVPHVFH23uExkaqQhNsJvrnpdtqtT98wAYkXg56c1qDN7Ju7ZRTaNzP5g==", + "dev": true }, "@ampproject/remapping": { "version": "2.2.1", @@ -20220,9 +20233,9 @@ "requires": {} }, "@cypress/request": { - "version": "2.88.10", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz", - "integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz", + "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==", "dev": true, "requires": { "aws-sign2": "~0.7.0", @@ -20238,9 +20251,9 @@ "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "~6.5.2", + "qs": "~6.10.3", "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", + "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", "uuid": "^8.3.2" } @@ -21978,9 +21991,9 @@ } }, "@wordpress/env": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-5.2.0.tgz", - "integrity": "sha512-FxsHCtP2+oKnWbv/GgN3hdjkKTdxS+edA0s807/Zbu30NKSJv3e4aemoxbb0GmqgGEBzbRMcgZ7IdVnWREGNeQ==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-5.16.0.tgz", + "integrity": "sha512-zx6UO8PuJBrQ34cfeedK1HlGHLFaj7oWzTo9tTt+noB79Ttqc4+a0lYwDqBLLJhlHU+cWgcyOP2lB6TboXH0xA==", "dev": true, "requires": { "chalk": "^4.0.0", @@ -22547,9 +22560,9 @@ "dev": true }, "aws4": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", + "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==", "dev": true }, "axe-core": { @@ -23849,14 +23862,14 @@ } }, "cypress": { - "version": "10.8.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.8.0.tgz", - "integrity": "sha512-QVse0dnLm018hgti2enKMVZR9qbIO488YGX06nH5j3Dg1isL38DwrBtyrax02CANU6y8F4EJUuyW6HJKw1jsFA==", + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz", + "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==", "dev": true, "requires": { - "@cypress/request": "^2.88.10", + "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", - "@types/node": "^14.14.31", + "@types/node": "^16.18.39", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", "arch": "^2.2.0", @@ -23868,10 +23881,10 @@ "check-more-types": "^2.24.0", "cli-cursor": "^3.1.0", "cli-table3": "~0.6.1", - "commander": "^5.1.0", + "commander": "^6.2.1", "common-tags": "^1.8.0", "dayjs": "^1.10.4", - "debug": "^4.3.2", + "debug": "^4.3.4", "enquirer": "^2.3.6", "eventemitter2": "6.4.7", "execa": "4.1.0", @@ -23886,12 +23899,13 @@ "listr2": "^3.8.3", "lodash": "^4.17.21", "log-symbols": "^4.0.0", - "minimist": "^1.2.6", + "minimist": "^1.2.8", "ospath": "^1.2.2", "pretty-bytes": "^5.6.0", + "process": "^0.11.10", "proxy-from-env": "1.0.0", "request-progress": "^3.0.0", - "semver": "^7.3.2", + "semver": "^7.5.3", "supports-color": "^8.1.1", "tmp": "~0.2.1", "untildify": "^4.0.0", @@ -23899,9 +23913,15 @@ }, "dependencies": { "@types/node": { - "version": "14.18.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.29.tgz", - "integrity": "sha512-LhF+9fbIX4iPzhsRLpK5H7iPdvW8L4IwGciXQIOEcuF62+9nw/VQVsOViAOOGxY3OlOKGLFv0sWwJXdwQeTn6A==", + "version": "16.18.48", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.48.tgz", + "integrity": "sha512-mlaecDKQ7rIZrYD7iiKNdzFb6e/qD5I9U1rAhq+Fd+DWvYVs+G2kv74UFHmSOlg5+i/vF3XxuR522V4u8BqO+Q==", + "dev": true + }, + "commander": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", "dev": true }, "extract-zip": { @@ -23926,9 +23946,9 @@ } }, "semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -27529,24 +27549,6 @@ "combined-stream": "^1.0.8", "mime-types": "^2.1.12" } - }, - "tough-cookie": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", - "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", - "dev": true, - "requires": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" - } - }, - "universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", - "dev": true } } }, @@ -29952,6 +29954,12 @@ } } }, + "process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "dev": true + }, "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -30099,10 +30107,13 @@ "dev": true }, "qs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", - "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", - "dev": true + "version": "6.10.4", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz", + "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==", + "dev": true, + "requires": { + "side-channel": "^1.0.4" + } }, "querystringify": { "version": "2.2.0", @@ -31849,13 +31860,23 @@ "dev": true }, "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dev": true, "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "dependencies": { + "universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "dev": true + } } }, "tr46": { diff --git a/package.json b/package.json index 293d85be0..4c5d8b584 100644 --- a/package.json +++ b/package.json @@ -25,11 +25,11 @@ "mustache": "^4.2.0" }, "devDependencies": { - "@10up/cypress-wp-utils": "github:10up/cypress-wp-utils#build", - "@wordpress/env": "^5.0.0", + "@10up/cypress-wp-utils": "^0.2.0", + "@wordpress/env": "^5.16.0", "@wordpress/scripts": "^26.6.0", "compare-versions": "^4.1.3", - "cypress": "^10.8.0", + "cypress": "^13.1.0", "cypress-mochawesome-reporter": "^3.5.1", "eslint-plugin-cypress": "^2.12.1", "jsdoc": "^3.6.11", @@ -58,6 +58,7 @@ "env": "wp-env", "env:start": "wp-env start", "env:stop": "wp-env stop", + "env:destroy": "wp-env destroy", "to-multisite": "wp-env run tests-cli \"wp core multisite-convert --title='Distributor Multisite'\"", "copy-htaccess": "wp-env run tests-cli \"cp wp-content/plugins/distributor/tests/cypress/.htaccess .htaccess\"", "postenv:start": "./tests/bin/initialize.sh" From cc9757ac19642fd90386d843e459ea454e7d72cb Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Tue, 5 Sep 2023 13:22:42 -0600 Subject: [PATCH 07/24] Fix a few issues around WP 6.3 and Cypress 13 --- tests/cypress/config.js | 1 + tests/cypress/e2e/distributed-post.test.js | 5 +---- tests/cypress/support/commands.js | 7 +++++-- tests/cypress/support/e2e.js | 5 ++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/cypress/config.js b/tests/cypress/config.js index 54b11bad6..103de3a39 100644 --- a/tests/cypress/config.js +++ b/tests/cypress/config.js @@ -2,6 +2,7 @@ const { defineConfig } = require( 'cypress' ); const { readConfig } = require( '@wordpress/env/lib/config' ); module.exports = defineConfig( { + chromeWebSecurity: false, fixturesFolder: 'tests/cypress/fixtures', screenshotsFolder: 'tests/cypress/screenshots', videosFolder: 'tests/cypress/videos', diff --git a/tests/cypress/e2e/distributed-post.test.js b/tests/cypress/e2e/distributed-post.test.js index bf8720715..c985abffe 100644 --- a/tests/cypress/e2e/distributed-post.test.js +++ b/tests/cypress/e2e/distributed-post.test.js @@ -23,10 +23,7 @@ describe( 'Distributed Post Tests', () => { // Return the the post edit screen. cy.visit( '/wp-admin/post.php?post=' + post.id + '&action=edit' ); // Ensure the settings panel is open. - cy.get( 'button[aria-label="Settings"]' ).then( ( $settings ) => { - if ( $settings.attr( 'aria-expanded' ) === 'false' ) { - $settings.trigger( 'click' ); - } + cy.get( 'button[aria-label="Settings"]' ).then( () => { cy.openDocumentSettingsSidebar( 'Post' ); cy.openDocumentSettingsPanel( 'Distributor' ); cy.get( '#distributed-to' ).should( diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js index 67dc2222c..75633839f 100644 --- a/tests/cypress/support/commands.js +++ b/tests/cypress/support/commands.js @@ -276,10 +276,13 @@ Cypress.Commands.add( 'createTweetOEmbedPost', ( tweetUrl ) => { title: postTitle, beforeSave: () => { cy.insertBlock( 'core/embed/twitter', 'Twitter' ).then( ( id ) => { - cy.get( `#${ id } input[aria-label="Twitter URL"]` ) + cy.getBlockEditor() + .find( `#${ id } input[aria-label="Twitter URL"]` ) .click() .type( tweetUrl ); - cy.get( `#${ id } button[type="submit"]` ).click(); + cy.getBlockEditor() + .find( `#${ id } button[type="submit"]` ) + .click(); } ); }, } ).then( ( post ) => { diff --git a/tests/cypress/support/e2e.js b/tests/cypress/support/e2e.js index cc31be575..5652037e7 100644 --- a/tests/cypress/support/e2e.js +++ b/tests/cypress/support/e2e.js @@ -18,9 +18,8 @@ import '@10up/cypress-wp-utils'; // Import commands.js using ES2015 syntax: import './commands'; -// Preserve WP cookies. beforeEach( () => { - Cypress.Cookies.defaults( { - preserve: /^wordpress.*?/, + cy.session( 'login', cy.login, { + cacheAcrossSpecs: true, } ); } ); From b710f96070bfd209ef1447833913a58080131af2 Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Tue, 5 Sep 2023 13:22:54 -0600 Subject: [PATCH 08/24] Remove unecessary line --- .github/workflows/cypress.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index c7bfe3668..2d5e1dff9 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -101,7 +101,7 @@ jobs: run: npm run copy-htaccess - name: Test - run: npm run cypress:run --config-file tests/cypress/config.js + run: npm run cypress:run - name: Update summary if: always() From 67d2d0c564d5acd480d80fd47fe61690fec7a9e8 Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Wed, 6 Sep 2023 09:54:03 -0500 Subject: [PATCH 09/24] add release date, missing prop --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e95fe682c..9fd494815 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file, per [the Ke ## [Unreleased] - TBD -## [2.0.0] - TBD +## [2.0.0] - 2023-09-05 **Note that Distributor now requires PHP 7.4 or later and WordPress 5.7 or later.** Please see the [migration guide](https://10up.github.io/distributor/tutorial-migration-guide-version-1-to-version-2.html) for important changes between version 1 and version 2 that may require your action. @@ -30,7 +30,7 @@ Please see the [migration guide](https://10up.github.io/distributor/tutorial-mig - Toggles the Distributor admin bar element in Gutenberg based on the post status (props [@ggutenberg](https://github.com/ggutenberg), [@jeffpaul](https://github.com/jeffpaul), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1022](https://github.com/10up/distributor/pull/1022), [#1114](https://github.com/10up/distributor/pull/1114)). - Reduced duplicate code pushing posts to connections (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@cadic](https://github.com/cadic), [@jeffpaul](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi), [@aaronware](https://github.com/aaronware) via [#999](https://github.com/10up/distributor/pull/999)). - Unified translator comments (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@cadic](https://github.com/cadic) via [#949](https://github.com/10up/distributor/pull/949)). -- WordPress "tested up to" version 6.3 (props [@jayedul](https://github.com/jayedul), [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter) via [#1047](https://github.com/10up/distributor/pull/1047), [#1123](https://github.com/10up/distributor/pull/1123)). +- WordPress "tested up to" version 6.3 (props [@jayedul](https://github.com/jayedul), [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul), [@QAharshalkadu](https://github.com/QAharshalkadu), [@dkotter](https://github.com/dkotter) via [#1047](https://github.com/10up/distributor/pull/1047), [#1118](https://github.com/10up/distributor/issues/1118), [#1123](https://github.com/10up/distributor/pull/1123)). - Browserlist database updated to version 1.0.30001489 (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@dkotter](https://github.com/dkotter) via [#1059](https://github.com/10up/distributor/pull/1059)). - Build process now uses `@wordpress/scripts` in place of Gulp (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@dinhtungdu](https://github.com/dinhtungdu), [@dkotter](https://github.com/dkotter) via [#916](https://github.com/10up/distributor/pull/916)). - Migrated E2E tests to Cypress (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@jeffpaul](https://github.com/jeffpaul), [@iamdharmesh](https://github.com/iamdharmesh) via [#1070](https://github.com/10up/distributor/pull/1070)). From c698ee64f48a5bd994ef748b39ddfa715b3171dd Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Wed, 6 Sep 2023 09:55:04 -0500 Subject: [PATCH 10/24] add missing credit --- CREDITS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CREDITS.md b/CREDITS.md index a44a905bd..894a2396c 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -10,7 +10,8 @@ The following individuals are responsible for curating the list of issues, respo Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc. -[10up (@10up)](https://github.com/10up), [Taylor Lovett (@tlovett1)](https://github.com/tlovett1), [Zane Matthew (@zanematthew)](https://github.com/zanematthew), [Aaron Brazell (@technosailor)](https://github.com/technosailor), [Marco Pereirinha (@pereirinha)](https://github.com/pereirinha), [Joshua Abenazer (@joshuaabenazer)](https://github.com/joshuaabenazer), [Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Helen Hou-Sandí (@helen)](https://github.com/helen), [Chris Marslender (@cmmarslender)](https://github.com/cmmarslender), [Tom J Nowell (@tomjn)](https://github.com/tomjn), [Tim Nolte (@timnolte)](https://github.com/timnolte), [(@sericgoran)](https://github.com/sericgoran), [Jason Bahl (@jasonbahl)](https://github.com/jasonbahl), [Barry Ceelen (@barryceelen)](https://github.com/barryceelen), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Ben Greeley (@bengreeley)](https://github.com/bengreeley), [Robbie Trencheny (@robbiet480)](https://github.com/robbiet480), [Jake Goldman (@jakemgold)](https://github.com/jakemgold), [Stephanie Leary (@sillybean)](https://github.com/sillybean), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Echo (@ChaosExAnima)](https://github.com/ChaosExAnima), [Burhan Nasir (@burhandodhy)](https://github.com/burhandodhy), [Rebecca Hum (@rebeccahum)](https://github.com/rebeccahum), [Sean Hayes (@seanchayes)](https://github.com/seanchayes), [Jeremy Felt (@jeremyfelt)](https://github.com/jeremyfelt), [Gago (@madmax3365)](https://github.com/madmax3365), [Ivan Kruchkoff(@)](https://github.com/ivankruchkoff), [Sérgio Santos (@s3rgiosan)](https://github.com/s3rgiosan), [Ravi Chandra (@ravichdev)](https://github.com/ravichdev), [Jay Hoffmann (@JasonHoffmann)](https://github.com/JasonHoffmann), [Arsen Dovlatyan (@arsendovlatyan)](https://github.com/arsendovlatyan), [Jeroen Sormani (@JeroenSormani)](https://github.com/JeroenSormani), [Ritesh Patel (@Ritesh-patel)](https://github.com/Ritesh-patel), [Gary Thayer (@gthayer)](https://github.com/gthayer), [Evan Mattson (@aaemnnosttv)](https://github.com/aaemnnosttv), [Nate Allen (@nate-allen)](https://github.com/nate-allen), [Michael Phillips (@mphillips)](https://github.com/mphillips), [Jay Wood (@JayWood)](https://github.com/JayWood), [Dreb Bits (@drebbits)](https://github.com/drebbits), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Matthew McAchran (@mmcachran)](https://github.com/mmcachran), [Ulrich Pogson (@grappler)](https://github.com/grappler), [(@avag-novembit)](https://github.com/avag-novembit), [Manuel Razzari (@mrazzari)](https://github.com/mrazzari), [Moe Browne (@moebrowne)](https://github.com/moebrowne), [Dave McHale (@dmchale)](https://github.com/dmchale), [Tommy Ferry (@tommyferry)](https://github.com/tommyferry), [Pete Nelson (@petenelson)](https://github.com/petenelson), [Alexander Berthelsen (@lakrisgubben)](https://github.com/lakrisgubben), [John Watkins (@johnwatkins0)](https://github.com/johnwatkins0), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Darío Hereñú (@kant)](https://github.com/kant), [Arman Hovhannisyan (@ahovhannissian)](https://github.com/ahovhannissian), [John Spellman (@jspellman814)](https://github.com/jspellman814), [Oszkar Nagy (@oszkarnagy)](https://github.com/oszkarnagy), [Sami Keijonen (@samikeijonen)](https://github.com/samikeijonen), [(@PaddyWhacks)](https://github.com/PaddyWhacks), [(@eriktad)](https://github.com/eriktad), [(@dmaslogh)](https://github.com/dmaslogh), [Kevin Pudlo (@Kpudlo)](https://github.com/Kpudlo), [Barrett Golding (@hearvox)](https://github.com/hearvox), [Rob Marscher (@rmarscher)](https://github.com/rmarscher), [Ivan Lopez (@ivanlopez)](https://github.com/ivanlopez), [Catherine Cavanagh (@biggiebangle)](https://github.com/biggiebangle), [Tommy Ferry (@pragmatic-tf)](https://github.com/pragmatic-tf), [Joshua Walker (@jshwlkr)](https://github.com/jshwlkr), [Caleb Burks (@WPprodigy)](https://github.com/WPprodigy), [(@jonny-bull)](https://github.com/jonny-bull), [Ricky Lee Whittemore (@rickalee)](https://github.com/rickalee), [Rob Cain (@robcain)](https://github.com/robcain), [(@j0HnC0untry)](https://github.com/j0HnC0untry), [(@dfardon)](https://github.com/dfardon), [(@anilpainuly121)](https://github.com/anilpainuly121), [(@vimalagarwalasentech)](https://github.com/vimalagarwalasentech), [Chris Wieber (@cdwieber)](https://github.com/cdwieber), [Dhanendran Rajagopal (@dhanendran)](https://github.com/dhanendran), [Andrew Ortolano (@andrewortolano)](https://github.com/andrewortolano), [(@xyralothep)](https://github.com/xyralothep), [Garth Gutenberg (@ggutenberg)](https://github.com/ggutenberg), [Jaime Martínez (@jmslbam)](https://github.com/jmslbam), [Francisco Domo (@francisco-domo)](https://github.com/francisco-domo), [Elliott Stocks (@elliott-stocks)](https://github.com/elliott-stocks), [David Purdy (@davidmpurdy)](https://github.com/davidmpurdy), [(@zacnboat)](https://github.com/zacnboat), [Spencer Brower (@sbrow)](https://github.com/sbrow), [Ross Pickerill (@rosspbauer)](https://github.com/rosspbauer), [Jackie Kjome (@JackieKjome)](https://github.com/JackieKjome), [SieBer15 (@SieBer15)](https://github.com/SieBer15), [Pascal Knecht (@pascalknecht)](https://github.com/pascalknecht), [Justin Young (@justiny)](https://github.com/justiny), [Johan Pretorius (@Drmzindec)](https://github.com/Drmzindec), [Clayton Collie (@claytoncollie)](https://github.com/claytoncollie), [Max Lyuchin (@cadic)](https://github.com/cadic), [Joe Grainger (@jjgrainger)](https://github.com/jjgrainger), [Lily Bonney](https://www.linkedin.com/in/lilybonney/), [Mollie Pugh](https://www.linkedin.com/in/molliepugh/), [Martina Haines](https://www.linkedin.com/in/martinahaines/), [Luca Ricci (@theskinnyghost)](https://github.com/theskinnyghost), [Lucy Bowe (@LucyTurtle)](https://github.com/LucyTurtle), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [(@jmstew3)](https://github.com/jmstew3), [Phil Crumm (@pcrumm)](https://github.com/pcrumm), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Will Skora (@skorasaurus)](https://github.com/skorasaurus), [Mohit Dadhich (@mohitwp)](https://github.com/mohitwp), [Will Howat-Comandré (@willhowat)](https://github.com/willhowat), [@Borkent](https://github.com/Borkent), [Dishit Pala (@dishitpala)](https://github.com/dishitpala), [@markusvisse](https://github.com/markusvisse), [@MonsterKing](https://github.com/MonsterKing), [James Morrison (@jamesmorrison)](https://github.com/jamesmorrison), [Mehul Kaklotar (@mehulkaklotar)](https://github.com/mehulkaklotar), [@espechtcfe](https://github.com/espechtcfe), [@romeowski](https://github.com/romeowski), [@vlastaw](https://github.com/vlastaw), [Jamie Adams (@jadamsbit)](https://github.com/jadamsbit), [Yoni Bee (@ybalkind)](https://github.com/ybalkind), [Akshit Sethi (@akshitsethi)](https://github.com/akshitsethi), [Vikram (@vikrampm1)](https://github.com/vikrampm1), [Josh Wilson (@joshwilsondotme)](https://github.com/joshwilsondotme), [Groupe-Mgel (@Groupe-Mgel)](https://github.com/Groupe-Mgel), [Emma (@emmawenger)](https://github.com/emmawenger), [@bcobin](https://github.com/bcobin), [@alexwolk](https://github.com/alexwolk), [Maxime Freschard (@ligne13)](https://github.com/ligne13), [Shazahan Kabir Saju (@sksaju)](https://github.com/sksaju), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [@Pitemedia](https://github.com/Pitemedia), [Michal Letavka (@michalletavka)](https://github.com/michalletavka), [@shu05](https://github.com/shu05), [Lukas Pawlik (@lukaspawlik)](https://github.com/lukaspawlik), [Amal Ajith PM (@amalajith)](https://github.com/amalajith), [Paul de Wouters (@pdewouters)](https://github.com/pdewouters), [Andre Gagnon (@andygagnon)](https://github.com/andygagnon), [Ravinder Kumar (@ravinderk)](https://github.com/ravinderk), [mapamond (@mapamond)](https://github.com/mapamond), [Giorgos Sarigiannidis (@gsarig)](https://github.com/gsarig), [Dan Maby (@danmaby)](https://github.com/danmaby), [Tim Gieseking (@timstl)](https://github.com/timstl), [David Chandra Purnama (@turtlepod)](https://github.com/turtlepod), [Manolo Bevia (@manolobevia)](https://github.com/manolobevia), [madriverweb (@madriverweb)](https://github.com/madriverweb), [ale8521 (@ale8521)](https://github.com/ale8521), [roshniahuja (@roshniahuja)](https://github.com/roshniahuja), [Jayedul K. (@jayedul)](https://github.com/jayedul), [Konstantinos Galanakis (@kmgalanakis-sage)](https://github.com/kmgalanakis-sage), [Seth Rubenstein (@sethrubenstein)](https://github.com/sethrubenstein). +[10up (@10up)](https://github.com/10up), [Taylor Lovett (@tlovett1)](https://github.com/tlovett1), [Zane Matthew (@zanematthew)](https://github.com/zanematthew), [Aaron Brazell (@technosailor)](https://github.com/technosailor), [Marco Pereirinha (@pereirinha)](https://github.com/pereirinha), [Joshua Abenazer (@joshuaabenazer)](https://github.com/joshuaabenazer), [Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Helen Hou-Sandí (@helen)](https://github.com/helen), [Chris Marslender (@cmmarslender)](https://github.com/cmmarslender), [Tom J Nowell (@tomjn)](https://github.com/tomjn), [Tim Nolte (@timnolte)](https://github.com/timnolte), [(@sericgoran)](https://github.com/sericgoran), [Jason Bahl (@jasonbahl)](https://github.com/jasonbahl), [Barry Ceelen (@barryceelen)](https://github.com/barryceelen), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Ben Greeley (@bengreeley)](https://github.com/bengreeley), [Robbie Trencheny (@robbiet480)](https://github.com/robbiet480), [Jake Goldman (@jakemgold)](https://github.com/jakemgold), [Stephanie Leary (@sillybean)](https://github.com/sillybean), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Echo (@ChaosExAnima)](https://github.com/ChaosExAnima), [Burhan Nasir (@burhandodhy)](https://github.com/burhandodhy), [Rebecca Hum (@rebeccahum)](https://github.com/rebeccahum), [Sean Hayes (@seanchayes)](https://github.com/seanchayes), [Jeremy Felt (@jeremyfelt)](https://github.com/jeremyfelt), [Gago (@madmax3365)](https://github.com/madmax3365), [Ivan Kruchkoff(@)](https://github.com/ivankruchkoff), [Sérgio Santos (@s3rgiosan)](https://github.com/s3rgiosan), [Ravi Chandra (@ravichdev)](https://github.com/ravichdev), [Jay Hoffmann (@JasonHoffmann)](https://github.com/JasonHoffmann), [Arsen Dovlatyan (@arsendovlatyan)](https://github.com/arsendovlatyan), [Jeroen Sormani (@JeroenSormani)](https://github.com/JeroenSormani), [Ritesh Patel (@Ritesh-patel)](https://github.com/Ritesh-patel), [Gary Thayer (@gthayer)](https://github.com/gthayer), [Evan Mattson (@aaemnnosttv)](https://github.com/aaemnnosttv), [Nate Allen (@nate-allen)](https://github.com/nate-allen), [Michael Phillips (@mphillips)](https://github.com/mphillips), [Jay Wood (@JayWood)](https://github.com/JayWood), [Dreb Bits (@drebbits)](https://github.com/drebbits), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Matthew McAchran (@mmcachran)](https://github.com/mmcachran), [Ulrich Pogson (@grappler)](https://github.com/grappler), [(@avag-novembit)](https://github.com/avag-novembit), [Manuel Razzari (@mrazzari)](https://github.com/mrazzari), [Moe Browne (@moebrowne)](https://github.com/moebrowne), [Dave McHale (@dmchale)](https://github.com/dmchale), [Tommy Ferry (@tommyferry)](https://github.com/tommyferry), [Pete Nelson (@petenelson)](https://github.com/petenelson), [Alexander Berthelsen (@lakrisgubben)](https://github.com/lakrisgubben), [John Watkins (@johnwatkins0)](https://github.com/johnwatkins0), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Darío Hereñú (@kant)](https://github.com/kant), [Arman Hovhannisyan (@ahovhannissian)](https://github.com/ahovhannissian), [John Spellman (@jspellman814)](https://github.com/jspellman814), [Oszkar Nagy (@oszkarnagy)](https://github.com/oszkarnagy), [Sami Keijonen (@samikeijonen)](https://github.com/samikeijonen), [(@PaddyWhacks)](https://github.com/PaddyWhacks), [(@eriktad)](https://github.com/eriktad), [(@dmaslogh)](https://github.com/dmaslogh), [Kevin Pudlo (@Kpudlo)](https://github.com/Kpudlo), [Barrett Golding (@hearvox)](https://github.com/hearvox), [Rob Marscher (@rmarscher)](https://github.com/rmarscher), [Ivan Lopez (@ivanlopez)](https://github.com/ivanlopez), [Catherine Cavanagh (@biggiebangle)](https://github.com/biggiebangle), [Tommy Ferry (@pragmatic-tf)](https://github.com/pragmatic-tf), [Joshua Walker (@jshwlkr)](https://github.com/jshwlkr), [Caleb Burks (@WPprodigy)](https://github.com/WPprodigy), [(@jonny-bull)](https://github.com/jonny-bull), [Ricky Lee Whittemore (@rickalee)](https://github.com/rickalee), [Rob Cain (@robcain)](https://github.com/robcain), [(@j0HnC0untry)](https://github.com/j0HnC0untry), [(@dfardon)](https://github.com/dfardon), [(@anilpainuly121)](https://github.com/anilpainuly121), [(@vimalagarwalasentech)](https://github.com/vimalagarwalasentech), [Chris Wieber (@cdwieber)](https://github.com/cdwieber), [Dhanendran Rajagopal (@dhanendran)](https://github.com/dhanendran), [Andrew Ortolano (@andrewortolano)](https://github.com/andrewortolano), [(@xyralothep)](https://github.com/xyralothep), [Garth Gutenberg (@ggutenberg)](https://github.com/ggutenberg), [Jaime Martínez (@jmslbam)](https://github.com/jmslbam), [Francisco Domo (@francisco-domo)](https://github.com/francisco-domo), [Elliott Stocks (@elliott-stocks)](https://github.com/elliott-stocks), [David Purdy (@davidmpurdy)](https://github.com/davidmpurdy), [(@zacnboat)](https://github.com/zacnboat), [Spencer Brower (@sbrow)](https://github.com/sbrow), [Ross Pickerill (@rosspbauer)](https://github.com/rosspbauer), [Jackie Kjome (@JackieKjome)](https://github.com/JackieKjome), [SieBer15 (@SieBer15)](https://github.com/SieBer15), [Pascal Knecht (@pascalknecht)](https://github.com/pascalknecht), [Justin Young (@justiny)](https://github.com/justiny), [Johan Pretorius (@Drmzindec)](https://github.com/Drmzindec), [Clayton Collie (@claytoncollie)](https://github.com/claytoncollie), [Max Lyuchin (@cadic)](https://github.com/cadic), [Joe Grainger (@jjgrainger)](https://github.com/jjgrainger), [Lily Bonney](https://www.linkedin.com/in/lilybonney/), [Mollie Pugh](https://www.linkedin.com/in/molliepugh/), [Martina Haines](https://www.linkedin.com/in/martinahaines/), [Luca Ricci (@theskinnyghost)](https://github.com/theskinnyghost), [Lucy Bowe (@LucyTurtle)](https://github.com/LucyTurtle), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [(@jmstew3)](https://github.com/jmstew3), [Phil Crumm (@pcrumm)](https://github.com/pcrumm), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Will Skora (@skorasaurus)](https://github.com/skorasaurus), [Mohit Dadhich (@mohitwp)](https://github.com/mohitwp), [Will Howat-Comandré (@willhowat)](https://github.com/willhowat), [@Borkent](https://github.com/Borkent), [Dishit Pala (@dishitpala)](https://github.com/dishitpala), [@markusvisse](https://github.com/markusvisse), [@MonsterKing](https://github.com/MonsterKing), [James Morrison (@jamesmorrison)](https://github.com/jamesmorrison), [Mehul Kaklotar (@mehulkaklotar)](https://github.com/mehulkaklotar), [@espechtcfe](https://github.com/espechtcfe), [@romeowski](https://github.com/romeowski), [@vlastaw](https://github.com/vlastaw), [Jamie Adams (@jadamsbit)](https://github.com/jadamsbit), [Yoni Bee (@ybalkind)](https://github.com/ybalkind), [Akshit Sethi (@akshitsethi)](https://github.com/akshitsethi), [Vikram (@vikrampm1)](https://github.com/vikrampm1), [Josh Wilson (@joshwilsondotme)](https://github.com/joshwilsondotme), [Groupe-Mgel (@Groupe-Mgel)](https://github.com/Groupe-Mgel), [Emma (@emmawenger)](https://github.com/emmawenger), [@bcobin](https://github.com/bcobin), [@alexwolk](https://github.com/alexwolk), [Maxime Freschard (@ligne13)](https://github.com/ligne13), [Shazahan Kabir Saju (@sksaju)](https://github.com/sksaju), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [@Pitemedia](https://github.com/Pitemedia), [Michal Letavka (@michalletavka)](https://github.com/michalletavka), [@shu05](https://github.com/shu05), [Lukas Pawlik (@lukaspawlik)](https://github.com/lukaspawlik), [Amal Ajith PM (@amalajith)](https://github.com/amalajith), [Paul de Wouters (@pdewouters)](https://github.com/pdewouters), [Andre Gagnon (@andygagnon)](https://github.com/andygagnon), [Ravinder Kumar (@ravinderk)](https://github.com/ravinderk), [mapamond (@mapamond)](https://github.com/mapamond), [Giorgos Sarigiannidis (@gsarig)](https://github.com/gsarig), [Dan Maby (@danmaby)](https://github.com/danmaby), [Tim Gieseking (@timstl)](https://github.com/timstl), [David Chandra Purnama (@turtlepod)](https://github.com/turtlepod), [Manolo Bevia (@manolobevia)](https://github.com/manolobevia), [madriverweb (@madriverweb)](https://github.com/madriverweb), [ale8521 (@ale8521)](https://github.com/ale8521), [roshniahuja (@roshniahuja)](https://github.com/roshniahuja), [Jayedul K. (@jayedul)](https://github.com/jayedul), [Konstantinos Galanakis (@kmgalanakis-sage)](https://github.com/kmgalanakis-sage), [Seth Rubenstein (@sethrubenstein)](https://github.com/sethrubenstein), [Harshal Kadu (@QAharshalkadu)](https://github.com/QAharshalkadu). + ## Libraries The following software libraries are utilized in this repository. From c7eff5d7acc73c2d5c4c536fb70889ba90b3c373 Mon Sep 17 00:00:00 2001 From: zach-adams Date: Wed, 6 Sep 2023 20:35:26 -0600 Subject: [PATCH 11/24] Updated icon SVG file --- assets/img/icon.svg | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/assets/img/icon.svg b/assets/img/icon.svg index a658330c3..998a0980f 100644 --- a/assets/img/icon.svg +++ b/assets/img/icon.svg @@ -1,24 +1,4 @@ - -distributor-icon -Created using Figma - - - - - - - - - - - - - - - - - - - - + + + From b6fa8b5efc4f932d67b8f9a0c9081ad9a3cb2e69 Mon Sep 17 00:00:00 2001 From: zach-adams Date: Wed, 6 Sep 2023 20:36:46 -0600 Subject: [PATCH 12/24] Update admin menu base64-encoded SVG icons --- includes/external-connection-cpt.php | 2 +- includes/settings.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/external-connection-cpt.php b/includes/external-connection-cpt.php index 937c3a932..48023e812 100644 --- a/includes/external-connection-cpt.php +++ b/includes/external-connection-cpt.php @@ -662,7 +662,7 @@ function add_menu_item() { apply_filters( 'dt_capabilities', 'manage_options' ), 'distributor', __NAMESPACE__ . '\dashboard', - 'data:image/svg+xml;base64,<svg width="36" height="39" viewBox="0 0 36 39" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>distributor-icon</title><desc>Created using Figma</desc><g id="Canvas" transform="translate(-4024 365)"><g id="distributor-icon"><use xlink:href="#path0_fill" transform="translate(4024.71 -365)" fill="#A0A5AA"/><use xlink:href="#path1_fill" transform="translate(4024.71 -365)" fill="#A0A5AA"/><use xlink:href="#path2_fill" transform="translate(4024.71 -365)" fill="#A0A5AA"/><use xlink:href="#path3_fill" transform="translate(4024.71 -365)" fill="#A0A5AA"/><use xlink:href="#path4_fill" transform="translate(4024.71 -365)" fill="#A0A5AA"/><use xlink:href="#path5_fill" transform="translate(4024.71 -365)" fill="#A0A5AA"/><use xlink:href="#path6_fill" transform="translate(4024.71 -365)" fill="#A0A5AA"/></g></g><defs><path id="path0_fill" d="M 7.93814 23.1108C 7.00743 23.1108 6.2915 23.9045 6.2915 24.9362C 6.2915 25.8887 7.00743 26.7617 7.86654 26.7617C 8.94043 28.4284 10.3723 29.7777 12.0189 30.7301C 13.594 31.6032 15.3122 32 16.9588 32C 21.1112 32 25.1204 29.4602 27.125 25.0156C 28.4852 21.9996 28.6284 18.6662 27.6977 15.4915C 26.6954 12.3167 24.6908 9.77696 21.9703 8.26896C 16.3861 5.25298 9.65636 7.79276 6.86425 13.9835L 6.64947 14.3803L 6.72106 14.3803C 6.43469 15.0152 6.21991 15.8883 6.79265 16.2058L 12.7348 18.7455C 12.7348 18.9836 12.6633 19.2218 12.6633 19.4599C 12.6633 22.079 14.5963 24.2219 16.9588 24.2219C 19.3214 24.2219 21.2544 22.079 21.2544 19.4599C 21.2544 16.8407 19.3214 14.6978 16.9588 14.6978C 15.527 14.6978 14.2383 15.4915 13.4508 16.682L 8.58247 14.6184C 9.72795 12.2374 11.5894 10.4119 13.8803 9.53885C 16.2429 8.6658 18.8202 8.82454 21.1112 10.0151C 25.7647 12.5548 27.6977 18.8249 25.4068 23.9838C 24.3329 26.5236 22.3999 28.3491 19.9657 29.3015C 17.6031 30.1745 15.0258 30.0158 12.7348 28.8253C 11.3746 28.111 10.2291 26.9998 9.2984 25.6506C 9.36999 25.4125 9.44158 25.1744 9.44158 24.9362C 9.58477 23.9838 8.79725 23.1108 7.93814 23.1108Z"/><path id="path1_fill" fill-rule="evenodd" d="M 12.0189 30.7301C 10.3723 29.7777 8.94043 28.4284 7.86654 26.7617C 7.00743 26.7617 6.2915 25.8887 6.2915 24.9362C 6.2915 23.9045 7.00743 23.1108 7.93814 23.1108C 8.79725 23.1108 9.58477 23.9838 9.44158 24.9362C 9.44158 25.1744 9.36999 25.4125 9.2984 25.6506C 10.2291 26.9998 11.3746 28.111 12.7348 28.8253C 15.0258 30.0158 17.6031 30.1745 19.9657 29.3015C 22.3999 28.3491 24.3329 26.5236 25.4068 23.9838C 27.6977 18.8249 25.7647 12.5548 21.1112 10.0151C 18.8202 8.82454 16.2429 8.6658 13.8803 9.53885C 11.6765 10.3787 9.87007 12.0999 8.71616 14.3493C 8.67056 14.4382 8.62602 14.5279 8.58247 14.6184L 13.4508 16.682C 14.2383 15.4915 15.527 14.6978 16.9588 14.6978C 19.3214 14.6978 21.2544 16.8407 21.2544 19.4599C 21.2544 22.079 19.3214 24.2219 16.9588 24.2219C 14.5963 24.2219 12.6633 22.079 12.6633 19.4599C 12.6633 19.3408 12.6811 19.2218 12.699 19.1027C 12.7169 18.9837 12.7348 18.8646 12.7348 18.7455L 6.79265 16.2058C 6.30607 15.936 6.38784 15.2653 6.59907 14.6803C 6.61517 14.6357 6.63202 14.5917 6.64942 14.5483C 6.66808 14.5018 6.68738 14.4561 6.70708 14.4115C 6.7117 14.4011 6.7164 14.3906 6.72106 14.3803L 6.64947 14.3803L 6.86425 13.9835C 9.65636 7.79276 16.3861 5.25298 21.9703 8.26896C 24.6908 9.77696 26.6954 12.3167 27.6977 15.4915C 28.6284 18.6662 28.4852 21.9996 27.125 25.0156C 25.1204 29.4602 21.1112 32 16.9588 32C 15.3122 32 13.594 31.6032 12.0189 30.7301ZM 6.59522 13.8502C 9.45298 7.52723 16.3604 4.89819 22.1128 8.00502L 22.1157 8.00658C 24.9091 9.55495 26.9604 12.1596 27.9838 15.4011L 27.9856 15.4071C 28.9262 18.6299 28.7771 22.069 27.3984 25.139C 25.3489 29.6832 21.2376 32.3 16.9588 32.3C 15.2782 32.2981 13.4864 31.8832 11.8734 30.9925L 11.8686 30.9899C 10.2356 30.0431 8.78526 28.6911 7.69859 27.053C 6.71423 26.9497 5.99146 25.9496 5.99146 24.9363C 5.99146 23.7686 6.81335 22.8108 7.93809 22.8108C 8.97878 22.8108 9.89729 23.8392 9.74105 24.9612C 9.73503 25.1811 9.68306 25.3998 9.62679 25.5972C 10.5227 26.8682 11.5891 27.8879 12.8732 28.5591C 15.089 29.7106 17.5773 29.8634 19.859 29.0211C 22.2176 28.0975 24.0888 26.3304 25.1304 23.867L 25.1325 23.8621C 27.3659 18.8327 25.4714 12.7386 20.9701 10.2799C 18.7545 9.12946 16.2668 8.97724 13.9857 9.81974C 11.8668 10.6277 10.1178 12.2847 8.99313 14.4667L 13.3439 16.3109C 14.1882 15.1622 15.4978 14.3978 16.9588 14.3978C 19.5154 14.3978 21.5543 16.7049 21.5543 19.4599C 21.5543 22.2149 19.5154 24.5219 16.9588 24.5219C 14.4022 24.5219 12.3632 22.2149 12.3632 19.4599C 12.364 19.3185 12.3844 19.1772 12.4023 19.0581L 12.405 19.0405C 12.4104 19.0043 12.4156 18.9701 12.42 18.9373L 6.66059 16.4756L 6.64716 16.4682C 6.21685 16.2296 6.11427 15.7881 6.13506 15.3962C 6.14893 15.1659 6.20676 14.9157 6.28365 14.6803L 6.14593 14.6803L 6.59522 13.8502Z"/><path id="path2_fill" d="M 32.1281 10.0168C 32.1281 9.0063 31.3955 8.22899 30.4432 8.22899C 29.4908 8.22899 28.7582 9.0063 28.7582 10.0168C 28.7582 10.9496 29.4908 11.7269 30.3699 11.8046C 32.8607 16.3908 33.0805 22.0651 30.8827 26.8845C 29.0512 30.771 25.9743 33.6471 22.1648 34.9685C 18.3553 36.3677 14.2528 36.0567 10.6631 34.1912C 3.19062 30.3046 0.113724 20.666 3.7767 12.7374C 5.97448 7.9958 10.2968 4.73109 15.1319 3.95378C 15.425 4.34244 15.8645 4.57563 16.3773 4.57563C 17.3297 4.57563 18.0623 3.79832 18.0623 2.78782C 18.0623 1.77731 17.3297 1 16.3773 1C 15.718 1 15.2052 1.38866 14.9121 1.93277C 9.41768 2.78782 4.5093 6.51891 2.01847 11.8824C 0.0404656 16.2353 -0.252573 21.1324 1.21262 25.7185C 2.67781 30.3046 5.75471 33.958 9.78398 36.1345C 12.2015 37.3782 14.7656 38 17.2564 38C 23.5568 38 29.6373 34.2689 32.5677 27.895C 35.0585 22.4538 34.8387 16.0021 31.9816 10.7941C 32.0549 10.5609 32.1281 10.3277 32.1281 10.0168Z"/><path id="path3_fill" fill-rule="evenodd" d="M 2.01847 11.8824C 4.5093 6.51891 9.41768 2.78782 14.9121 1.93277C 15.2052 1.38866 15.718 1 16.3773 1C 17.3297 1 18.0623 1.77731 18.0623 2.78782C 18.0623 3.79832 17.3297 4.57563 16.3773 4.57563C 15.8645 4.57563 15.425 4.34244 15.1319 3.95378C 10.2968 4.73109 5.97448 7.9958 3.7767 12.7374C 0.113724 20.666 3.19062 30.3046 10.6631 34.1912C 14.2528 36.0567 18.3553 36.3677 22.1648 34.9685C 25.9743 33.6471 29.0512 30.771 30.8827 26.8845C 33.0805 22.0651 32.8607 16.3908 30.3699 11.8046C 29.4908 11.7269 28.7582 10.9496 28.7582 10.0168C 28.7582 9.0063 29.4908 8.22899 30.4432 8.22899C 31.3955 8.22899 32.1281 9.0063 32.1281 10.0168C 32.1281 10.3277 32.0549 10.5609 31.9816 10.7941C 34.8387 16.0021 35.0585 22.4538 32.5677 27.895C 29.6373 34.2689 23.5568 38 17.2564 38C 14.7656 38 12.2015 37.3782 9.78398 36.1345C 5.75471 33.958 2.67781 30.3046 1.21262 25.7185C -0.252573 21.1324 0.0404656 16.2353 2.01847 11.8824ZM 32.3055 10.7616C 32.3671 10.5546 32.4253 10.3129 32.4282 10.0168C 32.4282 8.85762 31.5777 7.929 30.4432 7.929C 29.3086 7.929 28.4582 8.85762 28.4582 10.0168C 28.4582 11.046 29.22 11.9138 30.1782 12.0817C 32.556 16.5609 32.747 22.072 30.6106 26.7582C 28.8103 30.5776 25.7926 33.3926 22.0665 34.6851L 22.0614 34.6869C 18.3336 36.0561 14.3187 35.7529 10.8016 33.925C 3.48056 30.1173 0.448866 20.6562 4.049 12.8634C 6.18072 8.26446 10.3461 5.08682 15.0118 4.27801C 15.3555 4.65311 15.8334 4.87564 16.3774 4.87564C 17.5119 4.87564 18.3623 3.94702 18.3623 2.78783C 18.3623 1.62863 17.5119 0.700012 16.3774 0.700012C 15.6422 0.700012 15.0697 1.10548 14.7243 1.65905C 9.18401 2.57177 4.25612 6.35189 1.74641 11.756L 1.74538 11.7583C -0.250678 16.1631 -0.55021 21.1697 0.926879 25.8098C 2.41557 30.4695 5.54358 34.1849 9.64143 36.3984L 9.64677 36.4012C 12.0969 37.6593 14.7301 38.2979 17.2565 38.3C 23.676 38.3 29.8618 34.4989 32.8403 28.0203C 35.3524 22.5326 35.1508 16.0338 32.3055 10.7616Z"/><path id="path4_fill" d="M 19.2915 2.5C 19.2915 3.88071 18.1722 5 16.7915 5C 15.4108 5 14.2915 3.88071 14.2915 2.5C 14.2915 1.11929 15.4108 0 16.7915 0C 18.1722 0 19.2915 1.11929 19.2915 2.5Z"/><path id="path5_fill" d="M 33.2915 10.5C 33.2915 11.8807 32.1722 13 30.7915 13C 29.4108 13 28.2915 11.8807 28.2915 10.5C 28.2915 9.11929 29.4108 8 30.7915 8C 32.1722 8 33.2915 9.11929 33.2915 10.5Z"/><path id="path6_fill" d="M 10.2915 25.5C 10.2915 26.8807 9.17222 28 7.7915 28C 6.41079 28 5.2915 26.8807 5.2915 25.5C 5.2915 24.1193 6.41079 23 7.7915 23C 9.17222 23 10.2915 24.1193 10.2915 25.5Z"/></defs></svg>' + 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbDpzcGFjZT0icHJlc2VydmUiIHN0eWxlPSJmaWxsLXJ1bGU6ZXZlbm9kZDtjbGlwLXJ1bGU6ZXZlbm9kZDtzdHJva2UtbGluZWpvaW46cm91bmQ7c3Ryb2tlLW1pdGVybGltaXQ6MiIgdmlld0JveD0iMTMuNCA4LjggNTczLjIgNTczLjIiPgogIDxwYXRoIGZpbGw9IiNhN2FhYWQiIGQ9Ik0xOTUuMTEzIDQxMS4wMzNjNDUuODM1IDQ2LjY5MiAxMTkuMTI0IDU4LjQ4OCAxNzguMzg3IDI0LjI3MyA3MC4yNjItNDAuNTY2IDk0LjM3MS0xMzAuNTQ0IDUzLjgwNi0yMDAuODA2LTQwLjU2Ni03MC4yNjItMTMwLjU0NC05NC4zNzEtMjAwLjgwNi01My44MDYtMTkuODczIDExLjQ3NC0zNi4wNTUgMjYuODk5LTQ4LjEyNCA0NC43MTVsNjQuNzIyIDMzLjE4NmMyMi4yMDEtMjUuNTkzIDU5Ljc5Ni0zMy43ODIgOTEuMjc5LTE3LjYzOSAzNy4wMDIgMTguOTczIDUxLjY0IDY0LjQxOCAzMi42NjcgMTAxLjQyMS0xOC45NzMgMzcuMDAyLTY0LjQxOCA1MS42NC0xMDEuNDIxIDMyLjY2Ny0zMS40ODMtMTYuMTQzLTQ2Ljc3Ni01MS40NS0zOC45NTEtODQuNDE1bC04MS43MDItNDEuODkyYy04LjgzOC00LjUzMi0xMi4zMzUtMTUuMzY3LTcuODE0LTI0LjIxMSAxNS41MTQtMzAuMzQ2IDM5LjY1OC01Ni43MTUgNzEuMzQ0LTc1LjAwOSA4Ny40NjktNTAuNSAxOTkuNDgyLTIwLjQ4NiAyNDkuOTgzIDY2Ljk4MyA1MC41IDg3LjQ2OSAyMC40ODYgMTk5LjQ4Mi02Ni45ODMgMjQ5Ljk4My03NS4yMzUgNDMuNDM3LTE2OC42MyAyNy4zMDctMjI1LjQxOS0zMy43MTctMTcuODA5IDMuNzc4LTM2Ljc5Ny00LjA1NS00Ni4zODctMjAuNjY2LTExLjkyMi0yMC42NDgtNC44MzctNDcuMDkxIDE1LjgxMi01OS4wMTIgMjAuNjQ4LTExLjkyMiA0Ny4wOTEtNC44MzYgNTkuMDEyIDE1LjgxMiA3Ljc3IDEzLjQ1OCA3LjQ2NiAyOS4zNzcuNTk1IDQyLjEzM1oiLz4KICA8cGF0aCBmaWxsPSIjYTdhYWFkIiBkPSJNMjYyLjIzNyA3Mi45ODVDMTQ4LjggOTEuMTAxIDYyIDE4OS40OTQgNjIgMzA4YzAgMTMxLjM1NiAxMDYuNjQ0IDIzOCAyMzggMjM4czIzOC0xMDYuNjQ0IDIzOC0yMzhjMC0zNC4wNTktNy4xNjgtNjYuNDU4LTIwLjA4LTk1Ljc2Ni0xNS4xMjEuOTktMzAuMzIzLTYuMDE0LTM5LjEzNy0xOS42MjYtMTIuOTU5LTIwLjAxNC03LjIzMS00Ni43ODMgMTIuNzgzLTU5Ljc0MiAyMC4wMTQtMTIuOTU4IDQ2Ljc4My03LjIzMSA1OS43NDIgMTIuNzgzIDEwLjA5NSAxNS41OTIgOC44NDkgMzUuMjg0LTEuNjU3IDQ5LjM1MkM1NjUuMjg4IDIyOS40NjEgNTc0IDI2Ny43MjEgNTc0IDMwOGMwIDE1MS4yMjUtMTIyLjc3NSAyNzQtMjc0IDI3NFMyNiA0NTkuMjI1IDI2IDMwOEMyNiAxNzAuNTM5IDEyNy40NDMgNTYuNTg0IDI1OS40ODcgMzYuOTggMjY1LjU5NCAyMC41MzMgMjgxLjQzOCA4LjggMzAwIDguOGMyMy44NDMgMCA0My4yIDE5LjM1NyA0My4yIDQzLjIgMCAyMy44NDMtMTkuMzU3IDQzLjItNDMuMiA0My4yLTE2LjIyOSAwLTMwLjM4LTguOTY4LTM3Ljc2My0yMi4yMTVaIi8+Cjwvc3ZnPgo=' ); add_action( "load-$hook", __NAMESPACE__ . '\screen_option' ); diff --git a/includes/settings.php b/includes/settings.php index c33eb58d7..224c81561 100644 --- a/includes/settings.php +++ b/includes/settings.php @@ -306,7 +306,7 @@ function admin_menu() { * @since 1.2 */ function network_admin_menu() { - add_menu_page( 'Distributor', 'Distributor', 'manage_options', 'distributor-settings', __NAMESPACE__ . '\network_settings_screen', 'data:image/svg+xml;base64,<svg width="36" height="39" viewBox="0 0 36 39" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>distributor-icon</title><desc>Created using Figma</desc><g id="Canvas" transform="translate(-4024 365)"><g id="distributor-icon"><use xlink:href="#path0_fill" transform="translate(4024.71 -365)" fill="#A0A5AA"/><use xlink:href="#path1_fill" transform="translate(4024.71 -365)" fill="#A0A5AA"/><use xlink:href="#path2_fill" transform="translate(4024.71 -365)" fill="#A0A5AA"/><use xlink:href="#path3_fill" transform="translate(4024.71 -365)" fill="#A0A5AA"/><use xlink:href="#path4_fill" transform="translate(4024.71 -365)" fill="#A0A5AA"/><use xlink:href="#path5_fill" transform="translate(4024.71 -365)" fill="#A0A5AA"/><use xlink:href="#path6_fill" transform="translate(4024.71 -365)" fill="#A0A5AA"/></g></g><defs><path id="path0_fill" d="M 7.93814 23.1108C 7.00743 23.1108 6.2915 23.9045 6.2915 24.9362C 6.2915 25.8887 7.00743 26.7617 7.86654 26.7617C 8.94043 28.4284 10.3723 29.7777 12.0189 30.7301C 13.594 31.6032 15.3122 32 16.9588 32C 21.1112 32 25.1204 29.4602 27.125 25.0156C 28.4852 21.9996 28.6284 18.6662 27.6977 15.4915C 26.6954 12.3167 24.6908 9.77696 21.9703 8.26896C 16.3861 5.25298 9.65636 7.79276 6.86425 13.9835L 6.64947 14.3803L 6.72106 14.3803C 6.43469 15.0152 6.21991 15.8883 6.79265 16.2058L 12.7348 18.7455C 12.7348 18.9836 12.6633 19.2218 12.6633 19.4599C 12.6633 22.079 14.5963 24.2219 16.9588 24.2219C 19.3214 24.2219 21.2544 22.079 21.2544 19.4599C 21.2544 16.8407 19.3214 14.6978 16.9588 14.6978C 15.527 14.6978 14.2383 15.4915 13.4508 16.682L 8.58247 14.6184C 9.72795 12.2374 11.5894 10.4119 13.8803 9.53885C 16.2429 8.6658 18.8202 8.82454 21.1112 10.0151C 25.7647 12.5548 27.6977 18.8249 25.4068 23.9838C 24.3329 26.5236 22.3999 28.3491 19.9657 29.3015C 17.6031 30.1745 15.0258 30.0158 12.7348 28.8253C 11.3746 28.111 10.2291 26.9998 9.2984 25.6506C 9.36999 25.4125 9.44158 25.1744 9.44158 24.9362C 9.58477 23.9838 8.79725 23.1108 7.93814 23.1108Z"/><path id="path1_fill" fill-rule="evenodd" d="M 12.0189 30.7301C 10.3723 29.7777 8.94043 28.4284 7.86654 26.7617C 7.00743 26.7617 6.2915 25.8887 6.2915 24.9362C 6.2915 23.9045 7.00743 23.1108 7.93814 23.1108C 8.79725 23.1108 9.58477 23.9838 9.44158 24.9362C 9.44158 25.1744 9.36999 25.4125 9.2984 25.6506C 10.2291 26.9998 11.3746 28.111 12.7348 28.8253C 15.0258 30.0158 17.6031 30.1745 19.9657 29.3015C 22.3999 28.3491 24.3329 26.5236 25.4068 23.9838C 27.6977 18.8249 25.7647 12.5548 21.1112 10.0151C 18.8202 8.82454 16.2429 8.6658 13.8803 9.53885C 11.6765 10.3787 9.87007 12.0999 8.71616 14.3493C 8.67056 14.4382 8.62602 14.5279 8.58247 14.6184L 13.4508 16.682C 14.2383 15.4915 15.527 14.6978 16.9588 14.6978C 19.3214 14.6978 21.2544 16.8407 21.2544 19.4599C 21.2544 22.079 19.3214 24.2219 16.9588 24.2219C 14.5963 24.2219 12.6633 22.079 12.6633 19.4599C 12.6633 19.3408 12.6811 19.2218 12.699 19.1027C 12.7169 18.9837 12.7348 18.8646 12.7348 18.7455L 6.79265 16.2058C 6.30607 15.936 6.38784 15.2653 6.59907 14.6803C 6.61517 14.6357 6.63202 14.5917 6.64942 14.5483C 6.66808 14.5018 6.68738 14.4561 6.70708 14.4115C 6.7117 14.4011 6.7164 14.3906 6.72106 14.3803L 6.64947 14.3803L 6.86425 13.9835C 9.65636 7.79276 16.3861 5.25298 21.9703 8.26896C 24.6908 9.77696 26.6954 12.3167 27.6977 15.4915C 28.6284 18.6662 28.4852 21.9996 27.125 25.0156C 25.1204 29.4602 21.1112 32 16.9588 32C 15.3122 32 13.594 31.6032 12.0189 30.7301ZM 6.59522 13.8502C 9.45298 7.52723 16.3604 4.89819 22.1128 8.00502L 22.1157 8.00658C 24.9091 9.55495 26.9604 12.1596 27.9838 15.4011L 27.9856 15.4071C 28.9262 18.6299 28.7771 22.069 27.3984 25.139C 25.3489 29.6832 21.2376 32.3 16.9588 32.3C 15.2782 32.2981 13.4864 31.8832 11.8734 30.9925L 11.8686 30.9899C 10.2356 30.0431 8.78526 28.6911 7.69859 27.053C 6.71423 26.9497 5.99146 25.9496 5.99146 24.9363C 5.99146 23.7686 6.81335 22.8108 7.93809 22.8108C 8.97878 22.8108 9.89729 23.8392 9.74105 24.9612C 9.73503 25.1811 9.68306 25.3998 9.62679 25.5972C 10.5227 26.8682 11.5891 27.8879 12.8732 28.5591C 15.089 29.7106 17.5773 29.8634 19.859 29.0211C 22.2176 28.0975 24.0888 26.3304 25.1304 23.867L 25.1325 23.8621C 27.3659 18.8327 25.4714 12.7386 20.9701 10.2799C 18.7545 9.12946 16.2668 8.97724 13.9857 9.81974C 11.8668 10.6277 10.1178 12.2847 8.99313 14.4667L 13.3439 16.3109C 14.1882 15.1622 15.4978 14.3978 16.9588 14.3978C 19.5154 14.3978 21.5543 16.7049 21.5543 19.4599C 21.5543 22.2149 19.5154 24.5219 16.9588 24.5219C 14.4022 24.5219 12.3632 22.2149 12.3632 19.4599C 12.364 19.3185 12.3844 19.1772 12.4023 19.0581L 12.405 19.0405C 12.4104 19.0043 12.4156 18.9701 12.42 18.9373L 6.66059 16.4756L 6.64716 16.4682C 6.21685 16.2296 6.11427 15.7881 6.13506 15.3962C 6.14893 15.1659 6.20676 14.9157 6.28365 14.6803L 6.14593 14.6803L 6.59522 13.8502Z"/><path id="path2_fill" d="M 32.1281 10.0168C 32.1281 9.0063 31.3955 8.22899 30.4432 8.22899C 29.4908 8.22899 28.7582 9.0063 28.7582 10.0168C 28.7582 10.9496 29.4908 11.7269 30.3699 11.8046C 32.8607 16.3908 33.0805 22.0651 30.8827 26.8845C 29.0512 30.771 25.9743 33.6471 22.1648 34.9685C 18.3553 36.3677 14.2528 36.0567 10.6631 34.1912C 3.19062 30.3046 0.113724 20.666 3.7767 12.7374C 5.97448 7.9958 10.2968 4.73109 15.1319 3.95378C 15.425 4.34244 15.8645 4.57563 16.3773 4.57563C 17.3297 4.57563 18.0623 3.79832 18.0623 2.78782C 18.0623 1.77731 17.3297 1 16.3773 1C 15.718 1 15.2052 1.38866 14.9121 1.93277C 9.41768 2.78782 4.5093 6.51891 2.01847 11.8824C 0.0404656 16.2353 -0.252573 21.1324 1.21262 25.7185C 2.67781 30.3046 5.75471 33.958 9.78398 36.1345C 12.2015 37.3782 14.7656 38 17.2564 38C 23.5568 38 29.6373 34.2689 32.5677 27.895C 35.0585 22.4538 34.8387 16.0021 31.9816 10.7941C 32.0549 10.5609 32.1281 10.3277 32.1281 10.0168Z"/><path id="path3_fill" fill-rule="evenodd" d="M 2.01847 11.8824C 4.5093 6.51891 9.41768 2.78782 14.9121 1.93277C 15.2052 1.38866 15.718 1 16.3773 1C 17.3297 1 18.0623 1.77731 18.0623 2.78782C 18.0623 3.79832 17.3297 4.57563 16.3773 4.57563C 15.8645 4.57563 15.425 4.34244 15.1319 3.95378C 10.2968 4.73109 5.97448 7.9958 3.7767 12.7374C 0.113724 20.666 3.19062 30.3046 10.6631 34.1912C 14.2528 36.0567 18.3553 36.3677 22.1648 34.9685C 25.9743 33.6471 29.0512 30.771 30.8827 26.8845C 33.0805 22.0651 32.8607 16.3908 30.3699 11.8046C 29.4908 11.7269 28.7582 10.9496 28.7582 10.0168C 28.7582 9.0063 29.4908 8.22899 30.4432 8.22899C 31.3955 8.22899 32.1281 9.0063 32.1281 10.0168C 32.1281 10.3277 32.0549 10.5609 31.9816 10.7941C 34.8387 16.0021 35.0585 22.4538 32.5677 27.895C 29.6373 34.2689 23.5568 38 17.2564 38C 14.7656 38 12.2015 37.3782 9.78398 36.1345C 5.75471 33.958 2.67781 30.3046 1.21262 25.7185C -0.252573 21.1324 0.0404656 16.2353 2.01847 11.8824ZM 32.3055 10.7616C 32.3671 10.5546 32.4253 10.3129 32.4282 10.0168C 32.4282 8.85762 31.5777 7.929 30.4432 7.929C 29.3086 7.929 28.4582 8.85762 28.4582 10.0168C 28.4582 11.046 29.22 11.9138 30.1782 12.0817C 32.556 16.5609 32.747 22.072 30.6106 26.7582C 28.8103 30.5776 25.7926 33.3926 22.0665 34.6851L 22.0614 34.6869C 18.3336 36.0561 14.3187 35.7529 10.8016 33.925C 3.48056 30.1173 0.448866 20.6562 4.049 12.8634C 6.18072 8.26446 10.3461 5.08682 15.0118 4.27801C 15.3555 4.65311 15.8334 4.87564 16.3774 4.87564C 17.5119 4.87564 18.3623 3.94702 18.3623 2.78783C 18.3623 1.62863 17.5119 0.700012 16.3774 0.700012C 15.6422 0.700012 15.0697 1.10548 14.7243 1.65905C 9.18401 2.57177 4.25612 6.35189 1.74641 11.756L 1.74538 11.7583C -0.250678 16.1631 -0.55021 21.1697 0.926879 25.8098C 2.41557 30.4695 5.54358 34.1849 9.64143 36.3984L 9.64677 36.4012C 12.0969 37.6593 14.7301 38.2979 17.2565 38.3C 23.676 38.3 29.8618 34.4989 32.8403 28.0203C 35.3524 22.5326 35.1508 16.0338 32.3055 10.7616Z"/><path id="path4_fill" d="M 19.2915 2.5C 19.2915 3.88071 18.1722 5 16.7915 5C 15.4108 5 14.2915 3.88071 14.2915 2.5C 14.2915 1.11929 15.4108 0 16.7915 0C 18.1722 0 19.2915 1.11929 19.2915 2.5Z"/><path id="path5_fill" d="M 33.2915 10.5C 33.2915 11.8807 32.1722 13 30.7915 13C 29.4108 13 28.2915 11.8807 28.2915 10.5C 28.2915 9.11929 29.4108 8 30.7915 8C 32.1722 8 33.2915 9.11929 33.2915 10.5Z"/><path id="path6_fill" d="M 10.2915 25.5C 10.2915 26.8807 9.17222 28 7.7915 28C 6.41079 28 5.2915 26.8807 5.2915 25.5C 5.2915 24.1193 6.41079 23 7.7915 23C 9.17222 23 10.2915 24.1193 10.2915 25.5Z"/></defs></svg>' ); + add_menu_page( 'Distributor', 'Distributor', 'manage_options', 'distributor-settings', __NAMESPACE__ . '\network_settings_screen', 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbDpzcGFjZT0icHJlc2VydmUiIHN0eWxlPSJmaWxsLXJ1bGU6ZXZlbm9kZDtjbGlwLXJ1bGU6ZXZlbm9kZDtzdHJva2UtbGluZWpvaW46cm91bmQ7c3Ryb2tlLW1pdGVybGltaXQ6MiIgdmlld0JveD0iMTMuNCA4LjggNTczLjIgNTczLjIiPgogIDxwYXRoIGZpbGw9IiNhN2FhYWQiIGQ9Ik0xOTUuMTEzIDQxMS4wMzNjNDUuODM1IDQ2LjY5MiAxMTkuMTI0IDU4LjQ4OCAxNzguMzg3IDI0LjI3MyA3MC4yNjItNDAuNTY2IDk0LjM3MS0xMzAuNTQ0IDUzLjgwNi0yMDAuODA2LTQwLjU2Ni03MC4yNjItMTMwLjU0NC05NC4zNzEtMjAwLjgwNi01My44MDYtMTkuODczIDExLjQ3NC0zNi4wNTUgMjYuODk5LTQ4LjEyNCA0NC43MTVsNjQuNzIyIDMzLjE4NmMyMi4yMDEtMjUuNTkzIDU5Ljc5Ni0zMy43ODIgOTEuMjc5LTE3LjYzOSAzNy4wMDIgMTguOTczIDUxLjY0IDY0LjQxOCAzMi42NjcgMTAxLjQyMS0xOC45NzMgMzcuMDAyLTY0LjQxOCA1MS42NC0xMDEuNDIxIDMyLjY2Ny0zMS40ODMtMTYuMTQzLTQ2Ljc3Ni01MS40NS0zOC45NTEtODQuNDE1bC04MS43MDItNDEuODkyYy04LjgzOC00LjUzMi0xMi4zMzUtMTUuMzY3LTcuODE0LTI0LjIxMSAxNS41MTQtMzAuMzQ2IDM5LjY1OC01Ni43MTUgNzEuMzQ0LTc1LjAwOSA4Ny40NjktNTAuNSAxOTkuNDgyLTIwLjQ4NiAyNDkuOTgzIDY2Ljk4MyA1MC41IDg3LjQ2OSAyMC40ODYgMTk5LjQ4Mi02Ni45ODMgMjQ5Ljk4My03NS4yMzUgNDMuNDM3LTE2OC42MyAyNy4zMDctMjI1LjQxOS0zMy43MTctMTcuODA5IDMuNzc4LTM2Ljc5Ny00LjA1NS00Ni4zODctMjAuNjY2LTExLjkyMi0yMC42NDgtNC44MzctNDcuMDkxIDE1LjgxMi01OS4wMTIgMjAuNjQ4LTExLjkyMiA0Ny4wOTEtNC44MzYgNTkuMDEyIDE1LjgxMiA3Ljc3IDEzLjQ1OCA3LjQ2NiAyOS4zNzcuNTk1IDQyLjEzM1oiLz4KICA8cGF0aCBmaWxsPSIjYTdhYWFkIiBkPSJNMjYyLjIzNyA3Mi45ODVDMTQ4LjggOTEuMTAxIDYyIDE4OS40OTQgNjIgMzA4YzAgMTMxLjM1NiAxMDYuNjQ0IDIzOCAyMzggMjM4czIzOC0xMDYuNjQ0IDIzOC0yMzhjMC0zNC4wNTktNy4xNjgtNjYuNDU4LTIwLjA4LTk1Ljc2Ni0xNS4xMjEuOTktMzAuMzIzLTYuMDE0LTM5LjEzNy0xOS42MjYtMTIuOTU5LTIwLjAxNC03LjIzMS00Ni43ODMgMTIuNzgzLTU5Ljc0MiAyMC4wMTQtMTIuOTU4IDQ2Ljc4My03LjIzMSA1OS43NDIgMTIuNzgzIDEwLjA5NSAxNS41OTIgOC44NDkgMzUuMjg0LTEuNjU3IDQ5LjM1MkM1NjUuMjg4IDIyOS40NjEgNTc0IDI2Ny43MjEgNTc0IDMwOGMwIDE1MS4yMjUtMTIyLjc3NSAyNzQtMjc0IDI3NFMyNiA0NTkuMjI1IDI2IDMwOEMyNiAxNzAuNTM5IDEyNy40NDMgNTYuNTg0IDI1OS40ODcgMzYuOTggMjY1LjU5NCAyMC41MzMgMjgxLjQzOCA4LjggMzAwIDguOGMyMy44NDMgMCA0My4yIDE5LjM1NyA0My4yIDQzLjIgMCAyMy44NDMtMTkuMzU3IDQzLjItNDMuMiA0My4yLTE2LjIyOSAwLTMwLjM4LTguOTY4LTM3Ljc2My0yMi4yMTVaIi8+Cjwvc3ZnPgo=' ); } /** From d320ad8895dd793392cf2757787761a25a715cd3 Mon Sep 17 00:00:00 2001 From: zach-adams Date: Wed, 6 Sep 2023 20:38:54 -0600 Subject: [PATCH 13/24] Update block editor plugin icon --- assets/js/components/plugin-icon.js | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/assets/js/components/plugin-icon.js b/assets/js/components/plugin-icon.js index bd3772af5..2b3117b4b 100644 --- a/assets/js/components/plugin-icon.js +++ b/assets/js/components/plugin-icon.js @@ -2,22 +2,13 @@ import { SVG, Path } from '@wordpress/primitives'; const pluginIcon = ( - - - - - + + ); From 6b8d4b72b38a52a2bdd1fc611b53ecc9f6ae3921 Mon Sep 17 00:00:00 2001 From: Peter Wilson <519727+peterwilsoncc@users.noreply.github.com> Date: Thu, 7 Sep 2023 14:54:38 +1000 Subject: [PATCH 14/24] Improve check for unset post author to account for (int) 0. --- includes/classes/DistributorPost.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/classes/DistributorPost.php b/includes/classes/DistributorPost.php index 1a9c6c0fd..ce440013e 100644 --- a/includes/classes/DistributorPost.php +++ b/includes/classes/DistributorPost.php @@ -847,7 +847,7 @@ protected function to_insert( $args = array() ) { } // Additional data required for wp_insert_post(). - $insert['post_author'] = isset( $this->post->post_author ) ? $this->post->post_author : get_current_user_id(); + $insert['post_author'] = ! empty( $this->post->post_author ) ? $this->post->post_author : get_current_user_id(); // If the post has blocks, use the raw content. if ( $this->has_blocks() ) { From dcfcd64759300c05f2788f5c0765fcad1fb1b8a8 Mon Sep 17 00:00:00 2001 From: Peter Wilson <519727+peterwilsoncc@users.noreply.github.com> Date: Thu, 7 Sep 2023 14:57:40 +1000 Subject: [PATCH 15/24] Do not use external author ID for setting author. --- .../classes/ExternalConnections/WordPressExternalConnection.php | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/classes/ExternalConnections/WordPressExternalConnection.php b/includes/classes/ExternalConnections/WordPressExternalConnection.php index 99cf8d086..8c3c431e3 100644 --- a/includes/classes/ExternalConnections/WordPressExternalConnection.php +++ b/includes/classes/ExternalConnections/WordPressExternalConnection.php @@ -381,6 +381,7 @@ public function pull( $items ) { unset( $post_array['post_date_gmt'] ); unset( $post_array['post_modified'] ); unset( $post_array['post_modified_gmt'] ); + unset( $post_array['post_author'] ); if ( ! empty( $item_array['post_id'] ) ) { $update = true; From c316c464385399e8a385ef6179c4355f2fec7dbc Mon Sep 17 00:00:00 2001 From: Peter Wilson <519727+peterwilsoncc@users.noreply.github.com> Date: Fri, 8 Sep 2023 14:55:02 +1000 Subject: [PATCH 16/24] Remove `develop-v1` branch from workflow files. --- .github/workflows/cypress.yml | 3 +-- .github/workflows/lint.yml | 2 -- .github/workflows/test.yml | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 2d5e1dff9..b8b1a5fd0 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -4,12 +4,11 @@ on: push: branches: - develop - - develop-v1 - trunk pull_request: branches: - develop - - develop-v1 + jobs: build: name: NPM Install diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index fac984b2f..8c4917b62 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,12 +8,10 @@ on: push: branches: - develop - - develop-v1 - trunk pull_request: branches: - develop - - develop-v1 jobs: eslint: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fa78ef9a0..ca7acc32e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,12 +10,10 @@ on: push: branches: - develop - - develop-v1 - trunk pull_request: branches: - develop - - develop-v1 jobs: From 8458d4fff7c0e4827efe946afaec793209ad2b17 Mon Sep 17 00:00:00 2001 From: zach-adams Date: Mon, 11 Sep 2023 10:06:56 -0600 Subject: [PATCH 17/24] Move icon data string to utility functions --- includes/external-connection-cpt.php | 2 +- includes/settings.php | 2 +- includes/utils.php | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/includes/external-connection-cpt.php b/includes/external-connection-cpt.php index 48023e812..1e2fb01f8 100644 --- a/includes/external-connection-cpt.php +++ b/includes/external-connection-cpt.php @@ -662,7 +662,7 @@ function add_menu_item() { apply_filters( 'dt_capabilities', 'manage_options' ), 'distributor', __NAMESPACE__ . '\dashboard', - 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbDpzcGFjZT0icHJlc2VydmUiIHN0eWxlPSJmaWxsLXJ1bGU6ZXZlbm9kZDtjbGlwLXJ1bGU6ZXZlbm9kZDtzdHJva2UtbGluZWpvaW46cm91bmQ7c3Ryb2tlLW1pdGVybGltaXQ6MiIgdmlld0JveD0iMTMuNCA4LjggNTczLjIgNTczLjIiPgogIDxwYXRoIGZpbGw9IiNhN2FhYWQiIGQ9Ik0xOTUuMTEzIDQxMS4wMzNjNDUuODM1IDQ2LjY5MiAxMTkuMTI0IDU4LjQ4OCAxNzguMzg3IDI0LjI3MyA3MC4yNjItNDAuNTY2IDk0LjM3MS0xMzAuNTQ0IDUzLjgwNi0yMDAuODA2LTQwLjU2Ni03MC4yNjItMTMwLjU0NC05NC4zNzEtMjAwLjgwNi01My44MDYtMTkuODczIDExLjQ3NC0zNi4wNTUgMjYuODk5LTQ4LjEyNCA0NC43MTVsNjQuNzIyIDMzLjE4NmMyMi4yMDEtMjUuNTkzIDU5Ljc5Ni0zMy43ODIgOTEuMjc5LTE3LjYzOSAzNy4wMDIgMTguOTczIDUxLjY0IDY0LjQxOCAzMi42NjcgMTAxLjQyMS0xOC45NzMgMzcuMDAyLTY0LjQxOCA1MS42NC0xMDEuNDIxIDMyLjY2Ny0zMS40ODMtMTYuMTQzLTQ2Ljc3Ni01MS40NS0zOC45NTEtODQuNDE1bC04MS43MDItNDEuODkyYy04LjgzOC00LjUzMi0xMi4zMzUtMTUuMzY3LTcuODE0LTI0LjIxMSAxNS41MTQtMzAuMzQ2IDM5LjY1OC01Ni43MTUgNzEuMzQ0LTc1LjAwOSA4Ny40NjktNTAuNSAxOTkuNDgyLTIwLjQ4NiAyNDkuOTgzIDY2Ljk4MyA1MC41IDg3LjQ2OSAyMC40ODYgMTk5LjQ4Mi02Ni45ODMgMjQ5Ljk4My03NS4yMzUgNDMuNDM3LTE2OC42MyAyNy4zMDctMjI1LjQxOS0zMy43MTctMTcuODA5IDMuNzc4LTM2Ljc5Ny00LjA1NS00Ni4zODctMjAuNjY2LTExLjkyMi0yMC42NDgtNC44MzctNDcuMDkxIDE1LjgxMi01OS4wMTIgMjAuNjQ4LTExLjkyMiA0Ny4wOTEtNC44MzYgNTkuMDEyIDE1LjgxMiA3Ljc3IDEzLjQ1OCA3LjQ2NiAyOS4zNzcuNTk1IDQyLjEzM1oiLz4KICA8cGF0aCBmaWxsPSIjYTdhYWFkIiBkPSJNMjYyLjIzNyA3Mi45ODVDMTQ4LjggOTEuMTAxIDYyIDE4OS40OTQgNjIgMzA4YzAgMTMxLjM1NiAxMDYuNjQ0IDIzOCAyMzggMjM4czIzOC0xMDYuNjQ0IDIzOC0yMzhjMC0zNC4wNTktNy4xNjgtNjYuNDU4LTIwLjA4LTk1Ljc2Ni0xNS4xMjEuOTktMzAuMzIzLTYuMDE0LTM5LjEzNy0xOS42MjYtMTIuOTU5LTIwLjAxNC03LjIzMS00Ni43ODMgMTIuNzgzLTU5Ljc0MiAyMC4wMTQtMTIuOTU4IDQ2Ljc4My03LjIzMSA1OS43NDIgMTIuNzgzIDEwLjA5NSAxNS41OTIgOC44NDkgMzUuMjg0LTEuNjU3IDQ5LjM1MkM1NjUuMjg4IDIyOS40NjEgNTc0IDI2Ny43MjEgNTc0IDMwOGMwIDE1MS4yMjUtMTIyLjc3NSAyNzQtMjc0IDI3NFMyNiA0NTkuMjI1IDI2IDMwOEMyNiAxNzAuNTM5IDEyNy40NDMgNTYuNTg0IDI1OS40ODcgMzYuOTggMjY1LjU5NCAyMC41MzMgMjgxLjQzOCA4LjggMzAwIDguOGMyMy44NDMgMCA0My4yIDE5LjM1NyA0My4yIDQzLjIgMCAyMy44NDMtMTkuMzU3IDQzLjItNDMuMiA0My4yLTE2LjIyOSAwLTMwLjM4LTguOTY4LTM3Ljc2My0yMi4yMTVaIi8+Cjwvc3ZnPgo=' + Utils\get_admin_icon(), ); add_action( "load-$hook", __NAMESPACE__ . '\screen_option' ); diff --git a/includes/settings.php b/includes/settings.php index 224c81561..b25603dc6 100644 --- a/includes/settings.php +++ b/includes/settings.php @@ -306,7 +306,7 @@ function admin_menu() { * @since 1.2 */ function network_admin_menu() { - add_menu_page( 'Distributor', 'Distributor', 'manage_options', 'distributor-settings', __NAMESPACE__ . '\network_settings_screen', 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbDpzcGFjZT0icHJlc2VydmUiIHN0eWxlPSJmaWxsLXJ1bGU6ZXZlbm9kZDtjbGlwLXJ1bGU6ZXZlbm9kZDtzdHJva2UtbGluZWpvaW46cm91bmQ7c3Ryb2tlLW1pdGVybGltaXQ6MiIgdmlld0JveD0iMTMuNCA4LjggNTczLjIgNTczLjIiPgogIDxwYXRoIGZpbGw9IiNhN2FhYWQiIGQ9Ik0xOTUuMTEzIDQxMS4wMzNjNDUuODM1IDQ2LjY5MiAxMTkuMTI0IDU4LjQ4OCAxNzguMzg3IDI0LjI3MyA3MC4yNjItNDAuNTY2IDk0LjM3MS0xMzAuNTQ0IDUzLjgwNi0yMDAuODA2LTQwLjU2Ni03MC4yNjItMTMwLjU0NC05NC4zNzEtMjAwLjgwNi01My44MDYtMTkuODczIDExLjQ3NC0zNi4wNTUgMjYuODk5LTQ4LjEyNCA0NC43MTVsNjQuNzIyIDMzLjE4NmMyMi4yMDEtMjUuNTkzIDU5Ljc5Ni0zMy43ODIgOTEuMjc5LTE3LjYzOSAzNy4wMDIgMTguOTczIDUxLjY0IDY0LjQxOCAzMi42NjcgMTAxLjQyMS0xOC45NzMgMzcuMDAyLTY0LjQxOCA1MS42NC0xMDEuNDIxIDMyLjY2Ny0zMS40ODMtMTYuMTQzLTQ2Ljc3Ni01MS40NS0zOC45NTEtODQuNDE1bC04MS43MDItNDEuODkyYy04LjgzOC00LjUzMi0xMi4zMzUtMTUuMzY3LTcuODE0LTI0LjIxMSAxNS41MTQtMzAuMzQ2IDM5LjY1OC01Ni43MTUgNzEuMzQ0LTc1LjAwOSA4Ny40NjktNTAuNSAxOTkuNDgyLTIwLjQ4NiAyNDkuOTgzIDY2Ljk4MyA1MC41IDg3LjQ2OSAyMC40ODYgMTk5LjQ4Mi02Ni45ODMgMjQ5Ljk4My03NS4yMzUgNDMuNDM3LTE2OC42MyAyNy4zMDctMjI1LjQxOS0zMy43MTctMTcuODA5IDMuNzc4LTM2Ljc5Ny00LjA1NS00Ni4zODctMjAuNjY2LTExLjkyMi0yMC42NDgtNC44MzctNDcuMDkxIDE1LjgxMi01OS4wMTIgMjAuNjQ4LTExLjkyMiA0Ny4wOTEtNC44MzYgNTkuMDEyIDE1LjgxMiA3Ljc3IDEzLjQ1OCA3LjQ2NiAyOS4zNzcuNTk1IDQyLjEzM1oiLz4KICA8cGF0aCBmaWxsPSIjYTdhYWFkIiBkPSJNMjYyLjIzNyA3Mi45ODVDMTQ4LjggOTEuMTAxIDYyIDE4OS40OTQgNjIgMzA4YzAgMTMxLjM1NiAxMDYuNjQ0IDIzOCAyMzggMjM4czIzOC0xMDYuNjQ0IDIzOC0yMzhjMC0zNC4wNTktNy4xNjgtNjYuNDU4LTIwLjA4LTk1Ljc2Ni0xNS4xMjEuOTktMzAuMzIzLTYuMDE0LTM5LjEzNy0xOS42MjYtMTIuOTU5LTIwLjAxNC03LjIzMS00Ni43ODMgMTIuNzgzLTU5Ljc0MiAyMC4wMTQtMTIuOTU4IDQ2Ljc4My03LjIzMSA1OS43NDIgMTIuNzgzIDEwLjA5NSAxNS41OTIgOC44NDkgMzUuMjg0LTEuNjU3IDQ5LjM1MkM1NjUuMjg4IDIyOS40NjEgNTc0IDI2Ny43MjEgNTc0IDMwOGMwIDE1MS4yMjUtMTIyLjc3NSAyNzQtMjc0IDI3NFMyNiA0NTkuMjI1IDI2IDMwOEMyNiAxNzAuNTM5IDEyNy40NDMgNTYuNTg0IDI1OS40ODcgMzYuOTggMjY1LjU5NCAyMC41MzMgMjgxLjQzOCA4LjggMzAwIDguOGMyMy44NDMgMCA0My4yIDE5LjM1NyA0My4yIDQzLjIgMCAyMy44NDMtMTkuMzU3IDQzLjItNDMuMiA0My4yLTE2LjIyOSAwLTMwLjM4LTguOTY4LTM3Ljc2My0yMi4yMTVaIi8+Cjwvc3ZnPgo=' ); + add_menu_page( 'Distributor', 'Distributor', 'manage_options', 'distributor-settings', __NAMESPACE__ . '\network_settings_screen', Utils\get_admin_icon() ); } /** diff --git a/includes/utils.php b/includes/utils.php index 2c751ac63..41aa5b8df 100644 --- a/includes/utils.php +++ b/includes/utils.php @@ -1271,3 +1271,17 @@ function is_distributed_post( $post ) { $original_post_id = get_post_meta( $post_id, 'dt_original_post_id', true ); return ! empty( $original_post_id ); } + +/** + * Returns the admin icon in data URL base64 format. + * + * @since 2.0.1 + * + * @param string $color The hex color if changing the color of the icon. Default `#a0a5aa`. + * @return string Data URL base64 encoded SVG icon string. + */ +function get_admin_icon( $color = '#a0a5aa' ) { + $svg_icon = sprintf( '', $color ); + + return sprintf( 'data:image/svg+xml;base64,%s', base64_encode( $svg_icon ) ); +} From 3bf2dacd308d2dfd68cf386494140bad2372f6e4 Mon Sep 17 00:00:00 2001 From: Peter Wilson <519727+peterwilsoncc@users.noreply.github.com> Date: Thu, 14 Sep 2023 12:48:00 +1000 Subject: [PATCH 18/24] Account for switch to draft changes in WP 6.3. --- assets/css/gutenberg-syndicated-post.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/css/gutenberg-syndicated-post.scss b/assets/css/gutenberg-syndicated-post.scss index 4afcc4dad..f22160f00 100644 --- a/assets/css/gutenberg-syndicated-post.scss +++ b/assets/css/gutenberg-syndicated-post.scss @@ -47,6 +47,7 @@ body.dt-linked-post { .components-panel__body-toggle, .edit-post-post-visibility__toggle, + .editor-post-switch-to-draft, .editor-post-trash, .editor-post-publish-button, .edit-post-post-schedule__toggle, From 46a26fa0b00e3b428f45430e1426d5de5adf7621 Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Thu, 14 Sep 2023 15:36:40 -0500 Subject: [PATCH 19/24] version bump to 2.0.1 --- distributor.php | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- tests/php/bootstrap.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/distributor.php b/distributor.php index 76505a34b..15130d8e1 100644 --- a/distributor.php +++ b/distributor.php @@ -4,7 +4,7 @@ * Plugin URI: https://github.com/10up/distributor * Update URI: https://distributorplugin.com * Description: Makes it easy to distribute and reuse content across your websites, whether inside of a multisite or across the web. - * Version: 2.0.0 + * Version: 2.0.1 * Requires at least: 5.7 * Requires PHP: 7.4 * Author: 10up Inc. @@ -28,7 +28,7 @@ exit; // Exit if accessed directly. } -define( 'DT_VERSION', '2.0.0' ); +define( 'DT_VERSION', '2.0.1' ); define( 'DT_PLUGIN_FILE', preg_replace( '#^.*plugins/(.*)$#i', '$1', __FILE__ ) ); define( 'DT_PLUGIN_PATH', plugin_dir_path( __FILE__ ) ); define( 'DT_PLUGIN_FULL_FILE', __FILE__ ); diff --git a/package-lock.json b/package-lock.json index 35be79b87..8bf0b96a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "distributor", - "version": "2.0.0", + "version": "2.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "distributor", - "version": "2.0.0", + "version": "2.0.1", "license": "GPL-2.0-or-later", "dependencies": { "mustache": "^4.2.0" diff --git a/package.json b/package.json index 85171ba0e..f794b4662 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "distributor", - "version": "2.0.0", + "version": "2.0.1", "description": "Distributor is a WordPress plugin that makes it easy to distribute and reuse content across your websites — whether in a single multisite or across the web.", "author": { "name": "10up", diff --git a/tests/php/bootstrap.php b/tests/php/bootstrap.php index 87309de9f..d7e6c5675 100644 --- a/tests/php/bootstrap.php +++ b/tests/php/bootstrap.php @@ -10,7 +10,7 @@ WP_Mock::bootstrap(); define( 'DT_PLUGIN_PATH', dirname( __DIR__, 2 ) ); -define( 'DT_VERSION', '2.0.0' ); +define( 'DT_VERSION', '2.0.1' ); require_once __DIR__ . '/includes/common.php'; require_once __DIR__ . '/includes/TestCase.php'; From b7c8462d11f611d75fb8a7219b8f9bcf3c8abc5d Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Thu, 14 Sep 2023 16:28:43 -0500 Subject: [PATCH 20/24] add 2.0.1 items to CHANGELOG.md --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fd494815..a90379661 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file, per [the Ke ## [Unreleased] - TBD +## [2.0.1] - 2023-09-18 +### Changed +- Update from Cypress v10 to v13 (props [@dkotter](https://github.com/dkotter), [@iamdharmesh](https://github.com/iamdharmesh), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1128](https://github.com/10up/distributor/pull/1128)). +- Documentation updates (props [@jeffpaul](https://github.com/jeffpaul), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1131](https://github.com/10up/distributor/pull/1131)). + +### Removed +- GitHub Actions for version 1.x releases (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@jeffpaul](https://github.com/jeffpaul) via [#1135](https://github.com/10up/distributor/pull/1135)). + +### Fixed +- Invalid author IDs being set when pushing and pulling posts (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@faisal-alvi](https://github.com/faisal-alvi), [@margaretschneider](https://github.com/margaretschneider) via [#1133](https://github.com/10up/distributor/pull/1133)). +- Featured image delete push issue (props [@ravichdev](https://github.com/ravichdev), [@helen](https://github.com/helen), [@dkotter](https://github.com/dkotter), [@adamsilverstein](https://github.com/adamsilverstein), [@jeffpaul](https://github.com/jeffpaul), [@arsendovlatyan](https://github.com/arsendovlatyan), [@ravinderk](https://github.com/ravinderk), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#310](https://github.com/10up/distributor/pull/310)). +- Allow clicking on the `Save to draft`` confirmation modal buttons (props [@av3nger](https://github.com/av3nger), [@peterwilsoncc](https://github.com/peterwilsoncc), [@ravinderk](https://github.com/ravinderk), [@pdewouters](https://github.com/pdewouters) via [#1042](https://github.com/10up/distributor/pull/1042)). +- Admin icon has been updated so it has the same width and height (props [@zach-adams](https://github.com/zach-adams), [@ravinderk](https://github.com/ravinderk), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1132](https://github.com/10up/distributor/pull/1132)). +- Ensure our E2E tests pass on WordPress 6.3 (props [@dkotter](https://github.com/dkotter), [@iamdharmesh](https://github.com/iamdharmesh), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1128](https://github.com/10up/distributor/pull/1128)). + ## [2.0.0] - 2023-09-05 **Note that Distributor now requires PHP 7.4 or later and WordPress 5.7 or later.** @@ -471,6 +486,7 @@ This adds a post type selector when viewing the Pull Content list for both exter - Initial closed release. [Unreleased]: https://github.com/10up/distributor/compare/trunk...develop +[2.0.1]: https://github.com/10up/distributor/compare/2.0.0...2.0.1 [2.0.0]: https://github.com/10up/distributor/compare/1.9.1...2.0.0 [1.9.1]: https://github.com/10up/distributor/compare/1.9.0...1.9.1 [1.9.0]: https://github.com/10up/distributor/compare/1.8.0...1.9.0 From b3815d87b7d9e2dae833b31614a3cc2181faa5e5 Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Thu, 14 Sep 2023 16:34:05 -0500 Subject: [PATCH 21/24] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a90379661..b25acb288 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ All notable changes to this project will be documented in this file, per [the Ke - GitHub Actions for version 1.x releases (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@jeffpaul](https://github.com/jeffpaul) via [#1135](https://github.com/10up/distributor/pull/1135)). ### Fixed -- Invalid author IDs being set when pushing and pulling posts (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@faisal-alvi](https://github.com/faisal-alvi), [@margaretschneider](https://github.com/margaretschneider) via [#1133](https://github.com/10up/distributor/pull/1133)). +- Invalid author IDs being set when pushing and pulling posts (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@faisal-alvi](https://github.com/faisal-alvi), [@joemcgill](https://github.com/joemcgill), [@margaretschneider](https://github.com/margaretschneider) via [#1133](https://github.com/10up/distributor/pull/1133)). - Featured image delete push issue (props [@ravichdev](https://github.com/ravichdev), [@helen](https://github.com/helen), [@dkotter](https://github.com/dkotter), [@adamsilverstein](https://github.com/adamsilverstein), [@jeffpaul](https://github.com/jeffpaul), [@arsendovlatyan](https://github.com/arsendovlatyan), [@ravinderk](https://github.com/ravinderk), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#310](https://github.com/10up/distributor/pull/310)). - Allow clicking on the `Save to draft`` confirmation modal buttons (props [@av3nger](https://github.com/av3nger), [@peterwilsoncc](https://github.com/peterwilsoncc), [@ravinderk](https://github.com/ravinderk), [@pdewouters](https://github.com/pdewouters) via [#1042](https://github.com/10up/distributor/pull/1042)). - Admin icon has been updated so it has the same width and height (props [@zach-adams](https://github.com/zach-adams), [@ravinderk](https://github.com/ravinderk), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1132](https://github.com/10up/distributor/pull/1132)). From 6b0b731d9e6fc6a6f19903aa7389fe872d6aef9e Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Thu, 14 Sep 2023 16:34:08 -0500 Subject: [PATCH 22/24] Update CREDITS.md --- CREDITS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CREDITS.md b/CREDITS.md index 894a2396c..4c2753616 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -10,7 +10,7 @@ The following individuals are responsible for curating the list of issues, respo Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc. -[10up (@10up)](https://github.com/10up), [Taylor Lovett (@tlovett1)](https://github.com/tlovett1), [Zane Matthew (@zanematthew)](https://github.com/zanematthew), [Aaron Brazell (@technosailor)](https://github.com/technosailor), [Marco Pereirinha (@pereirinha)](https://github.com/pereirinha), [Joshua Abenazer (@joshuaabenazer)](https://github.com/joshuaabenazer), [Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Helen Hou-Sandí (@helen)](https://github.com/helen), [Chris Marslender (@cmmarslender)](https://github.com/cmmarslender), [Tom J Nowell (@tomjn)](https://github.com/tomjn), [Tim Nolte (@timnolte)](https://github.com/timnolte), [(@sericgoran)](https://github.com/sericgoran), [Jason Bahl (@jasonbahl)](https://github.com/jasonbahl), [Barry Ceelen (@barryceelen)](https://github.com/barryceelen), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Ben Greeley (@bengreeley)](https://github.com/bengreeley), [Robbie Trencheny (@robbiet480)](https://github.com/robbiet480), [Jake Goldman (@jakemgold)](https://github.com/jakemgold), [Stephanie Leary (@sillybean)](https://github.com/sillybean), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Echo (@ChaosExAnima)](https://github.com/ChaosExAnima), [Burhan Nasir (@burhandodhy)](https://github.com/burhandodhy), [Rebecca Hum (@rebeccahum)](https://github.com/rebeccahum), [Sean Hayes (@seanchayes)](https://github.com/seanchayes), [Jeremy Felt (@jeremyfelt)](https://github.com/jeremyfelt), [Gago (@madmax3365)](https://github.com/madmax3365), [Ivan Kruchkoff(@)](https://github.com/ivankruchkoff), [Sérgio Santos (@s3rgiosan)](https://github.com/s3rgiosan), [Ravi Chandra (@ravichdev)](https://github.com/ravichdev), [Jay Hoffmann (@JasonHoffmann)](https://github.com/JasonHoffmann), [Arsen Dovlatyan (@arsendovlatyan)](https://github.com/arsendovlatyan), [Jeroen Sormani (@JeroenSormani)](https://github.com/JeroenSormani), [Ritesh Patel (@Ritesh-patel)](https://github.com/Ritesh-patel), [Gary Thayer (@gthayer)](https://github.com/gthayer), [Evan Mattson (@aaemnnosttv)](https://github.com/aaemnnosttv), [Nate Allen (@nate-allen)](https://github.com/nate-allen), [Michael Phillips (@mphillips)](https://github.com/mphillips), [Jay Wood (@JayWood)](https://github.com/JayWood), [Dreb Bits (@drebbits)](https://github.com/drebbits), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Matthew McAchran (@mmcachran)](https://github.com/mmcachran), [Ulrich Pogson (@grappler)](https://github.com/grappler), [(@avag-novembit)](https://github.com/avag-novembit), [Manuel Razzari (@mrazzari)](https://github.com/mrazzari), [Moe Browne (@moebrowne)](https://github.com/moebrowne), [Dave McHale (@dmchale)](https://github.com/dmchale), [Tommy Ferry (@tommyferry)](https://github.com/tommyferry), [Pete Nelson (@petenelson)](https://github.com/petenelson), [Alexander Berthelsen (@lakrisgubben)](https://github.com/lakrisgubben), [John Watkins (@johnwatkins0)](https://github.com/johnwatkins0), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Darío Hereñú (@kant)](https://github.com/kant), [Arman Hovhannisyan (@ahovhannissian)](https://github.com/ahovhannissian), [John Spellman (@jspellman814)](https://github.com/jspellman814), [Oszkar Nagy (@oszkarnagy)](https://github.com/oszkarnagy), [Sami Keijonen (@samikeijonen)](https://github.com/samikeijonen), [(@PaddyWhacks)](https://github.com/PaddyWhacks), [(@eriktad)](https://github.com/eriktad), [(@dmaslogh)](https://github.com/dmaslogh), [Kevin Pudlo (@Kpudlo)](https://github.com/Kpudlo), [Barrett Golding (@hearvox)](https://github.com/hearvox), [Rob Marscher (@rmarscher)](https://github.com/rmarscher), [Ivan Lopez (@ivanlopez)](https://github.com/ivanlopez), [Catherine Cavanagh (@biggiebangle)](https://github.com/biggiebangle), [Tommy Ferry (@pragmatic-tf)](https://github.com/pragmatic-tf), [Joshua Walker (@jshwlkr)](https://github.com/jshwlkr), [Caleb Burks (@WPprodigy)](https://github.com/WPprodigy), [(@jonny-bull)](https://github.com/jonny-bull), [Ricky Lee Whittemore (@rickalee)](https://github.com/rickalee), [Rob Cain (@robcain)](https://github.com/robcain), [(@j0HnC0untry)](https://github.com/j0HnC0untry), [(@dfardon)](https://github.com/dfardon), [(@anilpainuly121)](https://github.com/anilpainuly121), [(@vimalagarwalasentech)](https://github.com/vimalagarwalasentech), [Chris Wieber (@cdwieber)](https://github.com/cdwieber), [Dhanendran Rajagopal (@dhanendran)](https://github.com/dhanendran), [Andrew Ortolano (@andrewortolano)](https://github.com/andrewortolano), [(@xyralothep)](https://github.com/xyralothep), [Garth Gutenberg (@ggutenberg)](https://github.com/ggutenberg), [Jaime Martínez (@jmslbam)](https://github.com/jmslbam), [Francisco Domo (@francisco-domo)](https://github.com/francisco-domo), [Elliott Stocks (@elliott-stocks)](https://github.com/elliott-stocks), [David Purdy (@davidmpurdy)](https://github.com/davidmpurdy), [(@zacnboat)](https://github.com/zacnboat), [Spencer Brower (@sbrow)](https://github.com/sbrow), [Ross Pickerill (@rosspbauer)](https://github.com/rosspbauer), [Jackie Kjome (@JackieKjome)](https://github.com/JackieKjome), [SieBer15 (@SieBer15)](https://github.com/SieBer15), [Pascal Knecht (@pascalknecht)](https://github.com/pascalknecht), [Justin Young (@justiny)](https://github.com/justiny), [Johan Pretorius (@Drmzindec)](https://github.com/Drmzindec), [Clayton Collie (@claytoncollie)](https://github.com/claytoncollie), [Max Lyuchin (@cadic)](https://github.com/cadic), [Joe Grainger (@jjgrainger)](https://github.com/jjgrainger), [Lily Bonney](https://www.linkedin.com/in/lilybonney/), [Mollie Pugh](https://www.linkedin.com/in/molliepugh/), [Martina Haines](https://www.linkedin.com/in/martinahaines/), [Luca Ricci (@theskinnyghost)](https://github.com/theskinnyghost), [Lucy Bowe (@LucyTurtle)](https://github.com/LucyTurtle), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [(@jmstew3)](https://github.com/jmstew3), [Phil Crumm (@pcrumm)](https://github.com/pcrumm), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Will Skora (@skorasaurus)](https://github.com/skorasaurus), [Mohit Dadhich (@mohitwp)](https://github.com/mohitwp), [Will Howat-Comandré (@willhowat)](https://github.com/willhowat), [@Borkent](https://github.com/Borkent), [Dishit Pala (@dishitpala)](https://github.com/dishitpala), [@markusvisse](https://github.com/markusvisse), [@MonsterKing](https://github.com/MonsterKing), [James Morrison (@jamesmorrison)](https://github.com/jamesmorrison), [Mehul Kaklotar (@mehulkaklotar)](https://github.com/mehulkaklotar), [@espechtcfe](https://github.com/espechtcfe), [@romeowski](https://github.com/romeowski), [@vlastaw](https://github.com/vlastaw), [Jamie Adams (@jadamsbit)](https://github.com/jadamsbit), [Yoni Bee (@ybalkind)](https://github.com/ybalkind), [Akshit Sethi (@akshitsethi)](https://github.com/akshitsethi), [Vikram (@vikrampm1)](https://github.com/vikrampm1), [Josh Wilson (@joshwilsondotme)](https://github.com/joshwilsondotme), [Groupe-Mgel (@Groupe-Mgel)](https://github.com/Groupe-Mgel), [Emma (@emmawenger)](https://github.com/emmawenger), [@bcobin](https://github.com/bcobin), [@alexwolk](https://github.com/alexwolk), [Maxime Freschard (@ligne13)](https://github.com/ligne13), [Shazahan Kabir Saju (@sksaju)](https://github.com/sksaju), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [@Pitemedia](https://github.com/Pitemedia), [Michal Letavka (@michalletavka)](https://github.com/michalletavka), [@shu05](https://github.com/shu05), [Lukas Pawlik (@lukaspawlik)](https://github.com/lukaspawlik), [Amal Ajith PM (@amalajith)](https://github.com/amalajith), [Paul de Wouters (@pdewouters)](https://github.com/pdewouters), [Andre Gagnon (@andygagnon)](https://github.com/andygagnon), [Ravinder Kumar (@ravinderk)](https://github.com/ravinderk), [mapamond (@mapamond)](https://github.com/mapamond), [Giorgos Sarigiannidis (@gsarig)](https://github.com/gsarig), [Dan Maby (@danmaby)](https://github.com/danmaby), [Tim Gieseking (@timstl)](https://github.com/timstl), [David Chandra Purnama (@turtlepod)](https://github.com/turtlepod), [Manolo Bevia (@manolobevia)](https://github.com/manolobevia), [madriverweb (@madriverweb)](https://github.com/madriverweb), [ale8521 (@ale8521)](https://github.com/ale8521), [roshniahuja (@roshniahuja)](https://github.com/roshniahuja), [Jayedul K. (@jayedul)](https://github.com/jayedul), [Konstantinos Galanakis (@kmgalanakis-sage)](https://github.com/kmgalanakis-sage), [Seth Rubenstein (@sethrubenstein)](https://github.com/sethrubenstein), [Harshal Kadu (@QAharshalkadu)](https://github.com/QAharshalkadu). +[10up (@10up)](https://github.com/10up), [Taylor Lovett (@tlovett1)](https://github.com/tlovett1), [Zane Matthew (@zanematthew)](https://github.com/zanematthew), [Aaron Brazell (@technosailor)](https://github.com/technosailor), [Marco Pereirinha (@pereirinha)](https://github.com/pereirinha), [Joshua Abenazer (@joshuaabenazer)](https://github.com/joshuaabenazer), [Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Helen Hou-Sandí (@helen)](https://github.com/helen), [Chris Marslender (@cmmarslender)](https://github.com/cmmarslender), [Tom J Nowell (@tomjn)](https://github.com/tomjn), [Tim Nolte (@timnolte)](https://github.com/timnolte), [(@sericgoran)](https://github.com/sericgoran), [Jason Bahl (@jasonbahl)](https://github.com/jasonbahl), [Barry Ceelen (@barryceelen)](https://github.com/barryceelen), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Ben Greeley (@bengreeley)](https://github.com/bengreeley), [Robbie Trencheny (@robbiet480)](https://github.com/robbiet480), [Jake Goldman (@jakemgold)](https://github.com/jakemgold), [Stephanie Leary (@sillybean)](https://github.com/sillybean), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Echo (@ChaosExAnima)](https://github.com/ChaosExAnima), [Burhan Nasir (@burhandodhy)](https://github.com/burhandodhy), [Rebecca Hum (@rebeccahum)](https://github.com/rebeccahum), [Sean Hayes (@seanchayes)](https://github.com/seanchayes), [Jeremy Felt (@jeremyfelt)](https://github.com/jeremyfelt), [Gago (@madmax3365)](https://github.com/madmax3365), [Ivan Kruchkoff(@)](https://github.com/ivankruchkoff), [Sérgio Santos (@s3rgiosan)](https://github.com/s3rgiosan), [Ravi Chandra (@ravichdev)](https://github.com/ravichdev), [Jay Hoffmann (@JasonHoffmann)](https://github.com/JasonHoffmann), [Arsen Dovlatyan (@arsendovlatyan)](https://github.com/arsendovlatyan), [Jeroen Sormani (@JeroenSormani)](https://github.com/JeroenSormani), [Ritesh Patel (@Ritesh-patel)](https://github.com/Ritesh-patel), [Gary Thayer (@gthayer)](https://github.com/gthayer), [Evan Mattson (@aaemnnosttv)](https://github.com/aaemnnosttv), [Nate Allen (@nate-allen)](https://github.com/nate-allen), [Michael Phillips (@mphillips)](https://github.com/mphillips), [Jay Wood (@JayWood)](https://github.com/JayWood), [Dreb Bits (@drebbits)](https://github.com/drebbits), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Matthew McAchran (@mmcachran)](https://github.com/mmcachran), [Ulrich Pogson (@grappler)](https://github.com/grappler), [(@avag-novembit)](https://github.com/avag-novembit), [Manuel Razzari (@mrazzari)](https://github.com/mrazzari), [Moe Browne (@moebrowne)](https://github.com/moebrowne), [Dave McHale (@dmchale)](https://github.com/dmchale), [Tommy Ferry (@tommyferry)](https://github.com/tommyferry), [Pete Nelson (@petenelson)](https://github.com/petenelson), [Alexander Berthelsen (@lakrisgubben)](https://github.com/lakrisgubben), [John Watkins (@johnwatkins0)](https://github.com/johnwatkins0), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Darío Hereñú (@kant)](https://github.com/kant), [Arman Hovhannisyan (@ahovhannissian)](https://github.com/ahovhannissian), [John Spellman (@jspellman814)](https://github.com/jspellman814), [Oszkar Nagy (@oszkarnagy)](https://github.com/oszkarnagy), [Sami Keijonen (@samikeijonen)](https://github.com/samikeijonen), [(@PaddyWhacks)](https://github.com/PaddyWhacks), [(@eriktad)](https://github.com/eriktad), [(@dmaslogh)](https://github.com/dmaslogh), [Kevin Pudlo (@Kpudlo)](https://github.com/Kpudlo), [Barrett Golding (@hearvox)](https://github.com/hearvox), [Rob Marscher (@rmarscher)](https://github.com/rmarscher), [Ivan Lopez (@ivanlopez)](https://github.com/ivanlopez), [Catherine Cavanagh (@biggiebangle)](https://github.com/biggiebangle), [Tommy Ferry (@pragmatic-tf)](https://github.com/pragmatic-tf), [Joshua Walker (@jshwlkr)](https://github.com/jshwlkr), [Caleb Burks (@WPprodigy)](https://github.com/WPprodigy), [(@jonny-bull)](https://github.com/jonny-bull), [Ricky Lee Whittemore (@rickalee)](https://github.com/rickalee), [Rob Cain (@robcain)](https://github.com/robcain), [(@j0HnC0untry)](https://github.com/j0HnC0untry), [(@dfardon)](https://github.com/dfardon), [(@anilpainuly121)](https://github.com/anilpainuly121), [(@vimalagarwalasentech)](https://github.com/vimalagarwalasentech), [Chris Wieber (@cdwieber)](https://github.com/cdwieber), [Dhanendran Rajagopal (@dhanendran)](https://github.com/dhanendran), [Andrew Ortolano (@andrewortolano)](https://github.com/andrewortolano), [(@xyralothep)](https://github.com/xyralothep), [Garth Gutenberg (@ggutenberg)](https://github.com/ggutenberg), [Jaime Martínez (@jmslbam)](https://github.com/jmslbam), [Francisco Domo (@francisco-domo)](https://github.com/francisco-domo), [Elliott Stocks (@elliott-stocks)](https://github.com/elliott-stocks), [David Purdy (@davidmpurdy)](https://github.com/davidmpurdy), [(@zacnboat)](https://github.com/zacnboat), [Spencer Brower (@sbrow)](https://github.com/sbrow), [Ross Pickerill (@rosspbauer)](https://github.com/rosspbauer), [Jackie Kjome (@JackieKjome)](https://github.com/JackieKjome), [SieBer15 (@SieBer15)](https://github.com/SieBer15), [Pascal Knecht (@pascalknecht)](https://github.com/pascalknecht), [Justin Young (@justiny)](https://github.com/justiny), [Johan Pretorius (@Drmzindec)](https://github.com/Drmzindec), [Clayton Collie (@claytoncollie)](https://github.com/claytoncollie), [Max Lyuchin (@cadic)](https://github.com/cadic), [Joe Grainger (@jjgrainger)](https://github.com/jjgrainger), [Lily Bonney](https://www.linkedin.com/in/lilybonney/), [Mollie Pugh](https://www.linkedin.com/in/molliepugh/), [Martina Haines](https://www.linkedin.com/in/martinahaines/), [Luca Ricci (@theskinnyghost)](https://github.com/theskinnyghost), [Lucy Bowe (@LucyTurtle)](https://github.com/LucyTurtle), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [(@jmstew3)](https://github.com/jmstew3), [Phil Crumm (@pcrumm)](https://github.com/pcrumm), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Will Skora (@skorasaurus)](https://github.com/skorasaurus), [Mohit Dadhich (@mohitwp)](https://github.com/mohitwp), [Will Howat-Comandré (@willhowat)](https://github.com/willhowat), [@Borkent](https://github.com/Borkent), [Dishit Pala (@dishitpala)](https://github.com/dishitpala), [@markusvisse](https://github.com/markusvisse), [@MonsterKing](https://github.com/MonsterKing), [James Morrison (@jamesmorrison)](https://github.com/jamesmorrison), [Mehul Kaklotar (@mehulkaklotar)](https://github.com/mehulkaklotar), [@espechtcfe](https://github.com/espechtcfe), [@romeowski](https://github.com/romeowski), [@vlastaw](https://github.com/vlastaw), [Jamie Adams (@jadamsbit)](https://github.com/jadamsbit), [Yoni Bee (@ybalkind)](https://github.com/ybalkind), [Akshit Sethi (@akshitsethi)](https://github.com/akshitsethi), [Vikram (@vikrampm1)](https://github.com/vikrampm1), [Josh Wilson (@joshwilsondotme)](https://github.com/joshwilsondotme), [Groupe-Mgel (@Groupe-Mgel)](https://github.com/Groupe-Mgel), [Emma (@emmawenger)](https://github.com/emmawenger), [@bcobin](https://github.com/bcobin), [@alexwolk](https://github.com/alexwolk), [Maxime Freschard (@ligne13)](https://github.com/ligne13), [Shazahan Kabir Saju (@sksaju)](https://github.com/sksaju), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [@Pitemedia](https://github.com/Pitemedia), [Michal Letavka (@michalletavka)](https://github.com/michalletavka), [@shu05](https://github.com/shu05), [Lukas Pawlik (@lukaspawlik)](https://github.com/lukaspawlik), [Amal Ajith PM (@amalajith)](https://github.com/amalajith), [Paul de Wouters (@pdewouters)](https://github.com/pdewouters), [Andre Gagnon (@andygagnon)](https://github.com/andygagnon), [Ravinder Kumar (@ravinderk)](https://github.com/ravinderk), [mapamond (@mapamond)](https://github.com/mapamond), [Giorgos Sarigiannidis (@gsarig)](https://github.com/gsarig), [Dan Maby (@danmaby)](https://github.com/danmaby), [Tim Gieseking (@timstl)](https://github.com/timstl), [David Chandra Purnama (@turtlepod)](https://github.com/turtlepod), [Manolo Bevia (@manolobevia)](https://github.com/manolobevia), [madriverweb (@madriverweb)](https://github.com/madriverweb), [ale8521 (@ale8521)](https://github.com/ale8521), [roshniahuja (@roshniahuja)](https://github.com/roshniahuja), [Jayedul K. (@jayedul)](https://github.com/jayedul), [Konstantinos Galanakis (@kmgalanakis-sage)](https://github.com/kmgalanakis-sage), [Seth Rubenstein (@sethrubenstein)](https://github.com/sethrubenstein), [Harshal Kadu (@QAharshalkadu)](https://github.com/QAharshalkadu), [Joe McGill (@joemcgill)](https://github.com/joemcgill), [Margaret Schneider (@margaretschneider)](https://github.com/margaretschneider), [Anton Vanyukov (@av3nger)](https://github.com/av3nger), [Zach Adams (@zach-adams)](https://github.com/zach-adams). ## Libraries From ef21c5d4c72e977e93728724ec8220ccad4dbaac Mon Sep 17 00:00:00 2001 From: Peter Wilson <519727+peterwilsoncc@users.noreply.github.com> Date: Tue, 19 Sep 2023 11:50:30 +1000 Subject: [PATCH 23/24] Fix markdown formatting. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b25acb288..651ca48d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ All notable changes to this project will be documented in this file, per [the Ke ### Fixed - Invalid author IDs being set when pushing and pulling posts (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@faisal-alvi](https://github.com/faisal-alvi), [@joemcgill](https://github.com/joemcgill), [@margaretschneider](https://github.com/margaretschneider) via [#1133](https://github.com/10up/distributor/pull/1133)). - Featured image delete push issue (props [@ravichdev](https://github.com/ravichdev), [@helen](https://github.com/helen), [@dkotter](https://github.com/dkotter), [@adamsilverstein](https://github.com/adamsilverstein), [@jeffpaul](https://github.com/jeffpaul), [@arsendovlatyan](https://github.com/arsendovlatyan), [@ravinderk](https://github.com/ravinderk), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#310](https://github.com/10up/distributor/pull/310)). -- Allow clicking on the `Save to draft`` confirmation modal buttons (props [@av3nger](https://github.com/av3nger), [@peterwilsoncc](https://github.com/peterwilsoncc), [@ravinderk](https://github.com/ravinderk), [@pdewouters](https://github.com/pdewouters) via [#1042](https://github.com/10up/distributor/pull/1042)). +- Allow clicking on the `Save to draft` confirmation modal buttons (props [@av3nger](https://github.com/av3nger), [@peterwilsoncc](https://github.com/peterwilsoncc), [@ravinderk](https://github.com/ravinderk), [@pdewouters](https://github.com/pdewouters) via [#1042](https://github.com/10up/distributor/pull/1042)). - Admin icon has been updated so it has the same width and height (props [@zach-adams](https://github.com/zach-adams), [@ravinderk](https://github.com/ravinderk), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1132](https://github.com/10up/distributor/pull/1132)). - Ensure our E2E tests pass on WordPress 6.3 (props [@dkotter](https://github.com/dkotter), [@iamdharmesh](https://github.com/iamdharmesh), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1128](https://github.com/10up/distributor/pull/1128)). From 24aa66f76ffb85667b99c7be1e3464a5d4ee877f Mon Sep 17 00:00:00 2001 From: Dharmesh Patel Date: Tue, 19 Sep 2023 10:52:27 +0530 Subject: [PATCH 24/24] Bump version in readme.txt. --- readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index f91f92d2e..a81a98a9b 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: content, distribution, syndication, management Requires at least: 5.7 Tested up to: 6.3 Requires PHP: 7.4 -Stable tag: 2.0.0 +Stable tag: 2.0.1 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html