Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

Browse source
This commit is contained in:
Dane Everitt 2020-10-11 12:36:02 -07:00
commit 2041bc078a
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/scripts/components/server/PowerControls.tsx
View file

@ -49,7 +49,7 @@ const PowerControls = () => {
<StopOrKillButton onPress={action => sendPowerCommand(action)}/> <StopOrKillButton onPress={action => sendPowerCommand(action)}/>
</Can> </Can>
</div> </div>
) );
}; };
export default PowerControls; export default PowerControls;

2
resources/scripts/components/server/schedules/ScheduleTaskRow.tsx
View file

@ -81,7 +81,7 @@ export default ({ schedule, task }: Props) => {
<div css={tw`md:ml-6 mt-2`}> <div css={tw`md:ml-6 mt-2`}>
{task.action === 'backup' && {task.action === 'backup' &&
<p css={tw`text-xs uppercase text-neutral-400 mb-1`}>Ignoring files & folders:</p>} <p css={tw`text-xs uppercase text-neutral-400 mb-1`}>Ignoring files & folders:</p>}
<div css={tw`font-mono bg-neutral-800 rounded py-1 px-2 text-sm w-auto whitespace-pre inline-block break-all`}> <div css={tw`font-mono bg-neutral-800 rounded py-1 px-2 text-sm w-auto inline-block whitespace-pre-wrap break-all`}>
{task.payload} {task.payload}
</div> </div>
</div> </div>

2
resources/views/admin/servers/new.blade.php
View file

@ -158,7 +158,7 @@
</div> </div>
<div class="form-group col-xs-6"> <div class="form-group col-xs-6">
<label for="pThreads">CPU Threads</label> <label for="pThreads">CPU Pinning</label>
<div> <div>
<input type="text" id="pThreads" name="threads" class="form-control" value="{{ old('threads') }}" /> <input type="text" id="pThreads" name="threads" class="form-control" value="{{ old('threads') }}" />

2
resources/views/admin/servers/view/build.blade.php
View file

@ -38,7 +38,7 @@
<p class="text-muted small">Each <em>physical</em> core on the system is considered to be <code>100%</code>. Setting this value to <code>0</code> will allow a server to use CPU time without restrictions.</p> <p class="text-muted small">Each <em>physical</em> core on the system is considered to be <code>100%</code>. Setting this value to <code>0</code> will allow a server to use CPU time without restrictions.</p>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="threads" class="control-label">CPU Threads</label> <label for="threads" class="control-label">CPU Pinning</label>
<div> <div>
<input type="text" name="threads" class="form-control" value="{{ old('threads', $server->threads) }}"/> <input type="text" name="threads" class="form-control" value="{{ old('threads', $server->threads) }}"/>
</div> </div>

2
resources/views/admin/servers/view/index.blade.php
View file

@ -68,7 +68,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td>CPU Threads</td> <td>CPU Pinning</td>
<td> <td>
@if($server->threads != null) @if($server->threads != null)
<code>{{ $server->threads }}</code> <code>{{ $server->threads }}</code>