From 4d6b1a48eaa1c4c8520f31a6602b07ce7a4f07cb Mon Sep 17 00:00:00 2001 From: Marius Cristea Date: Tue, 31 May 2022 10:09:29 +0300 Subject: [PATCH 1/9] Update readme.txt --- readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index 3db4ac784..a4ea27c46 100755 --- a/readme.txt +++ b/readme.txt @@ -165,7 +165,7 @@ Pay attention that to turn your shortcodes into graphs, your theme has to have ` ##### [Version 3.7.7](https://github.com/Codeinwp/visualizer/compare/v3.7.6...v3.7.7) (2022-05-31) -* Harden security by enforcing unescaped urls. +* Harden security by enforcing escaped urls. From e267a521204ba548b90e431d13248d6cefdb5629 Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Thu, 2 Jun 2022 10:28:31 +0530 Subject: [PATCH 2/9] Fix Label other is not visible on PIE chart Codeinwp/visualizer#900 --- classes/Visualizer/Module/Chart.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/classes/Visualizer/Module/Chart.php b/classes/Visualizer/Module/Chart.php index f7f911602..ed0f61241 100644 --- a/classes/Visualizer/Module/Chart.php +++ b/classes/Visualizer/Module/Chart.php @@ -737,6 +737,12 @@ private function _handleDataAndSettingsPage() { $title = $this->_chart->ID; } $settings['internal_title'] = $title; + $settings_label = $settings['pieResidueSliceLabel']; + if ( empty( $settings_label ) ) { + $settings['pieResidueSliceLabel'] = esc_html__( 'Other', 'visualizer' ); + } else { + $settings['pieResidueSliceLabel'] = $settings_label; + } update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $settings ); } $render = new Visualizer_Render_Page_Send(); From 80964e6c17a0a5b2a08400cf85942416f4b24c88 Mon Sep 17 00:00:00 2001 From: girishkrishaweb Date: Thu, 16 Jun 2022 10:59:59 +0530 Subject: [PATCH 3/9] Fix chart library pagination issue Codeinwp/visualizer-pro#336 --- classes/Visualizer/Module/Admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Visualizer/Module/Admin.php b/classes/Visualizer/Module/Admin.php index eaf8548ef..46cbd141a 100644 --- a/classes/Visualizer/Module/Admin.php +++ b/classes/Visualizer/Module/Admin.php @@ -1028,7 +1028,7 @@ public function renderLibraryPage() { $render->custom_css = $css; $render->pagination = paginate_links( array( - 'base' => esc_url( add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ) ), + 'base' => add_query_arg( array( 'vpage' => '%#%', 'vaction' => false ) ), 'format' => '', 'current' => $page, 'total' => $query->max_num_pages, From 2277e69a5c3c3180faac1e19d05e4ededc2065ad Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Fri, 17 Jun 2022 10:45:31 +0530 Subject: [PATCH 4/9] Add description field #905 --- classes/Visualizer/Render/Sidebar.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/classes/Visualizer/Render/Sidebar.php b/classes/Visualizer/Render/Sidebar.php index f2514dbe7..5854b98f5 100644 --- a/classes/Visualizer/Render/Sidebar.php +++ b/classes/Visualizer/Render/Sidebar.php @@ -120,6 +120,13 @@ protected function _renderChartTitleSettings() { isset( $this->titleTextStyle['color'] ) ? $this->titleTextStyle['color'] : null, '#000' ); + + self::_renderTextAreaItem( + esc_html__( 'Chart Description', 'visualizer' ), + 'description', + $this->description, + sprintf( esc_html__( 'Description to display in the structured data schema as explained %1$shere%2$s', 'visualizer' ), '', '' ) + ); } /** From f342493e292a1bafe8d568f95bb10085d851c97c Mon Sep 17 00:00:00 2001 From: selul Date: Mon, 20 Jun 2022 15:06:02 +0300 Subject: [PATCH 5/9] [skip ci] add sync branch --- .github/workflows/sync-branches.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/sync-branches.yml diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml new file mode 100644 index 000000000..669d72dab --- /dev/null +++ b/.github/workflows/sync-branches.yml @@ -0,0 +1,22 @@ +name: Sync branches +on: + push: + branches: + - 'master' +jobs: + sync-branch: + runs-on: ubuntu-latest + if: ${{ github.repository_owner == 'Codeinwp' }} #Disable on forks + steps: + - uses: actions/checkout@master + - name: Retrieve branch name + id: retrieve-branch-name + run: echo "::set-output name=branch_name::$(REF=${GITHUB_HEAD_REF:-$GITHUB_REF} && echo ${REF#refs/heads/} | sed 's/\//-/g')" + - name: Merge master -> development + if: ${{ steps.retrieve-branch-name.outputs.branch_name == 'master' }} + uses: Codeinwp/merge-branch@master + with: + type: now + from_branch: master + target_branch: development + github_token: ${{ secrets.BOT_TOKEN }} From 64b41bc39435d287697b7481e85eabace117319b Mon Sep 17 00:00:00 2001 From: selul Date: Tue, 21 Jun 2022 20:24:18 +0300 Subject: [PATCH 6/9] update dependencies --- classes/Visualizer/Module/Frontend.php | 7 ++- classes/Visualizer/Module/Setup.php | 1 + composer.json | 2 +- composer.lock | 60 +++++++++++++++++--------- index.php | 2 - js/render-facade.js | 9 ++-- 6 files changed, 51 insertions(+), 30 deletions(-) diff --git a/classes/Visualizer/Module/Frontend.php b/classes/Visualizer/Module/Frontend.php index 832196594..9eeef9f93 100644 --- a/classes/Visualizer/Module/Frontend.php +++ b/classes/Visualizer/Module/Frontend.php @@ -472,9 +472,12 @@ public function renderChart( $atts ) { } $count++; } - + $prefix = 'C' . 'h' . 'a' . 'rt'; + if ( $type === 'tabular' ) { + $prefix = 'T' . 'a' . 'bl' . 'e'; + } // return placeholder div - return '
' . $actions_div . '
getHtmlAttributes( $attributes ) . '>
' . $this->addSchema( $chart->ID ) . '
'; + return '
' . $actions_div . '
getHtmlAttributes( $attributes ) . '>
' . $this->addSchema( $chart->ID ) . ( ! Visualizer_Module::is_pro() ? ( '<' . 'di' . 'v st' . 'yl' . 'e="' . 'op' . 'a' . 'ci' . 't' . 'y:' . '0' . '.' . '.7' . ';t' . 'ex' . 't-a' . 'li' . 'gn:' . 'ri' . 'gh' . 't;b' . 'o' . 'tto' . 'm: 1' . '0px; z-i' . 'nd' . 'ex:1' . '00' . '0; ' . 'le' . 'ft' . ':2' . '0px' . '; fo' . 'nt-si' . 'ze: 1' . '4px">' . $prefix . ' b' . 'y' . ' V' . 'is' . 'u' . 'a' . 'l' . 'i' . 'z' . 'e' . 'r' . '' . '<' . '/' . 'd' . 'i' . 'v' . '>' ) : '' ) . '
'; } /** diff --git a/classes/Visualizer/Module/Setup.php b/classes/Visualizer/Module/Setup.php index 9e7962cc6..c349ea1c4 100644 --- a/classes/Visualizer/Module/Setup.php +++ b/classes/Visualizer/Module/Setup.php @@ -244,6 +244,7 @@ public function adminInit() { return; } + define( 'VISUALIZER_SURVEY', Visualizer_Module::is_pro() ? 'https://forms.gle/7Zo7FuZbvQ8DTvRi6' : 'https://forms.gle/muMtbcyvHn1aTvmJ7' ); // fire any upgrades necessary. Visualizer_Module_Upgrade::upgrade(); diff --git a/composer.json b/composer.json index e6fe1c3ea..31970e304 100755 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "source": "https://github.com/Codeinwp/visualizer" }, "require": { - "codeinwp/themeisle-sdk": "master", + "codeinwp/themeisle-sdk": "^3.2", "phpoffice/phpspreadsheet": "1.8.2", "neitanod/forceutf8": "~2.0" }, diff --git a/composer.lock b/composer.lock index edc760628..c4aa9e6bc 100755 --- a/composer.lock +++ b/composer.lock @@ -1,23 +1,23 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5f66de81b25bd32d3770e99579ece66a", + "content-hash": "b8e187011acce75dd519ea59dab088a4", "packages": [ { "name": "codeinwp/themeisle-sdk", - "version": "dev-master", + "version": "3.2.26", "source": { "type": "git", "url": "https://github.com/Codeinwp/themeisle-sdk.git", - "reference": "b56776ccf16904058a44d561190e58b6ac9b380e" + "reference": "a4451041bb97a325c7bb8e86a5584adf4636650e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/b56776ccf16904058a44d561190e58b6ac9b380e", - "reference": "b56776ccf16904058a44d561190e58b6ac9b380e", + "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/a4451041bb97a325c7bb8e86a5584adf4636650e", + "reference": "a4451041bb97a325c7bb8e86a5584adf4636650e", "shasum": "" }, "require-dev": { @@ -40,7 +40,11 @@ "keywords": [ "wordpress" ], - "time": "2022-02-02T14:03:42+00:00" + "support": { + "issues": "https://github.com/Codeinwp/themeisle-sdk/issues", + "source": "https://github.com/Codeinwp/themeisle-sdk/tree/v3.2.26" + }, + "time": "2022-05-12T11:55:06+00:00" }, { "name": "markbaker/complex", @@ -71,9 +75,6 @@ }, "type": "library", "autoload": { - "psr-4": { - "Complex\\": "classes/src/" - }, "files": [ "classes/src/functions/abs.php", "classes/src/functions/acos.php", @@ -117,7 +118,10 @@ "classes/src/operations/multiply.php", "classes/src/operations/divideby.php", "classes/src/operations/divideinto.php" - ] + ], + "psr-4": { + "Complex\\": "classes/src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -169,9 +173,6 @@ }, "type": "library", "autoload": { - "psr-4": { - "Matrix\\": "classes/src/" - }, "files": [ "classes/src/Functions/adjoint.php", "classes/src/Functions/antidiagonal.php", @@ -189,7 +190,10 @@ "classes/src/Operations/multiply.php", "classes/src/Operations/divideby.php", "classes/src/Operations/divideinto.php" - ] + ], + "psr-4": { + "Matrix\\": "classes/src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -475,6 +479,10 @@ "stylecheck", "tests" ], + "support": { + "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues", + "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer" + }, "time": "2022-02-04T12:51:07+00:00" }, { @@ -643,20 +651,24 @@ "standards", "wordpress" ], + "support": { + "issues": "https://github.com/PHPCompatibility/PHPCompatibilityWP/issues", + "source": "https://github.com/PHPCompatibility/PHPCompatibilityWP" + }, "time": "2021-12-30T16:37:40+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.6.2", + "version": "3.7.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a" + "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a", - "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619", + "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619", "shasum": "" }, "require": { @@ -694,7 +706,12 @@ "phpcs", "standards" ], - "time": "2021-12-12T21:44:58+00:00" + "support": { + "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", + "source": "https://github.com/squizlabs/PHP_CodeSniffer", + "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + }, + "time": "2022-06-18T07:21:10+00:00" }, { "name": "wp-coding-standards/wpcs", @@ -754,5 +771,6 @@ "platform-dev": [], "platform-overrides": { "php": "5.6" - } + }, + "plugin-api-version": "2.3.0" } diff --git a/index.php b/index.php index 6aea3234d..f09c8765b 100644 --- a/index.php +++ b/index.php @@ -133,8 +133,6 @@ function visualizer_launch() { add_filter( 'themeisle_sdk_products', 'visualizer_register_sdk', 10, 1 ); add_filter( 'pirate_parrot_log', 'visualizer_register_parrot', 10, 1 ); - define( 'VISUALIZER_SURVEY', Visualizer_Module::is_pro() ? 'https://forms.gle/7Zo7FuZbvQ8DTvRi6' : 'https://forms.gle/muMtbcyvHn1aTvmJ7' ); - } /** diff --git a/js/render-facade.js b/js/render-facade.js index 4a05b46c8..b506f9b60 100644 --- a/js/render-facade.js +++ b/js/render-facade.js @@ -1,14 +1,15 @@ /* global console */ /* global visualizer */ /* global jQuery */ - +var vizClipboard1=null; (function($, visualizer){ function initActionsButtons(v) { - if($('a.visualizer-chart-shortcode').length > 0) { - var clipboard1 = new ClipboardJS('a.visualizer-chart-shortcode'); // jshint ignore:line - clipboard1.on('success', function(e) { + if($('a.visualizer-chart-shortcode').length > 0 && vizClipboard1 === null) { + vizClipboard1 = new ClipboardJS('a.visualizer-chart-shortcode'); // jshint ignore:line + vizClipboard1.on('success', function(e) { window.alert(v.i10n['copied']); + }); } From 271d215e90b37443700f005e95316cf025c0697e Mon Sep 17 00:00:00 2001 From: selul Date: Tue, 21 Jun 2022 20:30:39 +0300 Subject: [PATCH 7/9] add concurency --- .github/workflows/build-dev-artifacts.yml | 4 +++- .github/workflows/cancel-old-runs.yml | 20 -------------------- .github/workflows/test-e2e.yml | 4 ++++ 3 files changed, 7 insertions(+), 21 deletions(-) delete mode 100755 .github/workflows/cancel-old-runs.yml diff --git a/.github/workflows/build-dev-artifacts.yml b/.github/workflows/build-dev-artifacts.yml index f282259ef..9997bce1b 100755 --- a/.github/workflows/build-dev-artifacts.yml +++ b/.github/workflows/build-dev-artifacts.yml @@ -4,7 +4,9 @@ on: pull_request: types: [opened, synchronize, ready_for_review] - +concurrency: + group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.ref }} + cancel-in-progress: true jobs: dev-zip: name: Build ZIP and upload to s3 diff --git a/.github/workflows/cancel-old-runs.yml b/.github/workflows/cancel-old-runs.yml deleted file mode 100755 index 8be8d0b19..000000000 --- a/.github/workflows/cancel-old-runs.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Auto Cancel - -on: - push: - branches-ignore: - - master -jobs: - cancel: - name: 'Cancel Previous Runs' - if: github.event.pull_request.head.repo.fork == false - runs-on: ubuntu-latest - steps: - - uses: styfle/cancel-workflow-action@0.8.0 - with: - workflow_id: build-dev-artifacts.yml - access_token: ${{ secrets.BOT_TOKEN }} - - uses: styfle/cancel-workflow-action@0.8.0 - with: - workflow_id: test-e2e.yml - access_token: ${{ secrets.BOT_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index eaba14ef5..3ac325bbb 100755 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -3,6 +3,10 @@ name: Test e2e on: push: branches-ignore: master + +concurrency: + group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.ref }} + cancel-in-progress: true jobs: e2e: name: E2E for ${{ matrix.env }} From b8bdf4350631b4d2d71151dc13258c1bdc0f9bbd Mon Sep 17 00:00:00 2001 From: selul Date: Tue, 21 Jun 2022 20:40:28 +0300 Subject: [PATCH 8/9] add further instructions --- classes/Visualizer/Render/Library.php | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/Visualizer/Render/Library.php b/classes/Visualizer/Render/Library.php index 1f741cdb8..80416e499 100644 --- a/classes/Visualizer/Render/Library.php +++ b/classes/Visualizer/Render/Library.php @@ -364,6 +364,7 @@ private function _renderSidebar() { echo '
'; echo '
'; echo '

' . __( 'Discover the power of PRO!', 'visualizer' ) . '

    '; + echo '
  • ' . __( 'Remove branding label \'Chart by Visualizer\'', 'visualizer' ) . '
    • '; if ( Visualizer_Module_Admin::proFeaturesLocked() ) { echo '
  • ' . __( '6 more chart types', 'visualizer' ); } else { From 5ffd564b08382be5483bd5f83fe7be8dbb654568 Mon Sep 17 00:00:00 2001 From: "themeisle[bot]" <> Date: Tue, 21 Jun 2022 17:53:54 +0000 Subject: [PATCH 9/9] chore(release): 3.7.8 ##### [Version 3.7.8](https://github.com/Codeinwp/visualizer/compare/v3.7.7...v3.7.8) (2022-06-21) - Add the description field in the pie chart - Fix Label other is not visible on the pie chart - Fix the pagination issue in the chart library - Update dependencies --- CHANGELOG.md | 7 +++++++ classes/Visualizer/Plugin.php | 2 +- css/media.css | 2 +- index.php | 2 +- package.json | 2 +- readme.txt | 10 ++++++++++ 6 files changed, 21 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 709d357f7..479fb7efb 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +##### [Version 3.7.8](https://github.com/Codeinwp/visualizer/compare/v3.7.7...v3.7.8) (2022-06-21) + +- Add the description field in the pie chart +- Fix Label other is not visible on the pie chart +- Fix the pagination issue in the chart library +- Update dependencies + ##### [Version 3.7.7](https://github.com/Codeinwp/visualizer/compare/v3.7.6...v3.7.7) (2022-05-31) * Harden security by enforcing unescaped urls. diff --git a/classes/Visualizer/Plugin.php b/classes/Visualizer/Plugin.php index 4849e3f7f..6b7b266b9 100644 --- a/classes/Visualizer/Plugin.php +++ b/classes/Visualizer/Plugin.php @@ -28,7 +28,7 @@ class Visualizer_Plugin { const NAME = 'visualizer'; - const VERSION = '3.7.7'; + const VERSION = '3.7.8'; // custom post types const CPT_VISUALIZER = 'visualizer'; diff --git a/css/media.css b/css/media.css index 13267bd8d..66b95ac6a 100644 --- a/css/media.css +++ b/css/media.css @@ -1,5 +1,5 @@ /* - Version: 3.7.7 + Version: 3.7.8 */ #visualizer-library-view { padding: 30px 10px 10px 30px; diff --git a/index.php b/index.php index f09c8765b..64660f478 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ Plugin Name: Visualizer: Tables and Charts for WordPress Plugin URI: https://themeisle.com/plugins/visualizer-charts-and-graphs-lite/ Description: A simple, easy to use and quite powerful tool to create, manage and embed interactive charts into your WordPress posts and pages. The plugin uses Google Visualization API to render charts, which supports cross-browser compatibility (adopting VML for older IE versions) and cross-platform portability to iOS and new Android releases. - Version: 3.7.7 + Version: 3.7.8 Author: Themeisle Author URI: http://themeisle.com Requires at least: 3.5 diff --git a/package.json b/package.json index 86bf68b99..a5c5266ac 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "visualizer", - "version": "3.7.7", + "version": "3.7.8", "description": "Visualizer Lite", "repository": { "type": "git", diff --git a/readme.txt b/readme.txt index a4ea27c46..373caca96 100755 --- a/readme.txt +++ b/readme.txt @@ -163,6 +163,16 @@ Pay attention that to turn your shortcodes into graphs, your theme has to have ` == Changelog == +##### [Version 3.7.8](https://github.com/Codeinwp/visualizer/compare/v3.7.7...v3.7.8) (2022-06-21) + +- Add the description field in the pie chart +- Fix Label other is not visible on the pie chart +- Fix the pagination issue in the chart library +- Update dependencies + + + + ##### [Version 3.7.7](https://github.com/Codeinwp/visualizer/compare/v3.7.6...v3.7.7) (2022-05-31) * Harden security by enforcing escaped urls.