A free open source IT asset/license management system
Merge remote-tracking branch 'origin/master' into develop
snipe4ee378bf8e64
diff --cc resources/views/blade/table/index.blade.phpindex 58a549f03b,bd4080f421..aa0a9c2a35--- a/resources/views/blade/table/index.blade.php+++ b/resources/views/blade/table/index.blade.php@@@ -43,19 -27,12 +43,19 @@@@if ($buttons)data-buttons="{{ $buttons }}"@endif++ @if ($show_footer)+ data-show-footer="{{ $show_footer }}"+ data-footer-style="footerStyle"+ @endif+@if ($api_url)data-side-pagination="server"- data-url="{!! $api_url !!}"+ data-url="{!! $api_url !!}"@endif+data-export-options='{- "fileName": "{{ $export_filename }}",- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]-}'>-</table>+ "fileName": "{{ $export_filename }}",+ "ignoreColumn": ["actions","available_actions", "image","change","checkbox","checkincheckout","icon"]+ }'>- </table>++</table>