From 7f94b7df32540be7a207732aeedb7c0e02d4c22d Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Nov 2023 15:01:24 +0000 Subject: [PATCH 01/10] Removed refresh from asset view table Signed-off-by: snipe --- resources/views/account/view-assets.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 500937de43..3ced14c11d 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" From ad6b286e10f75f0bf48244e884a652473d602bec Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Nov 2023 15:01:39 +0000 Subject: [PATCH 02/10] Added default location to view-assets view Signed-off-by: snipe --- resources/views/account/view-assets.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 3ced14c11d..7481e64c4b 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -406,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 @@ -443,7 +444,7 @@ @endif {{ $asset->serial }} - + {{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }} @can('self.view_purchase_cost') {!! Helper::formatCurrencyOutput($asset->purchase_cost) !!} From d4bdaf16e70fd61d1f3d3e3ea70eba8776afaadd Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Nov 2023 15:13:13 +0000 Subject: [PATCH 03/10] Upgraded webpack to 5.89.0 Signed-off-by: snipe --- package-lock.json | 48 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index b6254682a6..fe6ee29a47 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1565,27 +1565,27 @@ } }, "@types/eslint": { - "version": "8.44.2", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.2.tgz", - "integrity": "sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==", + "version": "8.44.7", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.7.tgz", + "integrity": "sha512-f5ORu2hcBbKei97U73mf+l9t4zTGl74IqZ0GQk4oVea/VS8tQZYkUveSYojk+frraAVYId0V2WC9O4PTNru2FQ==", "requires": { "@types/estree": "*", "@types/json-schema": "*" } }, "@types/eslint-scope": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", - "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", "requires": { "@types/eslint": "*", "@types/estree": "*" } }, "@types/estree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz", - "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==" }, "@types/express": { "version": "4.17.13", @@ -4885,9 +4885,9 @@ } }, "es-module-lexer": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz", - "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz", + "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==" }, "es-to-primitive": { "version": "1.2.1", @@ -19644,9 +19644,9 @@ } }, "webpack": { - "version": "5.88.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", - "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", + "version": "5.89.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz", + "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==", "requires": { "@types/eslint-scope": "^3.7.3", "@types/estree": "^1.0.0", @@ -19685,18 +19685,18 @@ "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" }, "@jridgewell/trace-mapping": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", - "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "requires": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "@types/json-schema": { - "version": "7.0.12", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", - "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==" + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==" }, "commander": { "version": "2.20.3", @@ -19727,9 +19727,9 @@ } }, "terser": { - "version": "5.19.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz", - "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==", + "version": "5.24.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz", + "integrity": "sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==", "requires": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.8.2", diff --git a/package.json b/package.json index 2e220c597a..fff31ab989 100644 --- a/package.json +++ b/package.json @@ -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" } } From 81cf08adf55ac47ec1720e26d192f5613089e077 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Nov 2023 15:16:40 +0000 Subject: [PATCH 04/10] Updated acorn to 8.11.2 Signed-off-by: snipe --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index fe6ee29a47..31f62b0e4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2078,9 +2078,9 @@ } }, "acorn": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", - "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==" + "version": "8.11.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==" }, "acorn-import-assertions": { "version": "1.9.0", diff --git a/package.json b/package.json index fff31ab989..00e3b774d0 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ }, "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", From 8e3657d62e4afaf0e894e83a013a0c27b70d7171 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Nov 2023 15:19:59 +0000 Subject: [PATCH 05/10] Upgrade alpinejs from 3.12.3 to 3.13.2 #13936 Signed-off-by: snipe --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 31f62b0e4f..8cd6ecd4ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2201,9 +2201,9 @@ "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==" }, "alpinejs": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.0.tgz", - "integrity": "sha512-7FYR1Yz3evIjlJD1mZ3SYWSw+jlOmQGeQ1QiSufSQ6J84XMQFkzxm6OobiZ928SfqhGdoIp2SsABNsS4rXMMJw==", + "version": "3.13.3", + "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.3.tgz", + "integrity": "sha512-WZ6WQjkAOl+WdW/jukzNHq9zHFDNKmkk/x6WF7WdyNDD6woinrfXCVsZXm0galjbco+pEpYmJLtwlZwcOfIVdg==", "requires": { "@vue/reactivity": "~3.1.1" } diff --git a/package.json b/package.json index 00e3b774d0..8dec243296 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "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", From e0e11845bb9dfc8ff092bcc9d16e6a6bacb412a4 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Nov 2023 15:23:13 +0000 Subject: [PATCH 06/10] Upgrade jspdf-autotable from 3.5.31 to 3.7.1 #13937 Signed-off-by: snipe --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8cd6ecd4ad..d17ec73df4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15972,9 +15972,9 @@ } }, "jspdf-autotable": { - "version": "3.5.31", - "resolved": "https://registry.npmjs.org/jspdf-autotable/-/jspdf-autotable-3.5.31.tgz", - "integrity": "sha512-Lc1KuLGDQWW/5t57Z/+c2E94XQV3jV2QVU3xMRiwvcm/nMx79aCkpPCsxLzJZVFneZvz4XoA8+egQR1QajYiWw==" + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jspdf-autotable/-/jspdf-autotable-3.7.1.tgz", + "integrity": "sha512-5fgjqE8nIwUoNz5l/i/aD/uONKofE4yp/kJ097EKBllPVTPGnGV5OWHld30db3+CvNrgzrRl8gmTnKF6vag05g==" }, "junk": { "version": "3.1.0", diff --git a/package.json b/package.json index 8dec243296..4c53d04eba 100644 --- a/package.json +++ b/package.json @@ -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", From 88cc234cbd62faecca623c957331f597ed7adfc6 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Nov 2023 15:28:43 +0000 Subject: [PATCH 07/10] Higher contrast for green dark skin Applies #13915 to develop Signed-off-by: snipe --- public/css/dist/skins/skin-green-dark.css | Bin 12428 -> 12424 bytes public/css/dist/skins/skin-green-dark.min.css | Bin 12428 -> 12424 bytes public/js/dist/all-defer.js | Bin 104209 -> 105939 bytes public/mix-manifest.json | 6 +++--- .../assets/less/skins/skin-green-dark.less | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/css/dist/skins/skin-green-dark.css b/public/css/dist/skins/skin-green-dark.css index 8e5430e5cd179f6632122f72f562e0c087ff8975..e024040c4e3612987aca73b89fbf683c1a632d32 100644 GIT binary patch delta 12 TcmeB4>`2_usJ*#Wo1GN^Bd`Rb delta 17 YcmeB3>`C0vsLi6Am{YR3QJb9=06qu?5C8xG diff --git a/public/css/dist/skins/skin-green-dark.min.css b/public/css/dist/skins/skin-green-dark.min.css index 8e5430e5cd179f6632122f72f562e0c087ff8975..e024040c4e3612987aca73b89fbf683c1a632d32 100644 GIT binary patch delta 12 TcmeB4>`2_usJ*#Wo1GN^Bd`Rb delta 17 YcmeB3>`C0vsLi6Am{YR3QJb9=06qu?5C8xG diff --git a/public/js/dist/all-defer.js b/public/js/dist/all-defer.js index e81b6e8766b75aa11858ece2a81543148909a9bf..53e56a8a672127d09f8b74c43d4e6d94d04083ee 100644 GIT binary patch delta 3178 zcma)8YitzP71jxU;Pnf`vNV2>>&1_mupY0+xU@zNA%tK`8apxI5Qm!a?A`U?*_mZ# z7I19`m7q3}lC5Jib9nv`aNMR}l9ZCZ&)X{$>8S@E+{rS?awMxtufb7yCF zy^E2$lD#wc-t+p-cfPydf3NP3AJ$#zZf#Ib*oGxVW6>OG{d(6~hk9AZA{ISOCLR0C zqO?Tpxf4|PT(S})Y3ih?zkbNkGV-nvAuITIN^`2V$QW6|4MObG)K{6H8g=D*Kt74Blh($ci-)JPIZtdOxWGPRhVvrQ#y zxw@Uv=1l6!AwD|}os0~G+e)z{EKw$753$f^Sn^ zp0(47diK|*CZ34OrN{vSx^0?T#udafRMwDiYpRx5#0L@fCvPL`f2*y>)sl2lb6om}ZJSiHBx)*tQRoLn%75f!3A)(#-fCvQeKXD< zT!s+4*;}9c@0)wqAGyok(M}%`pp^1O$(tEM^o9iJo|6?2Mr}*{U!*R6iM3;jVd-WT zM?n$}*v(Xg{rn#-UnN9H=1d$9$Av{wGu?uNq~Ao###MiD4G(;9A2hQ5|1@taCPj9W zVx7e$nT!%EYnr+E<<1aWytcj8*8^r;@8EI`G&Uor49lXY_sj zk`w+VB-vSPh|IoxeH;5{emlGPVq4(q()D3hn;+hC4-@vw{HDmb=FSW85kAE8CXQ7$@Sbj(+h+Dv^pi;jYRfz2#5Am2ogr#Vep&z1XmcJE;UKkLf zg6?#Bz?-A4yQAmXhi#mgfaBnTZWlj#mm-vR`5E@*SMWy>xKTJ@$9U&aSl?b0F7Z=CeDFf?1&xgHOViL(7Z@b4mpkSPq8XL%ZA7XSlK)~F z!ZpGRJFa##RRqASI`|J?!E(RzG<3ZKPXq9J6|onYF?DJ)|HDz($4?xEukeKdXy89R z3fp+&IcVhzSit&XK5S?zQgyVwIuBoHeWm7b4({gz%h13+nW`6dFI7dwFdO*$)3AwM z``c!oRUupvYD2YezeXNihOqDPyU#$F|M?lr_r7V^*r4DTrjdkx7dqHyY7={|y*VG9 zfy=F1QSmF(K`LKm;#ct1i!ZKQL0-M_+U){Q{&fQ0?&h~sP{aSCz|Q-OB<~-D5&mfc j2J^pr2|CvEzy1Jv`8pXM;PF?XjjJ-8&;RCCI0*j(U*hi& delta 2257 zcma)8eQZ-z6wlcfM)$#3*q0scE@fNZgVOE`mJG*K%qB1a!9WnZ?sdI$)%LZ%_sZzT zTy!QQnvg8la0BxrlYew1f_d3WG#J1bLyS?QMiVv5{ufQqg!qTfd*6F~>)M(4{%FrT zU%%hE=bYPq`|*aE4>nxiR-x~#=y!ESv4*sfhmLV}38_c1jM1i(pFynedufZ9nxla%MM=0&m;!UB88%?L7Bd0 zdc>!IRia^qjlkMk)>e;DbdvcpzInb(m*>k|6INf>B+hlTu`Pj}s44kEyovUJ^08p` zXFWC(OJI?vv`%DJn0baKhG+owk#AnB;Uh!t%x^Kqr~a2R8tQ{8ktduG`CN`q zh^P6=1u|^xjWe>5xt8ilbLTT8_^=E`<0@9QBgU$ojA$e5dSD&STfP6c&(M2~ zx<1`eN$)m6898~Wj{Y2nm-Wk+!bMa{z!JIO*r21gI||8xE9K;;xfZ?p-Gdu-?P_Vs zE-#A6GFG0D)DbU=C)r+cv0u{I`DWQn1({sf>E{hF94&LEb9@koBZ{gWOUhY0POdG~ z*RUhzD95oT96WyHurDDgDi+Am#p+VgzHAZsYN4J8i%#-aea%KBpGj3uKv0 zFS^O=>CI$ev4ecSQ0?W7vGW>~R&!-cd@OiXyfeLqltaQU-z*XJ^dLDIjb_nesf<9D z%5Ww#X(xGnQ7mL{L`^pmcdUVw-EfhWTU+&;H!4b@MgQ{CW1zQx))b}>W?_at@*9RCq>GDC`Co?dyO>n)1O9^sNr~js8lYhtB(9U;615XaM@%6x5Ng<3;rShoP3< zZG}2|xDDK8ZC+&l46$0ND+o=ry$zg(&0*W z^uzPureZtGAY6tDTHe7RiUrtevi*EFP@r!_8MuE3GY=vtrgNRpOg-D7fsa)BekUB* zR?yQ!tawD!L-#(z%8Q)>7rA<`H0?hPRY0EHT}%oyBx82oAb3z@Rn-U`r9ZB)X{KF*X2woA~G{(&!1kYN(sT*3*kYaAo8E{VX^O zP#3v9R=r(QA~8<{9 diff --git a/public/mix-manifest.json b/public/mix-manifest.json index e372984709..195625f796 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=8ca888bbc050d9680cbb65021382acba", "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=bdfc704731682c67645a2248b0b8d2d7", "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb", - "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=e36e83c2aa3c3afdbb8ebe2c0309e91d", + "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=d419cb63a12dc175d71645c876bfc2ab", "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898", @@ -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=1a069f231b257b1ad4e3751302705f97", - "/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=0a82a6ae6bb4e58fe62d162c4fb50397", - "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=e36e83c2aa3c3afdbb8ebe2c0309e91d", + "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=d419cb63a12dc175d71645c876bfc2ab", "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=76482123f6c70e866d6b971ba91de7bb", "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=bdfc704731682c67645a2248b0b8d2d7", "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=f677207c6cf9678eb539abecb408c374", 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); From cf3608ae10b3ba553dc6ec594681ea0899828283 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Nov 2023 15:33:08 +0000 Subject: [PATCH 08/10] Add @bilias as a contributor --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) 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! From 7b12d511f8c6c981b51e4c810bf28c36be2c24dc Mon Sep 17 00:00:00 2001 From: Brady Wetherington Date: Thu, 23 Nov 2023 16:34:03 +0000 Subject: [PATCH 09/10] Force active flag to be returned as true or false --- app/Models/SnipeSCIMConfig.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) 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 From ea55daf913c905ff3bbb1a464b759e0b181d25e9 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 23 Nov 2023 16:51:39 +0000 Subject: [PATCH 10/10] Bumped hash Signed-off-by: snipe --- config/version.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/version.php b/config/version.php index b106cd3af7..b99363426e 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' => 'develop', ); \ No newline at end of file