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

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2018-02-02 09:32:00 -06:00
parent e21f8e46d4 d86fb098a8
commit 8491e57258
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/views/dashboard.blade.php
View file

@ -168,6 +168,7 @@
name="activityReport" name="activityReport"
id="table" id="table"
data-height="400" data-height="400"
data-sort-order="desc"
data-show-export="false" data-show-export="false"
data-url="{{ route('api.activity.index', ['limit' => 25]) }}"> data-url="{{ route('api.activity.index', ['limit' => 25]) }}">
<thead> <thead>
@ -235,7 +236,6 @@
name="categorySummary" name="categorySummary"
id="table" id="table"
data-height="440" data-height="440"
data-url="{{ route('api.categories.index', ['sort' => 'assets_count', 'order' => 'asc']) }}"> data-url="{{ route('api.categories.index', ['sort' => 'assets_count', 'order' => 'asc']) }}">
<thead> <thead>
<tr> <tr>