diff --git a/config/version.php b/config/version.php index 9225a85ab0..e3fdaa1f42 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v4.1.12', - 'full_app_version' => 'v4.1.12 - build 3365-g4ed2ef6', - 'build_version' => '3365', + 'full_app_version' => 'v4.1.12 - build 3371-g4e39895', + 'build_version' => '3371', 'prerelease_version' => '', - 'hash_version' => 'g4ed2ef6', - 'full_hash' => 'v4.1.12-6-g4ed2ef6', + 'hash_version' => 'g4e39895', + 'full_hash' => 'v4.1.12-6-g4e39895', 'branch' => 'master', ); diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 9dd340b263..e5cc07b23b 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -56,6 +56,7 @@ paginationPreText: "{{ trans('general.previous') }}", paginationNextText: "{{ trans('general.next') }}", pageList: ['10','20', '30','50','100','150','200', '500'], + pageSize: {{ (($snipeSettings->per_page!='') && ($snipeSettings->per_page > 0)) ? $snipeSettings->per_page : 20 }}, paginationVAlign: 'both', formatLoadingMessage: function () { return '