From fbe352d05f26286aed461a3eaf0d6d5bf980fde7 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 23 Mar 2017 09:27:14 +0100 Subject: [PATCH] Update composer.lock and .json with new sweetalert and update guzzlehttp --- Changelog | 2 ++ composer.json | 1 + composer.lock | 58 ++++++++++++++++++++++++++++++++++++++++----------- 3 files changed, 49 insertions(+), 12 deletions(-) diff --git a/Changelog b/Changelog index e6b801976..94b211129 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2017-03-23 DariusIII + * Chg: Update composer.lock and .json with new sweetalert and update guzzlehttp 2017-03-22 DariusIII * Chg: Use fancybox for image modals * Chg: Update jquery3 to version 3.2.x diff --git a/composer.json b/composer.json index 9fb394de7..7798764da 100755 --- a/composer.json +++ b/composer.json @@ -133,6 +133,7 @@ "bower-asset/responsive-tables-js": "~1.0.6", "bower-asset/select2": "~4.0.2", "bower-asset/slimScroll": "~1.3.7", + "bower-asset/sweetalert": "~1.1.1", "bower-asset/tinymce-builded": "~4.4.3", "unionofrad/lithium": "^1.2-dev" }, diff --git a/composer.lock b/composer.lock index a75810e9e..060212a66 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": "2dfb9632acbbd60b2d7e98c01570e0b1", + "content-hash": "0728ace17382b1c8cf7e7f44e98432df", "packages": [ { "name": "b3rs3rk/steamfront", @@ -1141,6 +1141,40 @@ "ui" ] }, + { + "name": "bower-asset/sweetalert", + "version": "v1.1.3", + "source": { + "type": "git", + "url": "https://github.com/t4t5/sweetalert.git", + "reference": "3b9d8eb90268e0b1f8f58b2eba240631df0ad18f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/t4t5/sweetalert/zipball/3b9d8eb90268e0b1f8f58b2eba240631df0ad18f", + "reference": "3b9d8eb90268e0b1f8f58b2eba240631df0ad18f", + "shasum": "" + }, + "require-dev": { + "bower-asset/jquery": "~2.1.4", + "bower-asset/qunit": "~1.18.0" + }, + "type": "bower-asset-library", + "extra": { + "bower-asset-main": [ + "dist/sweetalert.min.js", + "dist/sweetalert.css" + ] + }, + "license": [ + "MIT" + ], + "description": "A beautiful replacement for JavaScript's alert.", + "keywords": [ + "alert", + "modal" + ] + }, { "name": "bower-asset/tinymce-builded", "version": "4.4.3", @@ -1927,12 +1961,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "03c0747d7f3eace7ef2e69fc2eaa77dc00126548" + "reference": "a1c4a74bf31d4e41d783fafb635c806cc19c2e9b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/03c0747d7f3eace7ef2e69fc2eaa77dc00126548", - "reference": "03c0747d7f3eace7ef2e69fc2eaa77dc00126548", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a1c4a74bf31d4e41d783fafb635c806cc19c2e9b", + "reference": "a1c4a74bf31d4e41d783fafb635c806cc19c2e9b", "shasum": "" }, "require": { @@ -1984,7 +2018,7 @@ "rest", "web service" ], - "time": "2017-03-07 19:22:01" + "time": "2017-03-22 11:33:29" }, { "name": "guzzlehttp/promises", @@ -3321,16 +3355,16 @@ }, { "name": "twig/twig", - "version": "v2.2.0", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "29bb02dde09ff56291d30f7687eb8696918023af" + "reference": "9718186a5df85a4f7917e78d3ffcabc204c75d25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/29bb02dde09ff56291d30f7687eb8696918023af", - "reference": "29bb02dde09ff56291d30f7687eb8696918023af", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/9718186a5df85a4f7917e78d3ffcabc204c75d25", + "reference": "9718186a5df85a4f7917e78d3ffcabc204c75d25", "shasum": "" }, "require": { @@ -3340,12 +3374,12 @@ "require-dev": { "psr/container": "^1.0", "symfony/debug": "~2.7", - "symfony/phpunit-bridge": "~3.2" + "symfony/phpunit-bridge": "~3.3@dev" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -3380,7 +3414,7 @@ "keywords": [ "templating" ], - "time": "2017-02-27T00:16:20+00:00" + "time": "2017-03-22T15:41:51+00:00" }, { "name": "unionofrad/lithium",