Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]> # Conflicts: # config/version.php # public/js/dist/bootstrap-table.js # public/mix-manifest.json
snipe · Mar 26, 2024 · 7060ffa · 7060ffa
2 parents b34156c + 02a37e2
commit 7060ffa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/config/version.php b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
   'app_version' => 'v6.3.3',
-  'full_app_version' => 'v6.3.3 - build 12903-g0f63fa23e',
-  'build_version' => '12903',
+  'full_app_version' => 'v6.3.3 - build 13056-gb34156ca2',
+  'build_version' => '13056',
   'prerelease_version' => '',
-  'hash_version' => 'g0f63fa23e',
-  'full_hash' => 'v6.3.3-67-g0f63fa23e',
+  'hash_version' => 'gb34156ca2',
+  'full_hash' => 'v6.3.3-151-gb34156ca2',
   'branch' => 'master',
 );
diff --git a/public/js/dist/bootstrap-table.js b/public/js/dist/bootstrap-table.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -31,7 +31,7 @@
     "/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=e11465c0eff0549edd4e8ea6bbcf242f",
     "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=99c395f0bab5966f32f63f4e55899e64",
     "/js/build/vendor.js": "/js/build/vendor.js?id=a2b971da417306a63385c8098acfe4af",
-    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=47596e30f56a42f12175ac54592d0912",
+    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=857da5daffd13e0553510e5ccd410c79",
     "/js/dist/all.js": "/js/dist/all.js?id=fca6ea9956fd827d9790c08e0e982b22",
     "/js/dist/all-defer.js": "/js/dist/all-defer.js?id=19ccc62a8f1ea103dede4808837384d4",
     "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=b48f4d8af0e1ca5621c161e93951109f",

diff --git a/webpack.mix.js b/webpack.mix.js
@@ -183,7 +183,6 @@ mix
         [
             "./resources/assets/js/dragtable.js",
             './node_modules/bootstrap-table/dist/bootstrap-table.js',
-            "./resources/assets/js/bootstrap-table-reorder-columns.js",
             './node_modules/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile.js',
             './node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.js',
             './node_modules/bootstrap-table/dist/extensions/cookie/bootstrap-table-cookie.js',