From c532548284f81a3e4cf2cc1bd14dbf558f346d7f Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Mon, 23 Mar 2020 22:14:00 +0200 Subject: [PATCH 1/4] Back to devel --- docs/HISTORY.txt | 3 +++ eea/googlecharts/version.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index b9f4c252..e55da571 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,6 +1,9 @@ Changelog ========= +20.2-dev0 - (unreleased) +--------------------------- + 20.1 - (2020-03-13) --------------------------- * Bug fix: save notes and datasource per chart when clicking on the chart tabs diff --git a/eea/googlecharts/version.txt b/eea/googlecharts/version.txt index 2e73f8d2..01bed2a9 100644 --- a/eea/googlecharts/version.txt +++ b/eea/googlecharts/version.txt @@ -1 +1 @@ -20.1 +20.2-dev0 From 57af43a2a18102001c608df3daa8a407420a159c Mon Sep 17 00:00:00 2001 From: David Ichim Date: Fri, 27 Mar 2020 15:31:53 +0200 Subject: [PATCH 2/4] * Change: load google charts api from loader.js instead of gsapi in order to avoid a strange bug where FF doesn't trigger the setOnLoadCallback from google [ichim-david refs #116244] --- docs/HISTORY.txt | 3 +++ eea/googlecharts/views/zpt/embed-chart.pt | 2 +- eea/googlecharts/views/zpt/embed-dashboard.pt | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index e55da571..f772b042 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -3,6 +3,9 @@ Changelog 20.2-dev0 - (unreleased) --------------------------- +* Change: load google charts api from loader.js instead of gsapi in order to + avoid a strange bug where FF doesn't trigger the setOnLoadCallback from google + [ichim-david refs #116244] 20.1 - (2020-03-13) --------------------------- diff --git a/eea/googlecharts/views/zpt/embed-chart.pt b/eea/googlecharts/views/zpt/embed-chart.pt index 589655ad..d3105472 100644 --- a/eea/googlecharts/views/zpt/embed-chart.pt +++ b/eea/googlecharts/views/zpt/embed-chart.pt @@ -28,7 +28,7 @@ - + diff --git a/eea/googlecharts/views/zpt/embed-dashboard.pt b/eea/googlecharts/views/zpt/embed-dashboard.pt index 754a002f..5b2f290e 100644 --- a/eea/googlecharts/views/zpt/embed-dashboard.pt +++ b/eea/googlecharts/views/zpt/embed-dashboard.pt @@ -29,7 +29,7 @@ - + From 4e58bedbea218ad3cd97e6dac7b2e014cce7a399 Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Fri, 27 Mar 2020 17:10:49 +0200 Subject: [PATCH 3/4] Updated version to 20.2 --- eea/googlecharts/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/googlecharts/version.txt b/eea/googlecharts/version.txt index 01bed2a9..763c7e32 100644 --- a/eea/googlecharts/version.txt +++ b/eea/googlecharts/version.txt @@ -1 +1 @@ -20.2-dev0 +20.2 From 555505cc55b7ac1f0dac1741704bb52c538c0836 Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Fri, 27 Mar 2020 17:13:35 +0200 Subject: [PATCH 4/4] Updated changelog - removed develop information --- docs/HISTORY.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index f772b042..490f094a 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,7 +1,7 @@ Changelog ========= -20.2-dev0 - (unreleased) +20.2 - (2020-03-27) --------------------------- * Change: load google charts api from loader.js instead of gsapi in order to avoid a strange bug where FF doesn't trigger the setOnLoadCallback from google