Skip to content

Commit

Permalink
Finish v0.41.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Arrow768 committed Jan 8, 2024
2 parents 0b9821b + 583250a commit 2a7b0ac
Show file tree
Hide file tree
Showing 5 changed files with 1,888 additions and 1,417 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM webdevops/php-nginx:8.0-alpine
FROM webdevops/php-nginx:8.2-alpine

# Install Laravel framework system requirements (https://laravel.com/docs/8.x/deployment#optimizing-configuration-loading)
RUN apk add oniguruma-dev postgresql-dev libxml2-dev
Expand All @@ -8,7 +8,6 @@ RUN docker-php-ext-install \
fileinfo \
mbstring \
pdo_mysql \
tokenizer \
xml

# Increase nginx client max_body_size and re-cache config on startup
Expand Down
1 change: 1 addition & 0 deletions app/Http/Controllers/User/DashboardController.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public function index(Request $request)
}

$player = ServerPlayer::where('ckey', $request->user()->byond_key)->first();
//ToDo: Handle situation with invalid ckey

//Get player warning data
$playerwarning = new PlayerWarning($request->user()->byond_key);
Expand Down
7 changes: 5 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"laravel/tinker": "^2.7",
"laravelcollective/html": "^6.3",
"league/flysystem-aws-s3-v3": "^3.0",
"sentry/sentry-laravel": "^2.12",
"sentry/sentry-laravel": "*",
"socialiteproviders/manager": "^4.1",
"yajra/laravel-datatables-html": "4.*",
"yajra/laravel-datatables-oracle": "^9.0"
Expand Down Expand Up @@ -64,7 +64,10 @@
"config": {
"preferred-install": "dist",
"sort-packages": true,
"optimize-autoloader": true
"optimize-autoloader": true,
"allow-plugins": {
"php-http/discovery": true
}
},
"minimum-stability": "dev",
"prefer-stable": true
Expand Down
Loading

0 comments on commit 2a7b0ac

Please sign in to comment.