Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: replace copy and change app_name

Browse Source
This commit is contained in:
Gary 2024-07-25 14:00:29 -07:00
parent cad0a6d81f
commit e3ef28ec1a
7 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/app.php
View File

@ -17,7 +17,7 @@
| |
*/ */
'name' => env('APP_NAME', 'Coolify'), 'name' => env('APP_NAME', 'Last Hour Cloud'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

2
database/migrations/2024_01_15_084609_add_custom_dns_server.php
View File

@ -13,7 +13,7 @@ public function up(): void
{ {
Schema::table('instance_settings', function (Blueprint $table) { Schema::table('instance_settings', function (Blueprint $table) {
$table->boolean('is_dns_validation_enabled')->default(true); $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');
}); });
} }

2
lang/en.json
View File

@ -12,7 +12,7 @@
"auth.register_now": "Register", "auth.register_now": "Register",
"auth.logout": "Logout", "auth.logout": "Logout",
"auth.register": "Register", "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.reset_password": "Reset password",
"auth.failed": "These credentials do not match our records.", "auth.failed": "These credentials do not match our records.",
"auth.failed.callback": "Failed to process callback from login provider.", "auth.failed.callback": "Failed to process callback from login provider.",

5
resources/views/auth/login.blade.php
View File

@ -69,5 +69,8 @@
</div> </div>
</div> </div>
</div> </div>
</section> <<<<<<< HEAD </section>
=======
</div>
>>>>>>> 794e9b53b (fix: replace copy and change app_name)
</x-layout-simple> </x-layout-simple>

4
resources/views/components/emails/footer.blade.php
View File

@ -1,6 +1,6 @@
{{ Illuminate\Mail\Markdown::parse('---') }} {{ Illuminate\Mail\Markdown::parse('---') }}
Thank you,<br> Thank you,<br>
{{ 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)') }}

10
resources/views/layouts/boarding.blade.php
View File

@ -1,7 +1,7 @@
@extends('layouts.base') @extends('layouts.base')
@section('body') @section('body')
<main class="h-full"> <main class="h-full">
{{ $slot }} {{ $slot }}
</main> </main>
@parent @parent
@endsection @endsection

25
resources/views/livewire/settings/configuration.blade.php
View File

@ -32,13 +32,22 @@
</form> </form>
<h2 class="pt-6">Advanced</h2> <h2 class="pt-6">Advanced</h2>
<div class="text-right md:w-96"> <<<<<<< HEAD <div class="text-right md:w-96">
@if (!is_null(env('AUTOUPDATE', null))) @if (!is_null(env('AUTOUPDATE', null)))
<x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there." disabled id="is_auto_update_enabled" label="Auto Update Last Hour Cloud" /> =======
@else <div class="flex flex-col py-6 text-right w-80">
<x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Last Hour Cloud" /> @if(!is_null(env('AUTOUPDATE', null)))
@endif >>>>>>> 794e9b53b (fix: replace copy and change app_name)
<x-forms.checkbox instantSave id="is_registration_enabled" label="Registration Allowed" /> <x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there." disabled id="is_auto_update_enabled" label="Auto Update Last Hour Cloud" />
<x-forms.checkbox instantSave id="do_not_track" label="Do Not Track" /> @else
</div> <x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Last Hour Cloud" />
@endif
<x-forms.checkbox instantSave id="is_registration_enabled" label="Registration Allowed" />
<x-forms.checkbox instantSave id="do_not_track" label="Do Not Track" />
<<<<<<< HEAD=======@if ($next_channel) <x-forms.checkbox instantSave helper="Do not recommended, only if you like to live on the edge." id="next_channel" label="Enable pre-release (early) updates" />
@else
<x-forms.checkbox disabled instantSave helper="Currently disabled. Do not recommended, only if you like to live on the edge." id="next_channel" label="Enable pre-release (early) updates" />
@endif
>>>>>>> 794e9b53b (fix: replace copy and change app_name)
</div>
</div> </div>