Compare commits
13 Commits
v8.2.0
...
update-js-
| Author | SHA1 | Date | |
|---|---|---|---|
|
2d3d1724bb | ||
|
|
257d58c236 | ||
|
|
015f3d936c | ||
|
|
18d2a0ffd7 | ||
|
|
24afde0e46 | ||
|
|
8499faa55a | ||
|
|
c60dd809b8 | ||
|
|
297b8e33f2 | ||
|
|
b670b2014c | ||
|
|
440e969f52 | ||
|
|
14b79f2f1c | ||
|
|
a624a79b30 | ||
|
|
49da9e58fd |
@@ -1,10 +1,10 @@
|
||||
<?php
|
||||
return array (
|
||||
'app_version' => 'v8.2.0',
|
||||
'full_app_version' => 'v8.2.0 - build 19055-g6e56d5613',
|
||||
'build_version' => '19055',
|
||||
'app_version' => 'v8.2.1',
|
||||
'full_app_version' => 'v8.2.1 - build 19068-g6ca49a20c',
|
||||
'build_version' => '19068',
|
||||
'prerelease_version' => '',
|
||||
'hash_version' => 'g6e56d5613',
|
||||
'full_hash' => 'v8.2.0-176-g6e56d5613',
|
||||
'hash_version' => 'g6ca49a20c',
|
||||
'full_hash' => 'v8.2.1-10-g6ca49a20c',
|
||||
'branch' => 'develop',
|
||||
);
|
||||
1935
package-lock.json
generated
1935
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
13
package.json
13
package.json
@@ -18,11 +18,11 @@
|
||||
"devDependencies": {
|
||||
"all-contributors-cli": "^6.26.1",
|
||||
"axios": "^1.7.2",
|
||||
"babel-preset-latest": "^6.24.1",
|
||||
"jquery": "<3.6.0",
|
||||
"laravel-mix": "^6.0.49",
|
||||
"lodash": "^4.17.20",
|
||||
"postcss": "^8.4.5"
|
||||
"postcss": "^8.4.5",
|
||||
"webpack": "^5.2.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@fortawesome/fontawesome-free": "^6.7.2",
|
||||
@@ -37,7 +37,7 @@
|
||||
"bootstrap-less": "^3.3.8",
|
||||
"bootstrap-table": "1.24.1",
|
||||
"canvas-confetti": "^1.9.3",
|
||||
"chart.js": "^2.9.4",
|
||||
"chart.js": "4.5.0",
|
||||
"clipboard": "^2.0.11",
|
||||
"css-loader": "^5.0.0",
|
||||
"ekko-lightbox": "^5.1.1",
|
||||
@@ -46,7 +46,7 @@
|
||||
"jquery-ui": "^1.14.1",
|
||||
"jquery-validation": "^1.21.0",
|
||||
"jquery.iframe-transport": "^1.0.0",
|
||||
"jspdf-autotable": "^3.8.4",
|
||||
"jspdf-autotable": "^5.0.2",
|
||||
"less": "^4.2.2",
|
||||
"less-loader": "^6.0",
|
||||
"list.js": "^1.5.0",
|
||||
@@ -55,8 +55,7 @@
|
||||
"select2": "4.0.13",
|
||||
"sheetjs": "^2.0.0",
|
||||
"signature_pad": "^4.2.0",
|
||||
"tableexport.jquery.plugin": "1.32.0",
|
||||
"tether": "^1.4.0",
|
||||
"webpack": "^5.98.0"
|
||||
"tableexport.jquery.plugin": "^1.9.9",
|
||||
"tether": "^1.4.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,8 +67,8 @@
|
||||
|
||||
<table
|
||||
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
|
||||
data-cookie-id-table="assetsListingTable"
|
||||
data-id-table="assetsListingTable"
|
||||
data-cookie-id-table="{{ request()->has('status') ? e(request()->input('status')) : '' }}assetsListingTable"
|
||||
data-id-table="{{ request()->has('status') ? e(request()->input('status')) : '' }}assetsListingTable"
|
||||
data-search-text="{{ e(Session::get('search')) }}"
|
||||
data-side-pagination="server"
|
||||
data-show-footer="true"
|
||||
@@ -77,7 +77,7 @@
|
||||
data-toolbar="#assetsBulkEditToolbar"
|
||||
data-bulk-button-id="#bulkAssetEditButton"
|
||||
data-bulk-form-id="#assetsBulkForm"
|
||||
id="assetsListingTable"
|
||||
id="{{ request()->has('status') ? e(request()->input('status')) : '' }}assetsListingTable"
|
||||
class="table table-striped snipe-table"
|
||||
data-url="{{ route('api.assets.index',
|
||||
array('status' => e(Request::get('status')),
|
||||
|
||||
@@ -1370,20 +1370,11 @@
|
||||
<div class="col-md-12">
|
||||
<table
|
||||
class="table table-striped snipe-table"
|
||||
id="asseAuditHistory"
|
||||
|
||||
data-id-table="asseAuditHistory"
|
||||
|
||||
|
||||
|
||||
|
||||
id="assetAuditHistory"
|
||||
data-id-table="assetAuditHistory"
|
||||
data-side-pagination="server"
|
||||
|
||||
|
||||
|
||||
data-sort-order="desc"
|
||||
data-sort-name="created_at"
|
||||
|
||||
data-export-options='{
|
||||
"fileName": "export-asset-{{ $asset->id }}-audits",
|
||||
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@component('mail::message')
|
||||
# {{ trans('mail.hello') }} {{ $target->present()->fullName() }},
|
||||
# {{ trans('mail.hello') }}{{ $target->assignedto?->present()->fullName() ? ' ' . $target->assignedto->present()->fullName() . ',' : ',' }}
|
||||
|
||||
{{ trans('mail.new_item_checked') }}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@component('mail::message')
|
||||
# {{ trans('mail.hello') }} {{ $target->present()->fullName() }},
|
||||
# {{ trans('mail.hello') }}{{ $target->assignedto?->present()->fullName() ? ' ' . $target->assignedto->present()->fullName() . ',' : ',' }}
|
||||
|
||||
{{ $introduction_line }}
|
||||
|
||||
|
||||
@@ -270,30 +270,6 @@
|
||||
|
||||
</div>
|
||||
|
||||
<!-- Privacy Policy Footer-->
|
||||
<div class="form-group {{ $errors->has('privacy_policy_link') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="privacy_policy_link">{{ trans('admin/settings/general.privacy_policy_link') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
|
||||
@if (config('app.lock_passwords'))
|
||||
<input class="form-control disabled" disabled="disabled" name="privacy_policy_link" type="text" id="privacy_policy_link" value="{{ old('privacy_policy_link', $setting->privacy_policy_link) }}">
|
||||
@else
|
||||
<input class="form-control" name="privacy_policy_link" type="text" id="privacy_policy_link" value="{{ old('privacy_policy_link', $setting->privacy_policy_link) }}">
|
||||
|
||||
@endif
|
||||
|
||||
<span class="help-block">{{ trans('admin/settings/general.privacy_policy_link_help') }}</span>
|
||||
{!! $errors->first('privacy_policy_link', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Load images in emails -->
|
||||
<div class="form-group {{ $errors->has('show_images_in_email') ? 'error' : '' }}">
|
||||
@@ -398,6 +374,30 @@
|
||||
{{ trans('admin/settings/general.legends.misc') }}
|
||||
</legend>
|
||||
|
||||
<!-- Privacy Policy Footer-->
|
||||
<div class="form-group {{ $errors->has('privacy_policy_link') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="privacy_policy_link">{{ trans('admin/settings/general.privacy_policy_link') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
|
||||
@if (config('app.lock_passwords'))
|
||||
<input class="form-control disabled" disabled="disabled" name="privacy_policy_link" type="text" id="privacy_policy_link" value="{{ old('privacy_policy_link', $setting->privacy_policy_link) }}">
|
||||
@else
|
||||
<input class="form-control" name="privacy_policy_link" type="text" id="privacy_policy_link" value="{{ old('privacy_policy_link', $setting->privacy_policy_link) }}">
|
||||
|
||||
@endif
|
||||
|
||||
<span class="help-block">{{ trans('admin/settings/general.privacy_policy_link_help') }}</span>
|
||||
{!! $errors->first('privacy_policy_link', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Depreciation method -->
|
||||
<div class="form-group {{ $errors->has('depreciation_method') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
|
||||
@@ -990,7 +990,7 @@
|
||||
"fileName": "export-{{ str_slug($user->name) }}-history-{{ date('Y-m-d') }}",
|
||||
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
||||
}'
|
||||
data-url="{{ route('api.activity.index', ['target_id' => $user->id, 'item_type' => User::class]) }}">
|
||||
data-url="{{ route('api.activity.index', ['item_id' => $user->id, 'item_type' => User::class]) }}">
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user