mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-23 12:44:12 -08:00
Merge remote-tracking branch 'origin/master' into develop
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
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:
commit
1b041af862
|
@ -6,5 +6,5 @@ return array (
|
|||
'prerelease_version' => '',
|
||||
'hash_version' => 'g4ab478bb9',
|
||||
'full_hash' => 'v7.0.13-pre-111-g4ab478bb9',
|
||||
'branch' => 'develop',
|
||||
'branch' => 'master',
|
||||
);
|
Binary file not shown.
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue