DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-11-28 14:12:38 -08:00
parent d2dcb29dcb 6113afe36e
commit d5e702ac74
5 changed files with 44 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
composer.lock generated
View file

@ -78,19 +78,19 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/grokability/laravel-scim-server.git", "url": "https://github.com/grokability/laravel-scim-server.git",
"reference": "8eba81d36a32077ab45ef60290cad817d07b6224" "reference": "2c7ecc450eee59234e059ec2e7724b2d8f3a8369"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/grokability/laravel-scim-server/zipball/8eba81d36a32077ab45ef60290cad817d07b6224", "url": "https://api.github.com/repos/grokability/laravel-scim-server/zipball/2c7ecc450eee59234e059ec2e7724b2d8f3a8369",
"reference": "8eba81d36a32077ab45ef60290cad817d07b6224", "reference": "2c7ecc450eee59234e059ec2e7724b2d8f3a8369",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"illuminate/console": "^6.0|^7.0|^8.0", "illuminate/console": "^6.0|^7.0|^8.0|^9.0",
"illuminate/database": "^6.0|^7.0|^8.0", "illuminate/database": "^6.0|^7.0|^8.0|^9.0",
"illuminate/support": "^6.0|^7.0|^8.0", "illuminate/support": "^6.0|^7.0|^8.0|^9.0",
"php": "^7.4|^8.0", "php": "^7.0|^8.0",
"tmilos/scim-filter-parser": "^1.3", "tmilos/scim-filter-parser": "^1.3",
"tmilos/scim-schema": "^0.1.0" "tmilos/scim-schema": "^0.1.0"
}, },
@ -133,7 +133,7 @@
"support": { "support": {
"source": "https://github.com/grokability/laravel-scim-server/tree/master" "source": "https://github.com/grokability/laravel-scim-server/tree/master"
}, },
"time": "2022-11-09T17:01:45+00:00" "time": "2022-11-22T20:26:54+00:00"
}, },
{ {
"name": "asm89/stack-cors", "name": "asm89/stack-cors",

2
config/scim.php
View file

@ -3,6 +3,6 @@
return [ return [
"trace" => env("SCIM_TRACE",false), "trace" => env("SCIM_TRACE",false),
// below, if we ever get 'sure' that we can change this default to 'true' we should // below, if we ever get 'sure' that we can change this default to 'true' we should
"standards_compliance" => env('SCIM_STANDARDS_COMPLIANCE', false), "omit_main_schema_in_return" => env('SCIM_STANDARDS_COMPLIANCE', false),
"publish_routes" => false, "publish_routes" => false,
]; ];

15
resources/views/users/confirm-bulk-delete.blade.php
View file

@ -115,3 +115,18 @@
</div> </div>
@stop @stop
@section('moar_scripts')
<script>
$(":submit").attr("disabled", "disabled");
$("[name='status_id']").on('select2:select', function (e) {
if (e.params.data.id != ""){
console.log(e.params.data.id);
$(":submit").removeAttr("disabled");
}
else {
$(":submit").attr("disabled", "disabled");
}
});
</script>
@stop

7
resources/views/vendor/mail/html/message.blade.php vendored
View file

@ -1,13 +1,18 @@
@component('mail::layout') @component('mail::layout')
{{-- Header --}} {{-- Header --}}
@slot('header') @slot('header')
@component('mail::header', ['url' => config('app.url')])
{{-- Check that the $snipeSettings variable is set, images are set to be shown, and setup is complete --}} {{-- Check that the $snipeSettings variable is set, images are set to be shown, and setup is complete --}}
@if (isset($snipeSettings) && ($snipeSettings::setupCompleted())) @if (isset($snipeSettings) && ($snipeSettings::setupCompleted()))
@if ($snipeSettings->show_url_in_emails=='1' )
@component('mail::header', ['url' => config('app.url')])
@else
@component('mail::header', ['url' => ''])
@endif
{{-- Show images in email! --}} {{-- Show images in email! --}}
@if (($snipeSettings->show_images_in_email=='1' ) && (($snipeSettings->brand == '3') || ($snipeSettings->brand == '2'))) @if (($snipeSettings->show_images_in_email=='1' ) && (($snipeSettings->brand == '3') || ($snipeSettings->brand == '2')))

18
resources/views/vendor/notifications/email.blade.php vendored
View file

@ -73,16 +73,26 @@ $style = [
<td style="{{ $style['email-masthead'] }}"> <td style="{{ $style['email-masthead'] }}">
@if (($snipeSettings->show_images_in_email=='1' ) && ($snipeSettings::setupCompleted())) @if (($snipeSettings->show_images_in_email=='1' ) && ($snipeSettings::setupCompleted()))
@php
$logo = '';
if ($snipeSettings->logo != ''){
$logo = $snipeSettings->logo;
}
if ($snipeSettings->email_logo != ''){
$logo = $snipeSettings->email_logo;
}
@endphp
@if ($snipeSettings->brand == '3') @if ($snipeSettings->brand == '3')
@if ($snipeSettings->logo!='') @if ($logo!='')
<img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}"> <img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $logo }}">
@endif @endif
{{ $snipeSettings->site_name }} {{ $snipeSettings->site_name }}
@elseif ($snipeSettings->brand == '2') @elseif ($snipeSettings->brand == '2')
@if ($snipeSettings->logo!='') @if ($logo!='')
<img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}"> <img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $logo }}">
@endif @endif
@else @else
{{ $snipeSettings->site_name }} {{ $snipeSettings->site_name }}