From 9242cfc717c2e833a8baaa4a671318fc7bb7dc43 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 10 May 2018 21:07:58 +0200 Subject: [PATCH] Update font-awesome and laravelcollective/html to latest versions --- Changelog | 1 + composer.lock | 93 +++++++++++++++++++-------------------------------- 2 files changed, 35 insertions(+), 59 deletions(-) diff --git a/Changelog b/Changelog index 3c61a1f52..c70c7ea1a 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-05-10 DariusIII + * Chg: Update font-awesome and laravelcollective/html to latest versions * Fix: Fix caching in Category model getChildren function * Chg: Update Category model * Chg: Update query caching in Category and predb models diff --git a/composer.lock b/composer.lock index b55a56ebf..2f1e6caf4 100644 --- a/composer.lock +++ b/composer.lock @@ -312,8 +312,7 @@ "Gemfile.lock", "*.md" ] - }, - "time": "2016-06-06T17:37:52+00:00" + } }, { "name": "bower-asset/autosize", @@ -342,8 +341,7 @@ "form", "textarea", "ui" - ], - "time": "2017-05-19T15:36:30+00:00" + ] }, { "name": "bower-asset/bootstrap", @@ -392,8 +390,7 @@ "mobile-first", "responsive", "web" - ], - "time": "2016-07-25T15:51:55+00:00" + ] }, { "name": "bower-asset/bootstrap-3.x", @@ -442,8 +439,7 @@ "mobile-first", "responsive", "web" - ], - "time": "2016-07-25T15:51:55+00:00" + ] }, { "name": "bower-asset/bootstrap-datepicker", @@ -472,8 +468,7 @@ }, "license": [ "Apache-2.0" - ], - "time": "2016-08-05T09:50:13+00:00" + ] }, { "name": "bower-asset/bootstrap-hover-dropdown", @@ -503,8 +498,7 @@ "dropdowns", "hover", "twitter" - ], - "time": "2015-12-01T23:35:57+00:00" + ] }, { "name": "bower-asset/bootstrap-progressbar", @@ -538,8 +532,7 @@ }, "license": [ "MIT" - ], - "time": "2015-05-15T18:56:17+00:00" + ] }, { "name": "bower-asset/bootswatch", @@ -670,8 +663,7 @@ "modal", "popup", "ui" - ], - "time": "2016-05-10T22:21:33+00:00" + ] }, { "name": "bower-asset/datatables", @@ -719,8 +711,7 @@ "jquery", "library", "table" - ], - "time": "2017-08-31T13:52:17+00:00" + ] }, { "name": "bower-asset/fancybox", @@ -786,8 +777,7 @@ "tests", "examples" ] - }, - "time": "2015-01-26T21:19:01+00:00" + } }, { "name": "bower-asset/flexboxgrid", @@ -823,21 +813,20 @@ "css", "flexbox", "grid" - ], - "time": "2016-08-14T16:43:18+00:00" + ] }, { "name": "bower-asset/font-awesome", - "version": "5.0.12", + "version": "5.0.13", "source": { "type": "git", "url": "https://github.com/FortAwesome/Font-Awesome.git", - "reference": "b60cbbecb438831419bbe83d838e33e6b7327b38" + "reference": "bca574eca32c5a766b2a09fdcbedf382a78ebc38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/b60cbbecb438831419bbe83d838e33e6b7327b38", - "reference": "b60cbbecb438831419bbe83d838e33e6b7327b38", + "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/bca574eca32c5a766b2a09fdcbedf382a78ebc38", + "reference": "bca574eca32c5a766b2a09fdcbedf382a78ebc38", "shasum": "" }, "type": "bower-asset-library" @@ -869,8 +858,7 @@ "src", "build.xml" ] - }, - "time": "2015-07-20T20:04:00+00:00" + } }, { "name": "bower-asset/icheck", @@ -920,8 +908,7 @@ "replacement", "skins", "ui" - ], - "time": "2014-03-03T17:36:28+00:00" + ] }, { "name": "bower-asset/jquery", @@ -984,8 +971,7 @@ "javascript", "jquery", "library" - ], - "time": "2016-05-20T17:24:43+00:00" + ] }, { "name": "bower-asset/jquery-3.2.x", @@ -1052,8 +1038,7 @@ "scroll", "scrolltop", "scrolltotop" - ], - "time": "2017-08-31T15:51:29+00:00" + ] }, { "name": "bower-asset/jquery-migrate-1.4.x", @@ -1072,8 +1057,7 @@ "type": "bower-asset-library", "extra": { "bower-asset-main": "jquery-migrate.js" - }, - "time": "2016-04-15T06:38:34+00:00" + } }, { "name": "bower-asset/jquery-migrate-3.0.x", @@ -1092,8 +1076,7 @@ "type": "bower-asset-library", "extra": { "bower-asset-main": "jquery-migrate.js" - }, - "time": "2016-06-10T14:28:59+00:00" + } }, { "name": "bower-asset/jquery.nicescroll", @@ -1123,8 +1106,7 @@ "demo", "package.json" ] - }, - "time": "2016-03-01T20:38:24+00:00" + } }, { "name": "bower-asset/material-design-iconic-font", @@ -1163,8 +1145,7 @@ "font", "icons", "material" - ], - "time": "2015-11-08T04:50:28+00:00" + ] }, { "name": "bower-asset/materialize", @@ -1223,8 +1204,7 @@ "responsive", "sass", "ux" - ], - "time": "2017-04-15T01:39:28+00:00" + ] }, { "name": "bower-asset/pace", @@ -1270,8 +1250,7 @@ "progress", "progress", "spinner" - ], - "time": "2014-11-06T16:31:34+00:00" + ] }, { "name": "bower-asset/pnotify", @@ -1323,8 +1302,7 @@ "license": [ "Apache-2.0" ], - "description": "JavaScript notification plugin.", - "time": "2017-07-31T21:50:29+00:00" + "description": "JavaScript notification plugin." }, { "name": "bower-asset/respond", @@ -1348,8 +1326,7 @@ "test" ] }, - "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)", - "time": "2013-12-19T04:44:31+00:00" + "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)" }, { "name": "bower-asset/responsive-tables-js", @@ -1379,8 +1356,7 @@ "jquery", "responsive", "table" - ], - "time": "2015-10-08T14:18:04+00:00" + ] }, { "name": "bower-asset/select2", @@ -1448,8 +1424,7 @@ "scrolling", "slimscroll", "ui" - ], - "time": "2016-06-11T09:19:14+00:00" + ] }, { "name": "bower-asset/tinymce-dist", @@ -3554,16 +3529,16 @@ }, { "name": "laravelcollective/html", - "version": "v5.6.7", + "version": "v5.6.8", "source": { "type": "git", "url": "https://github.com/LaravelCollective/html.git", - "reference": "38f2c6ff0d3dfc497175a5cff5e24b3937f6e2c9" + "reference": "42c0854e00d6bb3346883d122b444fbf15a13ecb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/38f2c6ff0d3dfc497175a5cff5e24b3937f6e2c9", - "reference": "38f2c6ff0d3dfc497175a5cff5e24b3937f6e2c9", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/42c0854e00d6bb3346883d122b444fbf15a13ecb", + "reference": "42c0854e00d6bb3346883d122b444fbf15a13ecb", "shasum": "" }, "require": { @@ -3618,7 +3593,7 @@ ], "description": "HTML and Form Builders for the Laravel Framework", "homepage": "https://laravelcollective.com", - "time": "2018-04-26T16:09:18+00:00" + "time": "2018-05-10T17:15:15+00:00" }, { "name": "league/csv",