diff --git a/.all-contributorsrc b/.all-contributorsrc index f5085f95e3..8f38f63523 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -2988,6 +2988,15 @@ "contributions": [ "code" ] + }, + { + "login": "bilias", + "name": "bilias", + "avatar_url": "https://avatars.githubusercontent.com/u/47315739?v=4", + "profile": "https://github.com/bilias", + "contributions": [ + "code" + ] } ] } diff --git a/README.md b/README.md index f1ea609749..d4c1d8cc77 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![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-329-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev) +[![All Contributors](https://img.shields.io/badge/all_contributors-330-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev) ## Snipe-IT - Open Source Asset Management System @@ -146,6 +146,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken | [
akemidx](https://github.com/akemidx)
[💻](https://github.com/snipe/snipe-it/commits?author=akemidx "Code") | [
Oguz Bilgic](http://oguz.site)
[💻](https://github.com/snipe/snipe-it/commits?author=oguzbilgic "Code") | [
Scooter Crawford](https://github.com/scoo73r)
[💻](https://github.com/snipe/snipe-it/commits?author=scoo73r "Code") | [
subdriven](https://github.com/subdriven)
[💻](https://github.com/snipe/snipe-it/commits?author=subdriven "Code") | [
Andrew Savinykh](https://github.com/AndrewSav)
[💻](https://github.com/snipe/snipe-it/commits?author=AndrewSav "Code") | [
Tadayuki Onishi](https://kenchan0130.github.io)
[💻](https://github.com/snipe/snipe-it/commits?author=kenchan0130 "Code") | [
Florian](https://github.com/floschoepfer)
[💻](https://github.com/snipe/snipe-it/commits?author=floschoepfer "Code") | | [
Spencer Long](http://spencerlong.com)
[💻](https://github.com/snipe/snipe-it/commits?author=spencerrlongg "Code") | [
Marcus Moore](https://github.com/marcusmoore)
[💻](https://github.com/snipe/snipe-it/commits?author=marcusmoore "Code") | [
Martin Meredith](https://github.com/Mezzle)
| [
dboth](http://dboth.de)
[💻](https://github.com/snipe/snipe-it/commits?author=dboth "Code") | [
Zachary Fleck](https://github.com/zacharyfleck)
[💻](https://github.com/snipe/snipe-it/commits?author=zacharyfleck "Code") | [
VIKAAS-A](https://github.com/vikaas-cyper)
[💻](https://github.com/snipe/snipe-it/commits?author=vikaas-cyper "Code") | [
Abdul Kareem](https://github.com/ak-piracha)
[💻](https://github.com/snipe/snipe-it/commits?author=ak-piracha "Code") | | [
NojoudAlshehri](https://github.com/NojoudAlshehri)
[💻](https://github.com/snipe/snipe-it/commits?author=NojoudAlshehri "Code") | [
Stefan Stidl](https://github.com/stefanstidlffg)
[💻](https://github.com/snipe/snipe-it/commits?author=stefanstidlffg "Code") | [
Quentin Aymard](https://github.com/qay21)
[💻](https://github.com/snipe/snipe-it/commits?author=qay21 "Code") | [
Grant Le Roux](https://github.com/cram42)
[💻](https://github.com/snipe/snipe-it/commits?author=cram42 "Code") | [
Bogdan](http://@singrity)
[💻](https://github.com/snipe/snipe-it/commits?author=Singrity "Code") | [
mmanjos](https://github.com/mmanjos)
[💻](https://github.com/snipe/snipe-it/commits?author=mmanjos "Code") | [
Abdelaziz Faki](https://azooz2014.github.io/)
[💻](https://github.com/snipe/snipe-it/commits?author=Azooz2014 "Code") | +| [
bilias](https://github.com/bilias)
[💻](https://github.com/snipe/snipe-it/commits?author=bilias "Code") | This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome! diff --git a/app/Models/SnipeSCIMConfig.php b/app/Models/SnipeSCIMConfig.php index 7ec25645e6..f17b5cfb61 100644 --- a/app/Models/SnipeSCIMConfig.php +++ b/app/Models/SnipeSCIMConfig.php @@ -129,8 +129,20 @@ class SnipeSCIMConfig extends \ArieTimmerman\Laravel\SCIMServer\SCIMConfig 'preferredLanguage' => AttributeMapping::eloquent('locale'), // Section 5.3.5 of [RFC7231] 'locale' => null, // see RFC5646 'timezone' => null, // see RFC6557 - 'active' => AttributeMapping::eloquent('activated'), - + 'active' => (new AttributeMapping())->setAdd( + function ($value, &$object) { + $object->activated = $value; + } + )->setReplace( + function ($value, &$object) { + $object->activated = $value; + } + )->setRead( + // this works as specified. + function (&$object) { + return (bool)$object->activated; + } + ), 'password' => AttributeMapping::eloquent('password')->disableRead(), // Multi-Valued Attributes diff --git a/config/version.php b/config/version.php index c546c48719..1e1966453c 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v6.2.4-pre', - 'full_app_version' => 'v6.2.4-pre - build 12088-g780279a62', - 'build_version' => '12088', + 'full_app_version' => 'v6.2.4-pre - build 12090-g776b16d37', + 'build_version' => '12090', 'prerelease_version' => '', - 'hash_version' => 'g780279a62', - 'full_hash' => 'v6.2.4-pre-327-g780279a62', + 'hash_version' => 'g776b16d37', + 'full_hash' => 'v6.2.4-pre-329-g776b16d37', 'branch' => 'master', ); \ No newline at end of file diff --git a/package.json b/package.json index 2e220c597a..4c53d04eba 100644 --- a/package.json +++ b/package.json @@ -25,11 +25,11 @@ }, "dependencies": { "@fortawesome/fontawesome-free": "^6.4.2", - "acorn": "^8.9.0", + "acorn": "^8.11.2", "acorn-import-assertions": "^1.9.0", "admin-lte": "^2.4.18", "ajv": "^6.12.6", - "alpinejs": "^3.10.5", + "alpinejs": "^3.13.2", "blueimp-file-upload": "^9.34.0", "bootstrap": "^3.4.1", "bootstrap-colorpicker": "^2.5.3", @@ -46,7 +46,7 @@ "jquery-ui": "^1.13.2", "jquery-ui-bundle": "^1.12.1", "jquery.iframe-transport": "^1.0.0", - "jspdf-autotable": "^3.5.30", + "jspdf-autotable": "^3.7.1", "less": "^4.2.0", "less-loader": "^5.0", "list.js": "^1.5.0", @@ -56,6 +56,6 @@ "tableexport.jquery.plugin": "1.28.0", "tether": "^1.4.0", "vue-resource": "^1.5.2", - "webpack": "^5.88.2" + "webpack": "^5.89.0" } } diff --git a/public/css/dist/skins/skin-green-dark.css b/public/css/dist/skins/skin-green-dark.css index 13eb13abe0..7c035a9ec9 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 58d0f21d0a..12bcb66477 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/js/dist/all-defer.js b/public/js/dist/all-defer.js index f424eb738b..9d8d7da83c 100644 Binary files a/public/js/dist/all-defer.js and b/public/js/dist/all-defer.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 5b5b4969c7..76e272ab0a 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -14,7 +14,7 @@ "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=7f0eb9e355b36b41c61c3af3b4d41143", "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=f4d95ad9d0944587549e35b6929b4b04", "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=1f33ca3d860461c1127ec465ab3ebb6b", - "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=44f9320d0739f419c9246f7f39395b02", + "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=0ed42b67f9b02a74815e885bfd9e3f66", "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=b48f4d8af0e1ca5621c161e93951109f", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=f0fbbb0ac729ea092578fb05ca615460", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=b9a74ec0cd68f83e7480d5ae39919beb", @@ -33,9 +33,9 @@ "/js/build/vendor.js": "/js/build/vendor.js?id=917784d6fe54bcfe39656e0ded1b43e4", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=1f678160a05960c3087fb8263168ff41", "/js/dist/all.js": "/js/dist/all.js?id=8b6d5790410cef7c138c7807516eb0b0", - "/js/dist/all-defer.js": "/js/dist/all-defer.js?id=07e52318da2cdf3171c4d88113f25fb6", + "/js/dist/all-defer.js": "/js/dist/all-defer.js?id=7f9a130eda6916eaa32a0a57e81918f3", "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=b48f4d8af0e1ca5621c161e93951109f", - "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=44f9320d0739f419c9246f7f39395b02", + "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=0ed42b67f9b02a74815e885bfd9e3f66", "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=1f33ca3d860461c1127ec465ab3ebb6b", "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=f4d95ad9d0944587549e35b6929b4b04", "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=392cc93cfc0be0349bab9697669dd091", diff --git a/resources/assets/less/skins/skin-green-dark.less b/resources/assets/less/skins/skin-green-dark.less index a69f918acf..5267803656 100644 --- a/resources/assets/less/skins/skin-green-dark.less +++ b/resources/assets/less/skins/skin-green-dark.less @@ -361,7 +361,7 @@ input[type=text], input[type=search] { background-color: var(--back-sub); } .table-striped>tbody>tr:nth-of-type(even){ - background-color: var(--back-sub-alt); + background-color: var(--back-sub); } #webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header { color: var(--text-main); diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 500937de43..7481e64c4b 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -390,7 +390,6 @@ data-show-columns="true" data-show-export="true" data-show-footer="true" - data-show-refresh="false" data-sort-order="asc" id="userAssets" class="table table-striped snipe-table" @@ -407,6 +406,7 @@ {{ trans('general.name') }} {{ trans('admin/hardware/table.asset_model') }} {{ trans('admin/hardware/table.serial') }} + {{ trans('admin/hardware/form.default_location') }} @can('self.view_purchase_cost') {{ trans('general.purchase_cost') }} @endcan @@ -444,7 +444,7 @@ @endif {{ $asset->serial }} - + {{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }} @can('self.view_purchase_cost') {!! Helper::formatCurrencyOutput($asset->purchase_cost) !!}