Merge branch 'develop' into feature/vuejs

This commit is contained in:
Dane Everitt
2018-12-16 14:20:35 -08:00
54 changed files with 407 additions and 243 deletions

View File

@@ -56,7 +56,7 @@ class IndexController extends Controller
public function index(Request $request)
{
$servers = $this->repository->setSearchTerm($request->input('query'))->filterUserAccessServers(
$request->user(), User::FILTER_LEVEL_ALL
$request->user(), User::FILTER_LEVEL_ALL, config('pterodactyl.paginate.frontend.servers')
);
return view('templates/base.core', ['servers' => $servers]);