diff --git a/config/app.php b/config/app.php index 41e94c09b..66a37e362 100644 --- a/config/app.php +++ b/config/app.php @@ -17,7 +17,7 @@ | */ - 'name' => env('APP_NAME', 'Coolify'), + 'name' => env('APP_NAME', 'Last Hour Cloud'), /* |-------------------------------------------------------------------------- diff --git a/database/migrations/2024_01_15_084609_add_custom_dns_server.php b/database/migrations/2024_01_15_084609_add_custom_dns_server.php index 24d288d02..7c636239b 100644 --- a/database/migrations/2024_01_15_084609_add_custom_dns_server.php +++ b/database/migrations/2024_01_15_084609_add_custom_dns_server.php @@ -13,7 +13,7 @@ public function up(): void { Schema::table('instance_settings', function (Blueprint $table) { $table->boolean('is_dns_validation_enabled')->default(true); - $table->string('custom_dns_servers')->nullable()->default('1.1.1.1'); + $table->string('custom_dns_servers')->nullable()->default('9.9.9.9'); }); } diff --git a/lang/en.json b/lang/en.json index bf85b2f6a..5043ef158 100644 --- a/lang/en.json +++ b/lang/en.json @@ -12,7 +12,7 @@ "auth.register_now": "Register", "auth.logout": "Logout", "auth.register": "Register", - "auth.registration_disabled": "Registration is disabled. Please contact support@lasthourhosting.org for help.", + "auth.registration_disabled": "Your registration is set to disabled. Please contact support@lasthourhosting.org for help.", "auth.reset_password": "Reset password", "auth.failed": "These credentials do not match our records.", "auth.failed.callback": "Failed to process callback from login provider.", diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index b2a62544d..cc0d86f33 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -69,5 +69,8 @@ - + <<<<<<< HEAD + ======= + + >>>>>>> 794e9b53b (fix: replace copy and change app_name) \ No newline at end of file diff --git a/resources/views/components/emails/footer.blade.php b/resources/views/components/emails/footer.blade.php index 1a4cfd0e4..d275015de 100644 --- a/resources/views/components/emails/footer.blade.php +++ b/resources/views/components/emails/footer.blade.php @@ -1,6 +1,6 @@ {{ Illuminate\Mail\Markdown::parse('---') }} Thank you,
-{{ config('app.name') ?? 'Coolify' }} +{{ config('app.name') ?? 'Last Hour Cloud' }} -{{ Illuminate\Mail\Markdown::parse('[Contact Support](https://lasthourhosting.org/contact.html)') }} +{{ Illuminate\Mail\Markdown::parse('[Contact Support](https://lasthourhosting.org/contact.html)') }} \ No newline at end of file diff --git a/resources/views/layouts/boarding.blade.php b/resources/views/layouts/boarding.blade.php index 67c1cc998..313a202ea 100644 --- a/resources/views/layouts/boarding.blade.php +++ b/resources/views/layouts/boarding.blade.php @@ -1,7 +1,7 @@ @extends('layouts.base') @section('body') -
- {{ $slot }} -
- @parent -@endsection +
+ {{ $slot }} +
+@parent +@endsection \ No newline at end of file diff --git a/resources/views/livewire/settings/configuration.blade.php b/resources/views/livewire/settings/configuration.blade.php index 928bee8e6..146299c55 100644 --- a/resources/views/livewire/settings/configuration.blade.php +++ b/resources/views/livewire/settings/configuration.blade.php @@ -32,13 +32,22 @@

Advanced

-
+ <<<<<<< HEAD
@if (!is_null(env('AUTOUPDATE', null))) - - @else - - @endif - - -
+ ======= +
+ @if(!is_null(env('AUTOUPDATE', null))) + >>>>>>> 794e9b53b (fix: replace copy and change app_name) + + @else + + @endif + + + <<<<<<< HEAD=======@if ($next_channel) + @else + + @endif + >>>>>>> 794e9b53b (fix: replace copy and change app_name) +
\ No newline at end of file