MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-20 23:33:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into pr/1129

Browse Source
This commit is contained in:
Dane Everitt
2018-05-26 10:34:29 -07:00
parent 35d108c410 0e1b4661ce
commit e3bbd85f3f
174 changed files with 1485 additions and 1116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/themes/pterodactyl/admin/nodes/view/index.blade.php
View File

@@ -76,7 +76,7 @@
<h3 class="box-title">Delete Node</h3>
</div>
<div class="box-body">
<p class="no-margin">Deleting a node is a irreversable action and will immediately remove this node from the panel. There must be no servers associated with this node in order to continue.</p>
<p class="no-margin">Deleting a node is a irreversible action and will immediately remove this node from the panel. There must be no servers associated with this node in order to continue.</p>
</div>
<div class="box-footer">
<form action="{{ route('admin.nodes.view.delete', $node->id) }}" method="POST">

2
resources/themes/pterodactyl/admin/nodes/view/settings.blade.php
View File

@@ -203,7 +203,7 @@
</div>
<div class="row">
<div class="col-md-12">
<p class="text-muted"><small>The daemon runs its own SFTP management container and does not use the SSHd process on the main physical server. <Strong>Do not use the same port that you have assigned for your physcial server's SSH process.</strong></small></p>
<p class="text-muted"><small>The daemon runs its own SFTP management container and does not use the SSHd process on the main physical server. <Strong>Do not use the same port that you have assigned for your physical server's SSH process.</strong></small></p>
</div>
</div>
</div>