diff --git a/.all-contributorsrc b/.all-contributorsrc index 2cfb30015d..2b182a2476 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -2306,6 +2306,33 @@ "contributions": [ "code" ] + }, + { + "login": "JohnnyPicnic", + "name": "JohnnyPicnic", + "avatar_url": "https://avatars.githubusercontent.com/u/5553884?v=4", + "profile": "https://github.com/JohnnyPicnic", + "contributions": [ + "code" + ] + }, + { + "login": "markbrule", + "name": "markbrule", + "avatar_url": "https://avatars.githubusercontent.com/u/8799594?v=4", + "profile": "https://github.com/markbrule", + "contributions": [ + "code" + ] + }, + { + "login": "mikecmpbll", + "name": "Mike Campbell", + "avatar_url": "https://avatars.githubusercontent.com/u/1962801?v=4", + "profile": "https://github.com/mikecmpbll", + "contributions": [ + "code" + ] } ] } diff --git a/.env.example b/.env.example index b4b173414a..31e3cca14b 100644 --- a/.env.example +++ b/.env.example @@ -77,7 +77,7 @@ ENCRYPT=false COOKIE_NAME=snipeit_session COOKIE_DOMAIN=null SECURE_COOKIES=false -API_TOKEN_EXPIRATION_YEARS=40 +API_TOKEN_EXPIRATION_YEARS=15 # -------------------------------------------- # OPTIONAL: SECURITY HEADER SETTINGS diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 24a7c3d1f9..64cac8df22 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -57,7 +57,7 @@ RUN \ && mkdir -p "/var/lib/snipeit/dumps" && rm -r "/var/www/html/storage/app/backups" && ln -fs "/var/lib/snipeit/dumps" "/var/www/html/storage/app/backups" \ && mkdir -p "/var/lib/snipeit/keys" && ln -fs "/var/lib/snipeit/keys/oauth-private.key" "/var/www/html/storage/oauth-private.key" \ && ln -fs "/var/lib/snipeit/keys/oauth-public.key" "/var/www/html/storage/oauth-public.key" \ - && chown -h "/var/www/html/storage/*.key" + && chown -hR apache "/var/www/html/storage/" \ && chown -R apache "/var/lib/snipeit" # Install composer diff --git a/README.md b/README.md index 696384fd5f..0b7f4c3dec 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade) -[![All Contributors](https://img.shields.io/badge/all_contributors-253-orange.svg?style=flat-square)](#contributors) +[![All Contributors](https://img.shields.io/badge/all_contributors-256-orange.svg?style=flat-square)](#contributors) ## Snipe-IT - Open Source Asset Management System @@ -125,7 +125,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken | [
Kevin KΓΆllmann](https://www.kevinkoellmann.de)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=koelle25 "Code") | [
sw-mreyes](https://github.com/sw-mreyes)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=sw-mreyes "Code") | [
Joel Pittet](https://pittet.ca)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=joelpittet "Code") | [
Eli Young](https://elyscape.com)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=elyscape "Code") | [
Raell Dottin](https://github.com/raelldottin)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=raelldottin "Code") | [
Tom Misilo](https://github.com/misilot)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=misilot "Code") | [
David Davenne](http://david.davenne.be)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=JuustoMestari "Code") | | [
Mark Stenglein](https://markstenglein.com)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=ocelotsloth "Code") | [
ajsy](https://github.com/ajsy)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=ajsy "Code") | [
Jan Kiesewetter](https://github.com/t3easy)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=t3easy "Code") | [
Tetrachloromethane250](https://github.com/Tetrachloromethane250)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=Tetrachloromethane250 "Code") | [
Lars Kajes](https://www.kajes.se/)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=kajes "Code") | [
Joly0](https://github.com/Joly0)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=Joly0 "Code") | [
theburger](https://github.com/limeless)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=limeless "Code") | | [
David Valin Alonso](https://github.com/deivishome)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=deivishome "Code") | [
andreaci](https://github.com/andreaci)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=andreaci "Code") | [
Jelle Sebreghts](http://www.jellesebreghts.be)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=Jelle-S "Code") | [
Michael Pietsch](https://github.com/Skywalker-11)
| [
Masudul Haque Shihab](https://github.com/sh1hab)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=sh1hab "Code") | [
Supapong Areeprasertkul](http://www.freedomdive.com/)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=zybersup "Code") | [
Peter Sarossy](https://github.com/psarossy)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=psarossy "Code") | -| [
Renee Margaret McConahy](https://github.com/nepella)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | +| [
Renee Margaret McConahy](https://github.com/nepella)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [
JohnnyPicnic](https://github.com/JohnnyPicnic)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [
markbrule](https://github.com/markbrule)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") | [
Mike Campbell](https://github.com/mikecmpbll)
[πŸ’»](https://github.com/snipe/snipe-it/commits?author=mikecmpbll "Code") | This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome! diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php index f27d48c7c8..edbf90d15c 100644 --- a/app/Http/Controllers/Api/AccessoriesController.php +++ b/app/Http/Controllers/Api/AccessoriesController.php @@ -287,7 +287,7 @@ class AccessoriesController extends Controller $accessory = Accessory::find($accessory_user->accessory_id); $this->authorize('checkin', $accessory); - $logaction = $accessory->logCheckin(User::find($accessoryUserId), $request->input('note')); + $logaction = $accessory->logCheckin(User::find($accessory_user->user_id), $request->input('note')); // Was the accessory updated? if (DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) { diff --git a/app/Http/Controllers/Assets/AssetFilesController.php b/app/Http/Controllers/Assets/AssetFilesController.php index 28aa3097c5..7cdd075ab9 100644 --- a/app/Http/Controllers/Assets/AssetFilesController.php +++ b/app/Http/Controllers/Assets/AssetFilesController.php @@ -110,15 +110,15 @@ class AssetFilesController extends Controller { $asset = Asset::find($assetId); $this->authorize('update', $asset); - $rel_path = 'storage/private_uploads/assets'; + $rel_path = 'private_uploads/assets'; // the asset is valid if (isset($asset->id)) { $this->authorize('update', $asset); $log = Actionlog::find($fileId); if ($log) { - if (file_exists(base_path().'/'.$rel_path.'/'.$log->filename)) { - Storage::disk('public')->delete($rel_path.'/'.$log->filename); + if (Storage::exists($rel_path.'/'.$log->filename)) { + Storage::delete($rel_path.'/'.$log->filename); } $log->delete(); return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success')); diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 12c5f06949..8fed678d40 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -813,7 +813,7 @@ class AssetsController extends Controller $asset->unsetEventDispatcher(); $asset->next_audit_date = $request->input('next_audit_date'); - $asset->last_audit_date = date('Y-m-d h:i:s'); + $asset->last_audit_date = date('Y-m-d H:i:s'); // Check to see if they checked the box to update the physical location, // not just note it in the audit notes diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php index 4f07cb05d5..7a112656d4 100755 --- a/app/Http/Controllers/LocationsController.php +++ b/app/Http/Controllers/LocationsController.php @@ -6,6 +6,7 @@ use App\Http\Requests\ImageUploadRequest; use App\Models\Location; use App\Models\User; use Illuminate\Support\Facades\Auth; +use App\Models\Asset; use Illuminate\Support\Facades\Storage; /** diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index c6faa3cd97..4b92634b4d 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -416,7 +416,7 @@ class ReportsController extends Controller // Open output stream $handle = fopen('php://output', 'w'); stream_set_timeout($handle, 2000); - + if ($request->filled('use_bom')) { fprintf($handle, chr(0xEF) . chr(0xBB) . chr(0xBF)); } @@ -487,7 +487,7 @@ class ReportsController extends Controller if ($request->filled('rtd_location')) { $header[] = trans('admin/hardware/form.default_location'); } - + if ($request->filled('rtd_location_address')) { $header[] = trans('general.address'); $header[] = trans('general.address'); @@ -578,7 +578,7 @@ class ReportsController extends Controller $assets = \App\Models\Company::scopeCompanyables(Asset::select('assets.*'))->with( 'location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo', 'model.category', 'model.manufacturer','supplier'); - + if ($request->filled('by_location_id')) { $assets->where('assets.location_id', $request->input('by_location_id')); } @@ -640,8 +640,8 @@ class ReportsController extends Controller if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) { $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]); } - - $assets->orderBy('assets.created_at', 'ASC')->chunk(20, function($assets) use($handle, $customfields, $request) { + + $assets->orderBy('assets.id', 'ASC')->chunk(20, function($assets) use($handle, $customfields, $request) { $executionTime = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"]; \Log::debug('Walking results: '.$executionTime); @@ -649,7 +649,7 @@ class ReportsController extends Controller foreach ($assets as $asset) { $count++; $row = []; - + if ($request->filled('company')) { $row[] = ($asset->company) ? $asset->company->name : ''; } @@ -698,7 +698,7 @@ class ReportsController extends Controller if ($request->filled('supplier')) { $row[] = ($asset->supplier) ? $asset->supplier->name : ''; } - + if ($request->filled('location')) { $row[] = ($asset->location) ? $asset->location->present()->name() : ''; @@ -940,11 +940,11 @@ class ReportsController extends Controller * Get all assets with pending checkout acceptances */ - $acceptances = CheckoutAcceptance::pending()->with('assignedTo')->get(); + $acceptances = CheckoutAcceptance::pending()->get(); $assetsForReport = $acceptances ->filter(function($acceptance) { - return $acceptance->checkoutable_type == 'App\Models\Asset' && !is_null($acceptance->assignedTo); + return $acceptance->checkoutable_type == 'App\Models\Asset'; }) ->map(function($acceptance) { return $acceptance->checkoutable; diff --git a/config/version.php b/config/version.php index bff7058c95..2b06619fef 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v5.1.5', - 'full_app_version' => 'v5.1.5 - build 6029-gb8c356443', - 'build_version' => '6029', + 'full_app_version' => 'v5.1.5 - build 6055-gd9d5b4d73', + 'build_version' => '6055', 'prerelease_version' => '', - 'hash_version' => 'gb8c356443', - 'full_hash' => 'v5.1.5-125-gb8c356443', + 'hash_version' => 'gd9d5b4d73', + 'full_hash' => 'v5.1.5-17-gd9d5b4d73', 'branch' => 'develop', ); \ No newline at end of file diff --git a/public/css/dist/skins/skin-black-dark.css b/public/css/dist/skins/skin-black-dark.css index d0127ff92d..fe37f7bfbd 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 d0127ff92d..fe37f7bfbd 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 d877413b62..d451cf664c 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 d877413b62..d451cf664c 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 f39f87cd16..354b6a044a 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 f39f87cd16..354b6a044a 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 764cc18fca..c6e206ce81 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 764cc18fca..c6e206ce81 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 7a36625af6..35bf9fd0c9 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 7a36625af6..35bf9fd0c9 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 de6a20c4ed..77d6268832 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 de6a20c4ed..77d6268832 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 14b3193355..e7cef037dc 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 14b3193355..e7cef037dc 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 c3d2bfaaa6..b2b7a88bde 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 c3d2bfaaa6..b2b7a88bde 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 ba4201ebe6..8967ee4964 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 ba4201ebe6..8967ee4964 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 036868245b..e2b5e31e06 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 036868245b..e2b5e31e06 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 2bf4309d1e..d046db972a 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 2bf4309d1e..d046db972a 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 8f28047641..8a6b85e256 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 8f28047641..8a6b85e256 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 2c32768168..71762b3d1f 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 2c32768168..71762b3d1f 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 1d86aff956..b59bef009a 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 1d86aff956..b59bef009a 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 b8e36d0693..673bf1a9f1 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 b8e36d0693..673bf1a9f1 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/mix-manifest.json b/public/mix-manifest.json index b8f5625808..b62c0b576a 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -3,21 +3,21 @@ "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=5d8ce6b758f170008cd6", "/css/build/app.css": "/css/build/app.css?id=9b6ddbece1a3cfc99036", "/css/build/overrides.css": "/css/build/overrides.css?id=0a65220cdae6fbb6d913", - "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=a5c05d669800b5f5afa1", - "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=1d5974e034b61b5795ec", - "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=cf23e72b9c963c5ab23a", - "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=76d0cc15e24e6a03fd2f", - "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=6843dc80c6b201c4a7db", - "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=d3c953fe66305cef3b54", - "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=97d81897063e94094a2a", - "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=679ab6aeba9c278a9051", - "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=56d008e86c006d37bc23", - "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=915206c9df022fc5037a", - "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=2b17e31c820ef66db5a1", - "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=ccdd91178df4c10811e9", - "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=928bfe8035be1497e83b", - "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=539f691ddc970f867c49", - "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=4bf9e22405edb2dc2b76", + "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=e57a7bb77ae1fb640331", + "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=fdb6630b38435c84c7d2", + "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=5d582ce5e98f591b8c65", + "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=02e8563844e00840e01c", + "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=4daaa0e353849ff8cacf", + "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=c89047b28b272bc07e81", + "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=9f9013a3ec06e256e1dc", + "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=5b4937fd36d26f7a92e3", + "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=e6239abc2a7a28441911", + "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=85ef26204fbc8b2dad5b", + "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=84667fc9b0f00d11a9c4", + "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=8e774a0e5435527d63c4", + "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=5269656828cfba157e92", + "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=0a4ddc28e3a8228cc11e", + "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=b22dc3561eda3d2027a9", "/css/dist/all.css": "/css/dist/all.css?id=fc64989106daf3be016b", "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a", "/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac", @@ -27,19 +27,19 @@ "/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=fd6e727609678bf04984", "/js/dist/all.js": "/js/dist/all.js?id=d0fbb4953b84b70787d4", - "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=76d0cc15e24e6a03fd2f", - "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=6843dc80c6b201c4a7db", - "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=d3c953fe66305cef3b54", - "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=97d81897063e94094a2a", - "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=a5c05d669800b5f5afa1", - "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=928bfe8035be1497e83b", - "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=2b17e31c820ef66db5a1", - "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=ccdd91178df4c10811e9", - "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=1d5974e034b61b5795ec", - "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=679ab6aeba9c278a9051", - "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=56d008e86c006d37bc23", - "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=915206c9df022fc5037a", - "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=4bf9e22405edb2dc2b76", - "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=539f691ddc970f867c49", - "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=cf23e72b9c963c5ab23a" + "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=02e8563844e00840e01c", + "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=4daaa0e353849ff8cacf", + "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=c89047b28b272bc07e81", + "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=9f9013a3ec06e256e1dc", + "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=e57a7bb77ae1fb640331", + "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=5269656828cfba157e92", + "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=84667fc9b0f00d11a9c4", + "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=8e774a0e5435527d63c4", + "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=fdb6630b38435c84c7d2", + "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=5b4937fd36d26f7a92e3", + "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=e6239abc2a7a28441911", + "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=85ef26204fbc8b2dad5b", + "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=b22dc3561eda3d2027a9", + "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=0a4ddc28e3a8228cc11e", + "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=5d582ce5e98f591b8c65" } diff --git a/resources/assets/less/skins/skin-black-dark.less b/resources/assets/less/skins/skin-black-dark.less index aa3c1d3c22..bc99522b4d 100644 --- a/resources/assets/less/skins/skin-black-dark.less +++ b/resources/assets/less/skins/skin-black-dark.less @@ -403,3 +403,6 @@ a { display: table-cell; } +.search-highlight, .search-highlight:hover { + background-color: #e9d15b; +} \ No newline at end of file diff --git a/resources/assets/less/skins/skin-black.less b/resources/assets/less/skins/skin-black.less index 7dfb525340..b1660b26b4 100755 --- a/resources/assets/less/skins/skin-black.less +++ b/resources/assets/less/skins/skin-black.less @@ -108,4 +108,8 @@ a { } .select2-container--default .select2-selection--multiple .select2-selection__choice { background-color: @black; +} + +.search-highlight, .search-highlight:hover { + background-color: #e9d15b; } \ No newline at end of file diff --git a/resources/assets/less/skins/skin-blue-dark.less b/resources/assets/less/skins/skin-blue-dark.less index e387a54b5b..aca5b7f4ab 100644 --- a/resources/assets/less/skins/skin-blue-dark.less +++ b/resources/assets/less/skins/skin-blue-dark.less @@ -392,3 +392,6 @@ a { display: table-cell; } +.search-highlight, .search-highlight:hover { + background-color: #e9d15b; +} \ No newline at end of file diff --git a/resources/assets/less/skins/skin-blue.less b/resources/assets/less/skins/skin-blue.less index 1268415f53..1644faeaa1 100755 --- a/resources/assets/less/skins/skin-blue.less +++ b/resources/assets/less/skins/skin-blue.less @@ -120,4 +120,8 @@ a { } .select2-container--default .select2-selection--multiple .select2-selection__choice { background-color: #3c8dbc; +} + +.search-highlight, .search-highlight:hover { + background-color: #e9d15b; } \ No newline at end of file diff --git a/resources/assets/less/skins/skin-contrast.less b/resources/assets/less/skins/skin-contrast.less index bca355c52e..f66e76676b 100644 --- a/resources/assets/less/skins/skin-contrast.less +++ b/resources/assets/less/skins/skin-contrast.less @@ -168,4 +168,8 @@ input::-ms-input-placeholder { /* IE 10+ */ .fixed-table-container tbody .selected td { background-color: #fff8af; +} + +.search-highlight, .search-highlight:hover { + background-color: #e9d15b; } \ No newline at end of file diff --git a/resources/assets/less/skins/skin-green-dark.less b/resources/assets/less/skins/skin-green-dark.less index 315fe3ba0f..41f2c69f5c 100644 --- a/resources/assets/less/skins/skin-green-dark.less +++ b/resources/assets/less/skins/skin-green-dark.less @@ -392,3 +392,7 @@ a { display: table-cell; } + +.search-highlight, .search-highlight:hover { + background-color: #e9d15b; +} \ No newline at end of file diff --git a/resources/assets/less/skins/skin-green.less b/resources/assets/less/skins/skin-green.less index d8fcf84033..0c0a9bdbc3 100755 --- a/resources/assets/less/skins/skin-green.less +++ b/resources/assets/less/skins/skin-green.less @@ -105,4 +105,8 @@ a { } .select2-container--default .select2-selection--multiple .select2-selection__choice { background-color: @green; +} + +.search-highlight, .search-highlight:hover { + background-color: #e9d15b; } \ No newline at end of file diff --git a/resources/assets/less/skins/skin-orange-dark.less b/resources/assets/less/skins/skin-orange-dark.less index 148a779031..78e2ab64e0 100644 --- a/resources/assets/less/skins/skin-orange-dark.less +++ b/resources/assets/less/skins/skin-orange-dark.less @@ -394,3 +394,6 @@ a { display: table-cell; } +.search-highlight, .search-highlight:hover { + background-color: #e9d15b; +} \ No newline at end of file diff --git a/resources/assets/less/skins/skin-orange.less b/resources/assets/less/skins/skin-orange.less index 1884b66d0c..fb66309249 100644 --- a/resources/assets/less/skins/skin-orange.less +++ b/resources/assets/less/skins/skin-orange.less @@ -105,4 +105,8 @@ a { } .select2-container--default .select2-selection--multiple .select2-selection__choice { background-color: @orange; +} + +.search-highlight, .search-highlight:hover { + background-color: #e9d15b; } \ No newline at end of file diff --git a/resources/assets/less/skins/skin-purple-dark.less b/resources/assets/less/skins/skin-purple-dark.less index 112ae19e9d..97498c7aaa 100644 --- a/resources/assets/less/skins/skin-purple-dark.less +++ b/resources/assets/less/skins/skin-purple-dark.less @@ -394,3 +394,6 @@ a { display: table-cell; } +.search-highlight, .search-highlight:hover { + background-color: #e9d15b; +} \ No newline at end of file diff --git a/resources/assets/less/skins/skin-purple.less b/resources/assets/less/skins/skin-purple.less index 294839e431..4c4accd594 100755 --- a/resources/assets/less/skins/skin-purple.less +++ b/resources/assets/less/skins/skin-purple.less @@ -108,3 +108,6 @@ a { background-color: @purple; } +.search-highlight, .search-highlight:hover { + background-color: #e9d15b; +} \ No newline at end of file diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less index 405e14f13f..59705c163b 100644 --- a/resources/assets/less/skins/skin-red-dark.less +++ b/resources/assets/less/skins/skin-red-dark.less @@ -393,3 +393,6 @@ a { display: table-cell; } +.search-highlight, .search-highlight:hover { + background-color: #e9d15b; +} \ No newline at end of file diff --git a/resources/assets/less/skins/skin-red.less b/resources/assets/less/skins/skin-red.less index 3aab107e43..e53f812c5b 100755 --- a/resources/assets/less/skins/skin-red.less +++ b/resources/assets/less/skins/skin-red.less @@ -105,4 +105,8 @@ a { } .select2-container--default .select2-selection--multiple .select2-selection__choice { background-color: @red; +} + +.search-highlight, .search-highlight:hover { + background-color: #e9d15b; } \ No newline at end of file diff --git a/resources/assets/less/skins/skin-yellow-dark.less b/resources/assets/less/skins/skin-yellow-dark.less index b01d89283b..c123340b96 100644 --- a/resources/assets/less/skins/skin-yellow-dark.less +++ b/resources/assets/less/skins/skin-yellow-dark.less @@ -391,3 +391,6 @@ a { display: table-cell; } +.search-highlight, .search-highlight:hover { + background-color: #e9d15b; +} diff --git a/resources/assets/less/skins/skin-yellow.less b/resources/assets/less/skins/skin-yellow.less index fadb5824f5..c6ecc5c7bf 100755 --- a/resources/assets/less/skins/skin-yellow.less +++ b/resources/assets/less/skins/skin-yellow.less @@ -106,3 +106,7 @@ a { .select2-container--default .select2-selection--multiple .select2-selection__choice { background-color: @yellow; } + +.search-highlight, .search-highlight:hover { + background-color: #e9d15b; +} \ No newline at end of file diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index a458d3c8aa..13de846d39 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -1,13 +1,15 @@ @push('css') + @endpush @push('js') - +