Merge branch '1.0-develop' into develop
This commit is contained in:
commit
62238ad418
5 changed files with 12 additions and 5 deletions
|
@ -1,6 +1,6 @@
|
|||
[](https://pterodactyl.io)
|
||||
|
||||

|
||||

|
||||

|
||||

|
||||

|
||||
|
|
|
@ -57,7 +57,7 @@ class EmailSettingsCommand extends Command
|
|||
$this->{$method}();
|
||||
}
|
||||
|
||||
$this->variables['MAIL_FROM'] = $this->option('email') ?? $this->ask(
|
||||
$this->variables['MAIL_FROM_ADDRESS'] = $this->option('email') ?? $this->ask(
|
||||
trans('command/messages.environment.mail.ask_mail_from'),
|
||||
$this->config->get('mail.from.address')
|
||||
);
|
||||
|
|
|
@ -6,6 +6,7 @@ use Illuminate\Support\Arr;
|
|||
use Webmozart\Assert\Assert;
|
||||
use Pterodactyl\Models\Server;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use GuzzleHttp\Exception\ClientException;
|
||||
use GuzzleHttp\Exception\TransferException;
|
||||
use Pterodactyl\Exceptions\Http\Server\FileSizeTooLargeException;
|
||||
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
|
||||
|
@ -32,7 +33,7 @@ class DaemonFileRepository extends DaemonRepository
|
|||
'query' => ['file' => $path],
|
||||
]
|
||||
);
|
||||
} catch (TransferException $exception) {
|
||||
} catch (ClientException|TransferException $exception) {
|
||||
throw new DaemonConnectionException($exception);
|
||||
}
|
||||
|
||||
|
|
8
resources/scripts/api/server/types.d.ts
vendored
8
resources/scripts/api/server/types.d.ts
vendored
|
@ -1,4 +1,10 @@
|
|||
export type ServerStatus = 'installing' | 'install_failed' | 'suspended' | 'restoring_backup' | null;
|
||||
export type ServerStatus =
|
||||
| 'installing'
|
||||
| 'install_failed'
|
||||
| 'reinstall_failed'
|
||||
| 'suspended'
|
||||
| 'restoring_backup'
|
||||
| null;
|
||||
|
||||
export interface ServerBackup {
|
||||
uuid: string;
|
||||
|
|
|
@ -11,7 +11,7 @@ export default () => {
|
|||
state => state.server.data?.isNodeUnderMaintenance || false,
|
||||
);
|
||||
|
||||
return status === 'installing' || status === 'install_failed' ? (
|
||||
return status === 'installing' || status === 'install_failed' || status === 'reinstall_failed' ? (
|
||||
<ScreenBlock
|
||||
title={'Running Installer'}
|
||||
image={ServerInstallSvg}
|
||||
|
|
Loading…
Add table
Reference in a new issue