From 41185ea795c7b19d1a7ff155d71474f96cd80c8d Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 22 Mar 2017 10:39:26 +0100 Subject: [PATCH] Update jquery3 to version 3.2.x --- Changelog | 1 + composer.json | 2 +- composer.lock | 12 ++++++------ www/themes/Gentele/templates/basepage.tpl | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Changelog b/Changelog index 9c9145d35..6598e110d 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2017-03-22 DariusIII + * Chg: Update jquery3 to version 3.2.x * Chg: Use jquery3 in Gentele theme * Fix: Fix page count when selecting user roles in users list * Fix: Fix empty groups list when selecting active/inactive groups diff --git a/composer.json b/composer.json index 09f1bb80f..4e13575b6 100755 --- a/composer.json +++ b/composer.json @@ -120,7 +120,7 @@ "bower-asset/html5shiv": "~3.7.3", "bower-asset/icheck": "~1.0.2", "bower-asset/jquery-2.2.x": "~2.2.1", - "bower-asset/jquery-3.1.x": "~3.1.0", + "bower-asset/jquery-3.2.x": "~3.2", "bower-asset/jquery-bootswatch": "~0.0.8", "bower-asset/jquery-goup": "~v1.1", "bower-asset/jquery.nicescroll": "~3.6.8", diff --git a/composer.lock b/composer.lock index 611bf88f4..4fb9e4ef7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "09a12f325cff16466e8a700f8b46a4fe", + "content-hash": "99d8dcf863ce91d45db59323562604bd", "packages": [ { "name": "b3rs3rk/steamfront", @@ -750,17 +750,17 @@ ] }, { - "name": "bower-asset/jquery-3.1.x", - "version": "3.1.1", + "name": "bower-asset/jquery-3.2.x", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/jquery/jquery-dist.git", - "reference": "1b30f3ad466ebf2714d47eda34dbd7fdf6849fe3" + "reference": "77d2a51d0520d2ee44173afdf4e40a9201f5964e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/1b30f3ad466ebf2714d47eda34dbd7fdf6849fe3", - "reference": "1b30f3ad466ebf2714d47eda34dbd7fdf6849fe3", + "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/77d2a51d0520d2ee44173afdf4e40a9201f5964e", + "reference": "77d2a51d0520d2ee44173afdf4e40a9201f5964e", "shasum": "" }, "type": "bower-asset-library", diff --git a/www/themes/Gentele/templates/basepage.tpl b/www/themes/Gentele/templates/basepage.tpl index fae27db26..9f1fa0646 100755 --- a/www/themes/Gentele/templates/basepage.tpl +++ b/www/themes/Gentele/templates/basepage.tpl @@ -178,7 +178,7 @@ - +