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

Merge branch 'develop'

Browse source 
# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2018-02-21 05:48:02 -08:00
parent 4e398950a0 dbc16a6c9b
commit cccd75fc42
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/version.php
View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v4.1.12', 'app_version' => 'v4.1.12',
'full_app_version' => 'v4.1.12 - build 3365-g4ed2ef6', 'full_app_version' => 'v4.1.12 - build 3371-g4e39895',
'build_version' => '3365', 'build_version' => '3371',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'g4ed2ef6', 'hash_version' => 'g4e39895',
'full_hash' => 'v4.1.12-6-g4ed2ef6', 'full_hash' => 'v4.1.12-6-g4e39895',
'branch' => 'master', 'branch' => 'master',
); );

1
resources/views/partials/bootstrap-table.blade.php
View file

@ -56,6 +56,7 @@
paginationPreText: "{{ trans('general.previous') }}", paginationPreText: "{{ trans('general.previous') }}",
paginationNextText: "{{ trans('general.next') }}", paginationNextText: "{{ trans('general.next') }}",
pageList: ['10','20', '30','50','100','150','200', '500'], pageList: ['10','20', '30','50','100','150','200', '500'],
pageSize: {{ (($snipeSettings->per_page!='') && ($snipeSettings->per_page > 0)) ? $snipeSettings->per_page : 20 }},
paginationVAlign: 'both', paginationVAlign: 'both',
formatLoadingMessage: function () { formatLoadingMessage: function () {
return '<h4><i class="fa fa-spinner fa-spin" aria-hidden="true"></i> Loading... please wait.... </h4>'; return '<h4><i class="fa fa-spinner fa-spin" aria-hidden="true"></i> Loading... please wait.... </h4>';