78aafe96d19a48bef4bb7e4a1fc7401eb65a7daa
Merge parents 6c13a4d f697b76
chmalee
  Wed Jun 14 10:11:53 2023 -0700
Fix merge conflict

diff --cc src/lib/htmshell.c
index 80a80b9,77e7065..bf39ebf
--- src/lib/htmshell.c
+++ src/lib/htmshell.c
@@@ -975,32 -975,31 +975,33 @@@
  dyStringAppend(policy, " www.samsarin.com/project/dagre-d3/latest/dagre-d3.js");
  dyStringAppend(policy, " cdnjs.cloudflare.com/ajax/libs/d3/3.4.4/d3.min.js");
  dyStringAppend(policy, " cdnjs.cloudflare.com/ajax/libs/jquery/1.12.1/jquery.min.js");
  dyStringAppend(policy, " cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/jstree.min.js");
  dyStringAppend(policy, " cdnjs.cloudflare.com/ajax/libs/bowser/1.6.1/bowser.min.js");
  dyStringAppend(policy, " cdnjs.cloudflare.com/ajax/libs/jstree/3.3.4/jstree.min.js");
  dyStringAppend(policy, " cdnjs.cloudflare.com/ajax/libs/jstree/3.3.7/jstree.min.js");
  dyStringAppend(policy, " login.persona.org/include.js");
  dyStringAppend(policy, " cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js");
  // expMatrix
  dyStringAppend(policy, " ajax.googleapis.com");
  dyStringAppend(policy, " maxcdn.bootstrapcdn.com");
  dyStringAppend(policy, " d3js.org/d3.v3.min.js");
  // jsHelper
  dyStringAppend(policy, " cdn.datatables.net");
 +// shephered js for tutorial overlay
 +dyStringAppend(policy, " cdn.jsdelivr.net");
+ dyStringAppend(policy, " www.google.com/recaptcha/api.js");
  
  dyStringAppend(policy, ";");
  
  
  dyStringAppend(policy, " style-src * 'unsafe-inline';");
  
  /* more secure method not used yet 
  dyStringAppend(policy, " style-src 'self' 'unsafe-inline'");
  dyStringAppend(policy, " code.jquery.com");          // used by hgIntegrator
  dyStringAppend(policy, " netdna.bootstrapcdn.com");  // used by hgIntegrator
  dyStringAppend(policy, " fonts.googleapis.com");    // used by hgGateway
  dyStringAppend(policy, " maxcdn.bootstrapcdn.com"); // used by hgGateway
  dyStringAppend(policy, ";");
  */