Skip to content

Commit

Permalink
Merge pull request #2501 from akvo/issue/2500-hotfix-cartodb-integrit…
Browse files Browse the repository at this point in the history
…y-check-failing

Hotfix for 1.9.28 CartoDB libraries integrity check failing
  • Loading branch information
muloem authored Feb 20, 2018
2 parents ee24bbe + 32fd5e0 commit bd9087b
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Dashboard/app/dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -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-186Za72/5qVX6enL5hiqq/J50rF6cjyD8swQIHLmLumlwqxV5u0mtPzSZk3VzwQy" crossorigin="anonymous"';
cssIntegrity = 'integrity="sha384-2jZemTFA+0G69HaecoRuv5/hO9AA84owVqReLcXX5cb/Dm+9kjKIBKD1oPTZ+Qhm" crossorigin="anonymous"';
jsIntegrity = 'integrity="sha384-nrnuEANk1U4jNer7BO0D9qbBQC/FTWOXSqdYEeN1Cutp+7AzPd19Hn4c5crckiTt" crossorigin="anonymous"';
cssIntegrity = 'integrity="sha384-2okMniCiL7uKWJ/EVNAcfCaFR3ufkbQfwa/RdHDV5CV8IHT6bdIy87uRC2Jv6/Cs" crossorigin="anonymous"';
break;
case 'google':
var regionBias = FLOW.Env.googleMapsRegionBias;
Expand Down
23 changes: 16 additions & 7 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
# Akvo Flow Release Notes
----
# Akvo Flow Dashboard v1.9.28.1 - Bent Banana (Hotfix 1)
Date: 20 February 2018
## Resolved issues
* **Integrity check failing for CartoDB libraries** [#2500] - Fixed issue causing maps on CartoDB enabled instances not to work

# Akvo Flow Dashboard v1.9.28 - Bent Banana
Date: 15 February 2015
Date: 15 February 2018

## New and noteworthy
* [#2287] - Updated French, Spanish, and Portuguese translations
* [#2427] - Show frequency table and graphs for cascades
* [#2443] - Add statistics about collected data to comprehensive report
* [#2428] - Improve comprehensive report graph styling and display as bar graph
* [#2467] - Move monitoring tab after inspect data tab
* Rephrase question ID to variable name [#2143], and update variable name help text [#2444]
* **Add updated translations of online workspace** - Updated French, Spanish, and Portuguese translations [#2287]
* **Comprehensive report improvement** - Show frequency table and graphs for cascades [#2427], add statistics about collected data [#2443], and improve graph styling [#2428]
* **Rearrange data tab** - Moved monitoring tab after inspect data tab [#2467]
* **Simplify validation** - Rephrased question ID to variable name [#2143], and update variable name help text [#2444]

## Resolved issues
* **Users unable to delete data under monitoring tab** [#2261] - Removed delete option to reduce the the risk of high data loss
* **Form version number not incrementing correctly** [#1403] - Set form as not published each time the form basics are changed
* **Code Cleanup** [#2447],[#555] - Remove unused code
* **UI** - Remove line above "No results found" in inspect data and monitoring tabs [#2452]

## Resolved issues
* Users unable to delete data under monitoring tab [#2261] - Removed delete option to reduce the the risk of high data loss
Expand Down

0 comments on commit bd9087b

Please sign in to comment.