shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev

Browse Source 
# Conflicts:
#	app/Http/Controllers/Common/Items.php
#	resources/views/modules/item/documentation.blade.php
#	resources/views/modules/item/show.blade.php
#	resources/views/partials/admin/header.blade.php
#	resources/views/purchases/bills/show.blade.php
#	resources/views/purchases/vendors/show.blade.php
#	resources/views/sales/customers/show.blade.php
#	resources/views/sales/invoices/show.blade.php
#	resources/views/wizard/companies/edit.blade.php
#	resources/views/wizard/currencies/index.blade.php
#	resources/views/wizard/finish/index.blade.php
#	resources/views/wizard/taxes/index.blade.php
This commit is contained in:
Cüneyt Şentürk
2020-08-28 19:24:26 +03:00
parent a99f2d63ad 7860a4fcf8
commit a3b5cc7ddd
824 changed files with 14086 additions and 5612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
resources/views/install/updates/index.blade.php
View File

@ -47,9 +47,8 @@
<thead class="thead-light">
<tr class="row table-head-line">
<th class="col-xs-4 col-sm-4 col-md-4">{{ trans('general.name') }}</th>
<th class="col-md-2 d-none d-md-block">{{ trans_choice('general.categories', 1) }}</th>
<th class="col-sm-3 col-md-2 d-none d-sm-block">{{ trans('updates.installed_version') }}</th>
<th class="col-xs-4 col-sm-3 col-md-2">{{ trans('updates.latest_version') }}</th>
<th class="col-sm-3 col-md-3 d-none d-sm-block">{{ trans('updates.installed_version') }}</th>
<th class="col-xs-4 col-sm-3 col-md-3">{{ trans('updates.latest_version') }}</th>
<th class="col-xs-4 col-sm-2 col-md-2 text-center">{{ trans('general.actions') }}</th>
</tr>
</thead>
@ -59,9 +58,8 @@
@foreach($modules as $module)
<tr class="row align-items-center border-top-1">
<td class="col-xs-4 col-sm-4 col-md-4">{{ $module->name }}</td>
<td class="col-md-2 d-none d-md-block">{{ $module->category }}</td>
<td class="col-sm-3 col-md-2 d-none d-sm-block">{{ $module->installed }}</td>
<td class="col-xs-4 col-md-2 col-sm-3">{{ $module->latest }}</td>
<td class="col-sm-3 col-md-3 d-none d-sm-block">{{ $module->installed }}</td>
<td class="col-xs-4 col-sm-3 col-md-3">{{ $module->latest }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 text-center">
<a href="{{ route('updates.run', ['alias' => $module->alias, 'version' => $module->latest]) }}" class="btn btn-warning btn-sm">
{{ trans_choice('general.updates', 1) }}