lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
This commit is contained in:
snipe 2024-09-29 11:25:01 +01:00
commit 1b041af862
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/version.php
View file

@ -6,5 +6,5 @@ return array (
'prerelease_version' => '',
'hash_version' => 'g4ab478bb9',
'full_hash' => 'v7.0.13-pre-111-g4ab478bb9',
'branch' => 'develop',
'branch' => 'master',
);

2
public/js/build/app.js.LICENSE.txt
View file

@ -30,7 +30,7 @@
*/
/*!
* jQuery UI Widget 1.13.3
* jQuery UI Widget 1.14.0
* https://jqueryui.com
*
* Copyright OpenJS Foundation and other contributors

6
resources/views/users/print.blade.php
View file

@ -236,7 +236,7 @@
@foreach ($show_user->licenses as $license)
@php
if ($license->category->getEula()) $eulas[] = $license->category->getEula()
if (($license->category) && ($license->category->getEula())) $eulas[] = $license->category->getEula()
@endphp
<tr>
<td>{{ $lcounter }}</td>
@ -294,7 +294,7 @@
@foreach ($show_user->accessories as $accessory)
@if ($accessory)
@php
if ($accessory->category->getEula()) $eulas[] = $accessory->category->getEula()
if (($accessory->category) && ($accessory->category->getEula())) $eulas[] = $accessory->category->getEula()
@endphp
<tr>
<td>{{ $acounter }}</td>
@ -357,7 +357,7 @@
@foreach ($show_user->consumables as $consumable)
@if ($consumable)
@php
if ($consumable->category->getEula()) $eulas[] = $consumable->category->getEula()
if (($consumable->category) && ($consumable->category->getEula())) $eulas[] = $consumable->category->getEula()
@endphp
<tr>
<td>{{ $ccounter }}</td>