Compare commits

...

2 Commits

Author SHA1 Message Date
Gregor Vostrak
548307336a keep tags when starting a new time entry from a finished one, fixes ST-469 2024-10-22 13:27:30 +02:00
Constantin Graf
f534f90ca7 Fix force HTTPS config 2024-10-22 11:09:31 +02:00
2 changed files with 3 additions and 3 deletions

View File

@@ -28,7 +28,6 @@ use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Foundation\Application;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Route;
use Illuminate\Support\Facades\URL;
use Illuminate\Support\ServiceProvider;
@@ -91,9 +90,9 @@ class AppServiceProvider extends ServiceProvider
);
});
if (config('app.force_https', false) || App::isProduction()) {
if (config('app.force_https', false)) {
URL::forceScheme('https');
request()->server->set('HTTPS', request()->header('X-Forwarded-Proto', 'https') === 'https' ? 'on' : 'off');
request()->server->set('HTTPS', 'on');
}
$this->app->scoped(PermissionStore::class, function (Application $app): PermissionStore {

View File

@@ -113,6 +113,7 @@ function startTimeEntryFromExisting(entry: TimeEntry) {
end: null,
billable: entry.billable,
description: entry.description,
tags: [...entry.tags],
});
}
function sumDuration(timeEntries: TimeEntry[]) {