Merge branch 'release/3.1.25'

azavea · Jul 13, 2022 · 627e72c · 627e72c
2 parents 3497355 + 4f13b3b
commit 627e72c
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 83 deletions.
diff --git a/python/cac_tripplanner/templates/base.html b/python/cac_tripplanner/templates/base.html
@@ -57,24 +57,19 @@
     {% block extracss %}
     {% endblock %}
 
-    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-EE36F23XEW"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+
+      gtag('config', 'G-EE36F23XEW');
+    </script>
+
   </head>
 
   <body>
-
-    <!-- Google Tag Manager -->
-    <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-KNZ9R2"
-    height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-    <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-    new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-    j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-    '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-    })(window,document,'script','dataLayer','GTM-KNZ9R2');</script>
-    <!-- End Google Tag Manager -->
-
     {% block body %}
     <div id="body-div" class="body-{{ tab|default:'home' }}
         {% if 'map' in tab %}body-map{% endif %}">

diff --git a/src/package-lock.json b/src/package-lock.json
diff --git a/src/package.json b/src/package.json
@@ -8,14 +8,14 @@
     "@turf/nearest-point-on-line": "~6.0.2",
     "cartodb.js": "~3.15.18",
     "console-polyfill": "~0.3.0",
-    "handlebars": "~4.7.6",
+    "handlebars": "~4.7.7",
     "jquery": "~3.5.1",
     "jquery-sortablejs": "~1.0.1",
     "js-storage": "~1.1.0",
     "leaflet": "~0.7.7",
     "leaflet.awesome-markers": "~2.0.5",
-    "lodash": "~4.17.20",
-    "moment": "~2.29.0",
+    "lodash": "~4.17.21",
+    "moment": "~2.29.2",
     "moment-duration-format": "~2.3.2",
     "polyline-encoded": "~0.0.9",
     "riot-route": "~3.1.4",