Merge branch 'next' into feat/api/tag-management

This commit is contained in:
Michael Jathe authored and GitHub committed 2026-03-30 11:51:41 +02:00
commit 5ea1ee6948
12 files changed
+532 -23

No files matched your search

+13
View File
@@ -157,6 +157,19 @@ class Advanced extends Component
}
}
public function toggleRegistration($password): bool
{
if (! verifyPasswordConfirmation($password, $this)) {
return false;
}
$this->settings->is_registration_enabled = $this->is_registration_enabled = true;
$this->settings->save();
$this->dispatch('success', 'Registration has been enabled.');
return true;
}
public function toggleTwoStepConfirmation($password): bool
{
if (! verifyPasswordConfirmation($password, $this)) {
+4 -4
View File
@@ -40,7 +40,7 @@ class ForceDisabled extends CustomEmailNotification
color: DiscordMessage::errorColor(),
);
$message->addField('Please update your subscription to enable the server again!', '[Link](https://app.coolify.io/subscriptions)');
$message->addField('Please update your subscription to enable the server again!', '[Link](https://app.coolify.io/subscription)');
return $message;
}
@@ -48,7 +48,7 @@ class ForceDisabled extends CustomEmailNotification
public function toTelegram(): array
{
return [
'message' => "Coolify: Server ({$this->server->name}) disabled because it is not paid!\n All automations and integrations are stopped.\nPlease update your subscription to enable the server again [here](https://app.coolify.io/subscriptions).",
'message' => "Coolify: Server ({$this->server->name}) disabled because it is not paid!\n All automations and integrations are stopped.\nPlease update your subscription to enable the server again [here](https://app.coolify.io/subscription).",
];
}
@@ -57,7 +57,7 @@ class ForceDisabled extends CustomEmailNotification
return new PushoverMessage(
title: 'Server disabled',
level: 'error',
message: "Server ({$this->server->name}) disabled because it is not paid!\n All automations and integrations are stopped.<br/>Please update your subscription to enable the server again [here](https://app.coolify.io/subscriptions).",
message: "Server ({$this->server->name}) disabled because it is not paid!\n All automations and integrations are stopped.<br/>Please update your subscription to enable the server again [here](https://app.coolify.io/subscription).",
);
}
@@ -66,7 +66,7 @@ class ForceDisabled extends CustomEmailNotification
$title = 'Server disabled';
$description = "Server ({$this->server->name}) disabled because it is not paid!\n";
$description .= "All automations and integrations are stopped.\n\n";
$description .= 'Please update your subscription to enable the server again: https://app.coolify.io/subscriptions';
$description .= 'Please update your subscription to enable the server again: https://app.coolify.io/subscription';
return new SlackMessage(
title: $title,