Merge branch 'master' into release/1.9.35

akvo · Aug 6, 2018 · 71240a7 · 71240a7
2 parents 2a01413 + d76cc32
commit 71240a7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Dashboard/app/dashboard.html b/Dashboard/app/dashboard.html
@@ -49,8 +49,8 @@
               //replace leaflet library
               jsSrc = "https://cartodb-libs.global.ssl.fastly.net/cartodb.js/v3/3.15/cartodb.js";
               cssSrc = "https://cartodb-libs.global.ssl.fastly.net/cartodb.js/v3/3.15/themes/css/cartodb.css";
-              jsIntegrity = 'integrity="sha384-nzQbG7+pvQyjbIO6/H1ArNYgI/AzvGv21QwOR7zUfwmqmuCzZ3+TaOjRuM+FNU3Y" crossorigin="anonymous"';
-              cssIntegrity = 'integrity="sha384-oYyLsxkizJXyfmLm7bbrT1Ynv8vy+Z/FV5VvYj1MMWO1HArk+gKRcfuKvsL3Xw7s" crossorigin="anonymous"';
+              jsIntegrity = 'integrity="sha384-YbHEZWsL9cleIM0bzsWe11aA3fCgfDhtJRyXJZO2ITLgMjgwTOXzLB44gEOJwnxk" crossorigin="anonymous"';
+              cssIntegrity = 'integrity="sha384-vKEJC2xobbg6NGKcBrDli6/zyeAcW17sOniSl57Hdiwa8Nr6Mn0n8TG1YB5Ov/yA" crossorigin="anonymous"';
               break;
           case 'google':
               var regionBias = FLOW.Env.googleMapsRegionBias;

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -13,6 +13,12 @@ Date: 06th August 2018
 * **Reports** - We now check the status of generating reports every 10 seconds and update the list once they're ready for download [#2755]. Cron job for removing exported reports that are older than one year [#2638]. Place a timeout for report generation that takes too long [#2779]
 * **Backend processes** - Handle addition of other option during data cleaning reports [#2780]. More comprehensive error messaging when cascade publishing fails [#2794]. When exporting reports, handle option-less option questions [#2777]
 
+# Akvo Flow Dashboard v1.9.34.1 - Groundbreaking Grass Hotfix
+Date: 06th August 2018
+
+## Resolved issues
+* **CartoDB Maps** - Fix the SHA integrity hashes for carto.css and carto.js [#2721].
+
 # Akvo Flow Dashboard v1.9.34 - Groundbreaking Grass
 Date: 05th July 2018
 
@@ -267,7 +273,7 @@ Date: 31 August 2017
 Date: 26 July 2017
 
 ## Resolved issues
-* **Reporting fixes** - Comprehensive reports should now work when the regional summary sheets get their names from a cascade question [#2206], and also work for questions that have very long names. 
+* **Reporting fixes** - Comprehensive reports should now work when the regional summary sheets get their names from a cascade question [#2206], and also work for questions that have very long names.
 
 # 1.9.21 Thoroughbred Tamandua
 Date: 21 July 2017