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 2017-09-12 23:45:21 -05:00
commit 457c910c35
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -9,6 +9,9 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
* Support for CS:GO as a default service option selection.
* Support for GMOD as a default service option selection.
### Fixed
* Using default value in rules when creating a new variable if the rules is empty.
## v0.6.4 (Courageous Carniadactylus)
### Fixed
* Fixed the console rendering on page load, I guess people don't like watching it load line-by-line for 10 minutes. Who would have guessed...

2
resources/themes/pterodactyl/admin/services/options/variables.blade.php
View file

@ -139,7 +139,7 @@
</div>
<div class="form-group">
<label class="form-label">Input Rules</label>
<input type="text" name="rules" class="form-control" placeholder="required|string|max:20" />
<input type="text" name="rules" class="form-control" value="required|string|max:20" placeholder="required|string|max:20" />
<p class="text-muted small">These rules are defined using standard Laravel Framework validation rules.</p>
</div>
</div>