Skip to content

Commit

Permalink
Merge branch 'release/6.0.42'
Browse files Browse the repository at this point in the history
* release/6.0.42:
  remove the incompatible test
  fix for the failing tests and dependency upgrades
  • Loading branch information
austintoddj committed Jul 22, 2022
2 parents e35fceb + 2e4621a commit 195d170
Show file tree
Hide file tree
Showing 9 changed files with 1,800 additions and 1,734 deletions.
809 changes: 461 additions & 348 deletions composer.lock

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions public/css/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/css/app.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/app.js

Large diffs are not rendered by default.

18 changes: 10 additions & 8 deletions public/js/app.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* @license MIT */

/*!
* Bootstrap v4.6.1 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Bootstrap v4.6.2 (https://getbootstrap.com/)
* Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

Expand All @@ -22,19 +22,19 @@
*/

/*!
* FilePond 4.30.3
* FilePond 4.30.4
* Licensed under MIT, https://opensource.org/licenses/MIT/
* Please visit https://pqina.nl/filepond/ for details.
*/

/*!
* FilePondPluginFileValidateSize 2.2.5
* FilePondPluginFileValidateSize 2.2.7
* Licensed under MIT, https://opensource.org/licenses/MIT/
* Please visit https://pqina.nl/filepond/ for details.
*/

/*!
* FilePondPluginFileValidateType 1.2.6
* FilePondPluginFileValidateType 1.2.8
* Licensed under MIT, https://opensource.org/licenses/MIT/
* Please visit https://pqina.nl/filepond/ for details.
*/
Expand All @@ -46,7 +46,7 @@
*/

/*!
* FilePondPluginImagePreview 4.6.10
* FilePondPluginImagePreview 4.6.11
* Licensed under MIT, https://opensource.org/licenses/MIT/
* Please visit https://pqina.nl/filepond/ for details.
*/
Expand Down Expand Up @@ -92,8 +92,8 @@
*/

/*!
* Vue.js v2.6.14
* (c) 2014-2021 Evan You
* Vue.js v2.7.8
* (c) 2014-2022 Evan You
* Released under the MIT License.
*/

Expand Down Expand Up @@ -143,6 +143,8 @@

/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */

/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */

/**!
* @fileOverview Kickass library to create and place poppers near their reference elements.
* @version 1.16.1
Expand Down
2 changes: 1 addition & 1 deletion public/js/app.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"/js/app.js": "/js/app.js?id=fc965861f0fae23e048863813d6d6e13",
"/css/app.css": "/css/app.css?id=5fde757ef02dafca47fd3a9187fad8d2"
"/js/app.js": "/js/app.js?id=bb8b03ebe970542a35947220a376c601",
"/css/app.css": "/css/app.css?id=24cec182e4a80809167644b6cb3cf632"
}
23 changes: 0 additions & 23 deletions tests/Console/PublishCommandTest.php

This file was deleted.

2,662 changes: 1,318 additions & 1,344 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 195d170

Please sign in to comment.