Skip to content

Commit 7c95f03

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]> # Conflicts: # public/css/build/AdminLTE.css # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/css/dist/skins/_all-skins.css # public/css/dist/skins/_all-skins.min.css # public/css/dist/skins/skin-black-dark.css # public/css/dist/skins/skin-black-dark.min.css # public/css/dist/skins/skin-black.css # public/css/dist/skins/skin-black.min.css # public/css/dist/skins/skin-blue-dark.css # public/css/dist/skins/skin-blue-dark.min.css # public/css/dist/skins/skin-blue.css # public/css/dist/skins/skin-blue.min.css # public/css/dist/skins/skin-contrast.css # public/css/dist/skins/skin-contrast.min.css # public/css/dist/skins/skin-green-dark.css # public/css/dist/skins/skin-green-dark.min.css # public/css/dist/skins/skin-green.css # public/css/dist/skins/skin-green.min.css # public/css/dist/skins/skin-orange-dark.css # public/css/dist/skins/skin-orange-dark.min.css # public/css/dist/skins/skin-orange.css # public/css/dist/skins/skin-orange.min.css # public/css/dist/skins/skin-purple-dark.css # public/css/dist/skins/skin-purple-dark.min.css # public/css/dist/skins/skin-purple.css # public/css/dist/skins/skin-purple.min.css # public/css/dist/skins/skin-red-dark.css # public/css/dist/skins/skin-red-dark.min.css # public/css/dist/skins/skin-red.css # public/css/dist/skins/skin-red.min.css # public/css/dist/skins/skin-yellow-dark.css # public/css/dist/skins/skin-yellow-dark.min.css # public/css/dist/skins/skin-yellow.css # public/css/dist/skins/skin-yellow.min.css # public/js/build/app.js # public/js/build/vendor.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json
2 parents 31e5c13 + dd86de0 commit 7c95f03

File tree

487 files changed

+2365
-143405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

487 files changed

+2365
-143405
lines changed

‎.env.docker‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ PUBLIC_FILESYSTEM_DISK=local_public
2828
# --------------------------------------------
2929
DB_CONNECTION=mysql
3030
DB_HOST=db
31+
DB_SOCKET=null
3132
DB_PORT='3306'
3233
DB_DATABASE=snipeit
3334
DB_USERNAME=snipeit

‎.env.example‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ PUBLIC_FILESYSTEM_DISK=local_public
2424
# --------------------------------------------
2525
DB_CONNECTION=mysql
2626
DB_HOST=127.0.0.1
27+
DB_SOCKET=null
2728
DB_PORT=3306
2829
DB_DATABASE=null
2930
DB_USERNAME=null

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"doctrine/dbal": "^3.1",
3838
"doctrine/instantiator": "^1.3",
3939
"eduardokum/laravel-mail-auto-embed": "^2.0",
40-
"enshrined/svg-sanitize": "^0.15.0",
40+
"enshrined/svg-sanitize": "^0.16.0",
4141
"erusev/parsedown": "^1.7",
4242
"fakerphp/faker": "^1.24",
4343
"guzzlehttp/guzzle": "^7.0.1",

‎composer.lock‎

Lines changed: 1192 additions & 1079 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/database.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
//'add_extra_option' => '--optionname=optionvalue',
1919
];
2020

21-
// Some versions of mysql do not support the --skip-ssl option and will fail if it is
21+
// Some versions of mysql do not support the --skip-ssl option and will fail if it is even set
2222
if (env('DB_DUMP_SKIP_SSL') == 'true') {
2323
$dump_options['skip_ssl'] = true;
2424
}

‎database/migrations/2023_12_19_081112_fix_language_dirs.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?php
22

33
use Illuminate\Database\Migrations\Migration;
4-
use Illuminate\Database\Schema\Blueprint;
5-
use Illuminate\Support\Facades\Schema;
4+
use Illuminate\Support\Facades\DB;
65
use \App\Helpers\Helper;
76
use \App\Models\Setting;
87
use \App\Models\User;

0 commit comments

Comments
 (0)