update jquery

702a56a1 · Arnaud Bey · 92152051 · 702a56a1 · 702a56a1 · 702a56a1
Commit 702a56a1 authored May 21, 2019 by Arnaud Bey
4 changed files
--- a/application/app/Resources/views/base.html.twig
+++ b/application/app/Resources/views/base.html.twig
@@ -14,8 +14,8 @@
        <link rel="stylesheet" href="{{ asset('css/main.css')}}" type="text/css"/>
        {% block stylesheets %}{% endblock %}
        <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}"/>
+        <!--
        {% if generalParameters.piwikUrl %}
-        <!-- Piwik -->
        <script type="text/javascript">
          var _paq = _paq || [];
          /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
@@ -29,8 +29,8 @@
            g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
          })();
        </script>
-        <!-- End Piwik Code -->
        {% endif %}
+      -->
    </head>
    <body>
        {% block topToHideWhilePlaying %}

--- a/application/app/config/config.yml
+++ b/application/app/config/config.yml
@@ -33,7 +33,7 @@ framework:
    fragments:       ~
    http_method_override: true
    assets:
-        version: v20170614A
+        version: v20190521A
        packages:
            noversion:
                version: ~

--- a/application/bower.json
+++ b/application/bower.json
@@ -11,7 +11,7 @@
    "bootstrap": "~4",
    "font-awesome": "~4",
    "FlipClock": "*",
-    "jquery": "~2.1.4",
+    "jquery": "~3.4",
    "jquery-ui": "*",
    "animate.css": "^3.5.2",
    "howler.js": "howler#^2.0.0",

--- a/application/src/MagicWordBundle/Resources/views/Round/play.html.twig
+++ b/application/src/MagicWordBundle/Resources/views/Round/play.html.twig
@@ -21,7 +21,7 @@
    </div>

    <div class="row">
-        <div id="grid-container" class="col-md-12 col-xs-12 col-lg-12">
+        <div id="grid-container" class="col">
            {% include "MagicWordBundle:Round/Play:grid.html.twig" %}
        </div>
    </div>