diff --git a/resources/views/reports/unaccepted_assets.blade.php b/resources/views/reports/unaccepted_assets.blade.php
index c87596a7a..45b6f163a 100644
--- a/resources/views/reports/unaccepted_assets.blade.php
+++ b/resources/views/reports/unaccepted_assets.blade.php
@@ -48,7 +48,7 @@
@foreach ($assetsForReport as $assetItem)
@if ($assetItem)
- {{ ($assetItem->company) ? $assetItem->company->nam : '' }} |
+ {{ ($assetItem->company) ? $assetItem->company->name : '' }} |
{{ $assetItem->model->category->name }} |
{{ $assetItem->model->name }} |
{!! $assetItem->present()->nameUrl() !!} |
diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php
index 2f0a0d1e7..f4a53f6cb 100644
--- a/resources/views/settings/saml.blade.php
+++ b/resources/views/settings/saml.blade.php
@@ -101,7 +101,7 @@
+ accept="text/xml,application/xml" style="display:none; max-width: 90%">
{{ trans('admin/settings/general.saml_idp_metadata_help') }}
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index a2846c51f..852d3a3d8 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -285,12 +285,12 @@
{{ trans('admin/users/general.two_factor_enrolled') }} |
-
+
{!! ($user->two_factor_active_and_enrolled()) ? ' '.trans('general.yes') : ' '.trans('general.no') !!}
@if ((Auth::user()->isSuperUser()) && ($snipeSettings->two_factor_enabled!='0') && ($snipeSettings->two_factor_enabled!=''))
-
+
{{ trans('admin/settings/general.two_factor_reset') }}
@@ -679,7 +679,7 @@ $(function () {
dataType: 'json',
success: function (data) {
- $("#two_factor_reset_toggle").html('').html('{{ trans('general.no') }}');
+ $("#two_factor_reset_toggle").html('').html(' {{ trans('general.no') }}');
$("#two_factor_reseticon").html('');
$("#two_factor_resetstatus").html(' ' + data.message);
diff --git a/webpack.mix.js b/webpack.mix.js
index f456c20e2..20d9e746e 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -17,7 +17,7 @@ mix
'./node_modules/bootstrap/dist/css/bootstrap.css',
'./node_modules/font-awesome/css/font-awesome.css',
'./public/css/build/AdminLTE.css',
- './node_modules/jquery-ui-dist/jquery-ui.css',
+ './node_modules/jquery-ui-bundle/jquery-ui.css',
'./node_modules/admin-lte/plugins/iCheck/minimal/blue.css',
'./node_modules/icheck/skins/minimal/minimal.css',
'./node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.standalone.css',
@@ -111,6 +111,7 @@ mix
[
'./node_modules/admin-lte/dist/js/adminlte.min.js',
'./node_modules/tether/dist/js/tether.js',
+ './node_modules/jquery-ui-bundle/jquery-ui.js',
'./node_modules/jquery-slimscroll/jquery.slimscroll.js',
'./node_modules/jquery.iframe-transport/jquery.iframe-transport.js',
'./node_modules/blueimp-file-upload/js/jquery.fileupload.js',
|