diff --git a/config/version.php b/config/version.php index 8ce887432f..de654ba27f 100644 --- a/config/version.php +++ b/config/version.php @@ -6,5 +6,5 @@ return array ( 'prerelease_version' => '', 'hash_version' => 'g51f729872', 'full_hash' => 'v6.0.9-103-g51f729872', - 'branch' => 'develop', -); \ No newline at end of file + 'branch' => 'master', +); diff --git a/public/css/build/AdminLTE.css b/public/css/build/AdminLTE.css index ccebc2f518..a5db4de5c9 100644 Binary files a/public/css/build/AdminLTE.css and b/public/css/build/AdminLTE.css differ diff --git a/public/css/build/app.css b/public/css/build/app.css index b2dbca0a06..dd42c1e284 100644 Binary files a/public/css/build/app.css and b/public/css/build/app.css differ diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index b3c9dc2194..6d1a66e856 100644 Binary files a/public/css/build/overrides.css and b/public/css/build/overrides.css differ diff --git a/public/css/dist/all.css b/public/css/dist/all.css index 2b7600d82e..ac6c22b5d0 100644 Binary files a/public/css/dist/all.css and b/public/css/dist/all.css differ diff --git a/public/css/dist/bootstrap-table.css b/public/css/dist/bootstrap-table.css index b95d3d2b77..0cffbb53c4 100644 Binary files a/public/css/dist/bootstrap-table.css and b/public/css/dist/bootstrap-table.css differ diff --git a/public/css/dist/signature-pad.min.css b/public/css/dist/signature-pad.min.css index 218b9c2365..7065929572 100644 Binary files a/public/css/dist/signature-pad.min.css and b/public/css/dist/signature-pad.min.css differ diff --git a/public/css/dist/skins/skin-black-dark.css b/public/css/dist/skins/skin-black-dark.css index 49c87a552e..d76dee7f27 100644 Binary files a/public/css/dist/skins/skin-black-dark.css and b/public/css/dist/skins/skin-black-dark.css differ diff --git a/public/css/dist/skins/skin-black-dark.min.css b/public/css/dist/skins/skin-black-dark.min.css index 49c87a552e..ff26f479fa 100644 Binary files a/public/css/dist/skins/skin-black-dark.min.css and b/public/css/dist/skins/skin-black-dark.min.css differ diff --git a/public/css/dist/skins/skin-black.css b/public/css/dist/skins/skin-black.css index d487beb26f..9c04429365 100644 Binary files a/public/css/dist/skins/skin-black.css and b/public/css/dist/skins/skin-black.css differ diff --git a/public/css/dist/skins/skin-black.min.css b/public/css/dist/skins/skin-black.min.css index d487beb26f..5c6ab5b33c 100644 Binary files a/public/css/dist/skins/skin-black.min.css and b/public/css/dist/skins/skin-black.min.css differ diff --git a/public/css/dist/skins/skin-blue-dark.css b/public/css/dist/skins/skin-blue-dark.css index 154e33ad35..83a34c7205 100644 Binary files a/public/css/dist/skins/skin-blue-dark.css and b/public/css/dist/skins/skin-blue-dark.css differ diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css index 154e33ad35..c9cc17f883 100644 Binary files a/public/css/dist/skins/skin-blue-dark.min.css and b/public/css/dist/skins/skin-blue-dark.min.css differ diff --git a/public/css/dist/skins/skin-blue.css b/public/css/dist/skins/skin-blue.css index c6212ed438..2c95e55e3d 100644 Binary files a/public/css/dist/skins/skin-blue.css and b/public/css/dist/skins/skin-blue.css differ diff --git a/public/css/dist/skins/skin-blue.min.css b/public/css/dist/skins/skin-blue.min.css index c6212ed438..e256b963ef 100644 Binary files a/public/css/dist/skins/skin-blue.min.css and b/public/css/dist/skins/skin-blue.min.css differ diff --git a/public/css/dist/skins/skin-contrast.css b/public/css/dist/skins/skin-contrast.css index b5d7fc4e9b..a6dbe96048 100644 Binary files a/public/css/dist/skins/skin-contrast.css and b/public/css/dist/skins/skin-contrast.css differ diff --git a/public/css/dist/skins/skin-contrast.min.css b/public/css/dist/skins/skin-contrast.min.css index b5d7fc4e9b..8119cf0697 100644 Binary files a/public/css/dist/skins/skin-contrast.min.css and b/public/css/dist/skins/skin-contrast.min.css differ diff --git a/public/css/dist/skins/skin-green-dark.css b/public/css/dist/skins/skin-green-dark.css index edc375c598..1e78351e12 100644 Binary files a/public/css/dist/skins/skin-green-dark.css and b/public/css/dist/skins/skin-green-dark.css differ diff --git a/public/css/dist/skins/skin-green-dark.min.css b/public/css/dist/skins/skin-green-dark.min.css index edc375c598..76a6905966 100644 Binary files a/public/css/dist/skins/skin-green-dark.min.css and b/public/css/dist/skins/skin-green-dark.min.css differ diff --git a/public/css/dist/skins/skin-green.css b/public/css/dist/skins/skin-green.css index 04ce314c9e..bb79c7622b 100644 Binary files a/public/css/dist/skins/skin-green.css and b/public/css/dist/skins/skin-green.css differ diff --git a/public/css/dist/skins/skin-green.min.css b/public/css/dist/skins/skin-green.min.css index 04ce314c9e..1804835d2f 100644 Binary files a/public/css/dist/skins/skin-green.min.css and b/public/css/dist/skins/skin-green.min.css differ diff --git a/public/css/dist/skins/skin-orange-dark.css b/public/css/dist/skins/skin-orange-dark.css index 9ec6c0cc20..4fc8fedf56 100644 Binary files a/public/css/dist/skins/skin-orange-dark.css and b/public/css/dist/skins/skin-orange-dark.css differ diff --git a/public/css/dist/skins/skin-orange-dark.min.css b/public/css/dist/skins/skin-orange-dark.min.css index 9ec6c0cc20..b6e69b2c78 100644 Binary files a/public/css/dist/skins/skin-orange-dark.min.css and b/public/css/dist/skins/skin-orange-dark.min.css differ diff --git a/public/css/dist/skins/skin-orange.css b/public/css/dist/skins/skin-orange.css index 052c01f873..17d6de7c35 100644 Binary files a/public/css/dist/skins/skin-orange.css and b/public/css/dist/skins/skin-orange.css differ diff --git a/public/css/dist/skins/skin-orange.min.css b/public/css/dist/skins/skin-orange.min.css index 052c01f873..1f85a3fba2 100644 Binary files a/public/css/dist/skins/skin-orange.min.css and b/public/css/dist/skins/skin-orange.min.css differ diff --git a/public/css/dist/skins/skin-purple-dark.css b/public/css/dist/skins/skin-purple-dark.css index 10b8ec649b..d7a9d2036d 100644 Binary files a/public/css/dist/skins/skin-purple-dark.css and b/public/css/dist/skins/skin-purple-dark.css differ diff --git a/public/css/dist/skins/skin-purple-dark.min.css b/public/css/dist/skins/skin-purple-dark.min.css index 10b8ec649b..a2d5ab86b5 100644 Binary files a/public/css/dist/skins/skin-purple-dark.min.css and b/public/css/dist/skins/skin-purple-dark.min.css differ diff --git a/public/css/dist/skins/skin-purple.css b/public/css/dist/skins/skin-purple.css index bb4d0b9bd3..ebb5441582 100644 Binary files a/public/css/dist/skins/skin-purple.css and b/public/css/dist/skins/skin-purple.css differ diff --git a/public/css/dist/skins/skin-purple.min.css b/public/css/dist/skins/skin-purple.min.css index bb4d0b9bd3..42740d58c3 100644 Binary files a/public/css/dist/skins/skin-purple.min.css and b/public/css/dist/skins/skin-purple.min.css differ diff --git a/public/css/dist/skins/skin-red-dark.css b/public/css/dist/skins/skin-red-dark.css index daa1203978..49ae16cff3 100644 Binary files a/public/css/dist/skins/skin-red-dark.css and b/public/css/dist/skins/skin-red-dark.css differ diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css index daa1203978..63c1d35722 100644 Binary files a/public/css/dist/skins/skin-red-dark.min.css and b/public/css/dist/skins/skin-red-dark.min.css differ diff --git a/public/css/dist/skins/skin-red.css b/public/css/dist/skins/skin-red.css index f8b67c606a..e76f831922 100644 Binary files a/public/css/dist/skins/skin-red.css and b/public/css/dist/skins/skin-red.css differ diff --git a/public/css/dist/skins/skin-red.min.css b/public/css/dist/skins/skin-red.min.css index f8b67c606a..4c03bc7460 100644 Binary files a/public/css/dist/skins/skin-red.min.css and b/public/css/dist/skins/skin-red.min.css differ diff --git a/public/css/dist/skins/skin-yellow-dark.css b/public/css/dist/skins/skin-yellow-dark.css index 81a432315b..66824328eb 100644 Binary files a/public/css/dist/skins/skin-yellow-dark.css and b/public/css/dist/skins/skin-yellow-dark.css differ diff --git a/public/css/dist/skins/skin-yellow-dark.min.css b/public/css/dist/skins/skin-yellow-dark.min.css index 81a432315b..66ab4a38c2 100644 Binary files a/public/css/dist/skins/skin-yellow-dark.min.css and b/public/css/dist/skins/skin-yellow-dark.min.css differ diff --git a/public/css/dist/skins/skin-yellow.css b/public/css/dist/skins/skin-yellow.css index 8a799cb64f..c64d603a7f 100644 Binary files a/public/css/dist/skins/skin-yellow.css and b/public/css/dist/skins/skin-yellow.css differ diff --git a/public/css/dist/skins/skin-yellow.min.css b/public/css/dist/skins/skin-yellow.min.css index 8a799cb64f..eb787b12ed 100644 Binary files a/public/css/dist/skins/skin-yellow.min.css and b/public/css/dist/skins/skin-yellow.min.css differ diff --git a/public/js/build/app.js b/public/js/build/app.js index 86271ab132..3d18f01709 100644 Binary files a/public/js/build/app.js and b/public/js/build/app.js differ diff --git a/public/js/build/app.js.LICENSE.txt b/public/js/build/app.js.LICENSE.txt index 2012f7dd73..bab10bf65d 100644 Binary files a/public/js/build/app.js.LICENSE.txt and b/public/js/build/app.js.LICENSE.txt differ diff --git a/public/js/build/vendor.js b/public/js/build/vendor.js index b5ee42d9f6..38212409f3 100644 Binary files a/public/js/build/vendor.js and b/public/js/build/vendor.js differ diff --git a/public/js/dist/all.js b/public/js/dist/all.js index c4595c7bb9..2f5ae93d31 100644 Binary files a/public/js/dist/all.js and b/public/js/dist/all.js differ diff --git a/public/js/dist/bootstrap-table.js b/public/js/dist/bootstrap-table.js index 0fafbbff9b..2f4be303fa 100644 Binary files a/public/js/dist/bootstrap-table.js and b/public/js/dist/bootstrap-table.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 3f3b65f2af..35b192a8da 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,24 +1,24 @@ { - "/js/build/app.js": "/js/build/app.js?id=20dff7dc4c2bff26e20b4e78ad9dd9e5", - "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=71977934351d63b126c6b3573baf3349", - "/css/build/overrides.css": "/css/build/overrides.css?id=933065998b88257a57bfb1650d82b76c", - "/css/build/app.css": "/css/build/app.css?id=4cbaeaaac109b0a70a3ad718b66f5b82", - "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b", - "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=0715caf11a30f0756768c093ee3a5a8f", - "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=710f4c82f6f13fc9edfa88a378623621", - "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=b7ab5ed379611d0bb96ab06bd93bb204", - "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=c1c4144c4d6448fa40905d31abe25b6f", - "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=47021aa27f4112d4abb6ba9ca371ded3", - "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=256b5dde6c4a4eed91171b59d3cf07e0", - "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=73bb57f917efb32895488cef3d92b42a", - "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=0c67d6bedcd67993ea2c8af8a2a223fa", - "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=e26410d91aa3ef39c97e816187cf670c", - "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=924fd5e1d5d41ffc483841a628eb9c58", - "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=b165571f42e59a72e6165af9b1b7d429", - "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=407f83d58689706f303a83e195f6c041", - "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=8e538625ebd4b8096e150d1aa483547b", - "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=c17879493dcd86dbb6c1701082bec9f7", - "/css/dist/all.css": "/css/dist/all.css?id=7aa07fa7dad1ea53568782ab1a822179", + "/js/build/app.js": "/js/build/app.js?id=9b2bd6c2e9b882c53969c66a9628a150", + "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=940da5c039a1f104654e127e0d43b801", + "/css/build/overrides.css": "/css/build/overrides.css?id=6a8926c5699dc8117fce282bddef6222", + "/css/build/app.css": "/css/build/app.css?id=e319e07a1e4eeb413e5667136850ea12", + "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=f25c77ed07053646a42e9c19923d24fa", + "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=083eab0a6e1062adfe24ee21a829e6c3", + "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=0245911190e2ff51f1710360b9fd25c4", + "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=b56c0c0c824d6c61b2ec83bc23633184", + "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=6f96d990312f7399988d14cb99d93165", + "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=bcacab67c45f81a06e6f84c4872cfd84", + "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=3a6f6c5794864b09096b6abf9760142b", + "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=06ff5fe6930e974a9d13794196fcf48a", + "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=c2713ee362b046e0495fe162a981e860", + "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=832480a768184432af05d0109acfd7c8", + "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=c3033f52259f665b0e46b9c88543035a", + "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=c13434c44fb6016396b1f7bac44e77d2", + "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=af9b811e81b591789d1155c0d4ed42af", + "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=fc501683e0cb04a8717593610d215baf", + "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=476ccb37fe487f4d29ebfb49c198e311", + "/css/dist/all.css": "/css/dist/all.css?id=82b3119afe3686b7f39f0ae690959768", "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f2122815b2e4b150", "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b2414bd51dac5", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", @@ -34,20 +34,20 @@ "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=ee4896df8b8f008ce73a9a0c2549aefd", "/js/build/vendor.js": "/js/build/vendor.js?id=47ecbb4bb3b0e02315f391caadbdf971", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=14d9a2affec7b066d20fcba2e6e67ad2", - "/js/dist/all.js": "/js/dist/all.js?id=ea971e5285bb940af1a908bbeeb6fcb8", - "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=407f83d58689706f303a83e195f6c041", - "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=b165571f42e59a72e6165af9b1b7d429", - "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=924fd5e1d5d41ffc483841a628eb9c58", - "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=e26410d91aa3ef39c97e816187cf670c", - "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=71977934351d63b126c6b3573baf3349", - "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=b7ab5ed379611d0bb96ab06bd93bb204", - "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=47021aa27f4112d4abb6ba9ca371ded3", - "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=c1c4144c4d6448fa40905d31abe25b6f", - "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=c17879493dcd86dbb6c1701082bec9f7", - "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=0c67d6bedcd67993ea2c8af8a2a223fa", - "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=73bb57f917efb32895488cef3d92b42a", - "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=256b5dde6c4a4eed91171b59d3cf07e0", - "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=0715caf11a30f0756768c093ee3a5a8f", - "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=710f4c82f6f13fc9edfa88a378623621", - "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=8e538625ebd4b8096e150d1aa483547b" + "/js/dist/all.js": "/js/dist/all.js?id=065a8f4827b94b2f743fa1598ff2f196", + "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=af9b811e81b591789d1155c0d4ed42af", + "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=c13434c44fb6016396b1f7bac44e77d2", + "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=c3033f52259f665b0e46b9c88543035a", + "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=832480a768184432af05d0109acfd7c8", + "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=940da5c039a1f104654e127e0d43b801", + "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=b56c0c0c824d6c61b2ec83bc23633184", + "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=bcacab67c45f81a06e6f84c4872cfd84", + "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=6f96d990312f7399988d14cb99d93165", + "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=476ccb37fe487f4d29ebfb49c198e311", + "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=c2713ee362b046e0495fe162a981e860", + "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=06ff5fe6930e974a9d13794196fcf48a", + "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=3a6f6c5794864b09096b6abf9760142b", + "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=083eab0a6e1062adfe24ee21a829e6c3", + "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=0245911190e2ff51f1710360b9fd25c4", + "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=fc501683e0cb04a8717593610d215baf" }