Skip to content

Commit 4d62e4c

Browse files
committed
Merge branch 'develop' into pr/1128
2 parents b56f3a8 + c6112b4 commit 4d62e4c

File tree

96 files changed

+1963
-871
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+1963
-871
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
name: "\U0001F41B Bug Report"
3+
about: Create a report to help us resolve a bug or error
4+
5+
---
6+
7+
**Background (please complete the following information):**
8+
* Panel or Daemon:
9+
* Version of Panel/Daemon:
10+
* Server's OS:
11+
* Your Computer's OS & Browser:
12+
13+
**Describe the bug**
14+
A clear and concise description of what the bug is.
15+
Please provide additional information too, depending on what you have issues with:
16+
Panel: `php -v` (the php version in use).
17+
Daemon: `uname -a` and `docker info` (your kernel version and information regarding docker)
18+
19+
**To Reproduce**
20+
Steps to reproduce the behavior:
21+
1. Go to '...'
22+
2. Click on '....'
23+
3. Scroll down to '....'
24+
4. See error
25+
26+
**Expected behavior**
27+
A clear and concise description of what you expected to happen. If applicable, add screenshots or a recording to help explain your problem.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: "\U0001F680 Feature Request"
3+
about: Suggest an idea for this project
4+
5+
---
6+
7+
**Is your feature request related to a problem? Please describe.**
8+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
9+
10+
**Describe the solution you'd like**
11+
A clear and concise description of what you want to happen.
12+
13+
**Describe alternatives you've considered**
14+
A clear and concise description of any alternative solutions or features you've considered.
15+
16+
**Additional context**
17+
Add any other context or screenshots about the feature request here.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
name: "⛔ Installation Help"
3+
about: 'Visit our Discord for installation help: https://pterodactyl.io/discord'
4+
5+
---
6+
7+
We use GitHub issues only to discuss about Pterodactyl bugs and new features. For
8+
this kind of questions about using Pterodactyl, please visit our Discord for assistance: https://pterodactyl.io/discord

.travis.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
language: php
22
dist: trusty
3+
git:
4+
depth: 3
5+
quiet: true
6+
matrix:
7+
fast_finish: true
8+
allow_failures:
9+
- env: TEST_SUITE=Coverage
10+
env:
11+
matrix:
12+
- TEST_SUITE=Unit
13+
- TEST_SUITE=Coverage
14+
- TEST_SUITE=Integration
315
php:
416
- 7.2
517
sudo: false
@@ -15,8 +27,9 @@ before_script:
1527
- cp .env.travis .env
1628
- travis_retry composer install --no-interaction --prefer-dist --no-suggest
1729
script:
18-
- vendor/bin/phpunit --bootstrap vendor/autoload.php --coverage-clover coverage.xml tests/Unit
19-
- vendor/bin/phpunit tests/Integration
30+
- if [ "$TEST_SUITE" = "Unit" ]; then vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit; fi;
31+
- if [ "$TEST_SUITE" = "Coverage" ]; then vendor/bin/phpunit --bootstrap vendor/autoload.php --coverage-clover coverage.xml tests/Unit; fi;
32+
- if [ "$TEST_SUITE" = "Integration" ]; then vendor/bin/phpunit tests/Integration; fi;
2033
notifications:
2134
email: false
2235
webhooks:

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,39 @@ This file is a running track of new features and fixes to each version of the pa
33

44
This project follows [Semantic Versioning](http://semver.org) guidelines.
55

6+
## v0.7.10 (Derelict Dermodactylus)
7+
### Fixed
8+
* Scheduled tasks triggered manually no longer improperly change the `next_run_at` time and do not run twice in a row anymore.
9+
* Changing the maximum web-based file upload size for a node now properly validates and updates.
10+
* Changing configuration values for a node now correctly updates them on the daemon on the first request, rather than requiring a second request to set them.
11+
12+
### Changed
13+
* Egg and server variable values are no longer limited to 191 characters. Turns out some games require a large number of characters in these fields.
14+
15+
## v0.7.9 (Derelict Dermodactylus)
16+
### Fixed
17+
* Fixes a two-factor authentication bypass present in the password reset process for an account.
18+
619
## v0.7.8 (Derelict Dermodactylus)
720
### Added
821
* Nodes can now be put into maintenance mode to deny access to servers temporarily.
922
* Basic statistics about your panel are now available in the Admin CP.
23+
* Added support for using a MySQL socket location for connections rather than a TCP connection. Set a `DB_SOCKET` variable in your `.env` file to use this.
1024

1125
### Fixed
1226
* Hitting Ctrl+Z when editing a file on the web now works as expected.
1327
* Logo now links to the correct location on all pages.
28+
* Permissions checking to determine if a user can see the task management page now works correctly.
29+
* Fixed `pterodactyl.environment_variables` to be used correctly for global environment variables. The wrong config variable name was being using previously.
30+
* Fixes tokens being sent to users when their account is created to actually work. Implements Laravel's internal token creation mechanisms rather than trying to do it custom.
31+
* Updates some eggs to ensure they have the correct data and will continue working down the road. Fixes autoupdating on some source servers and MC related download links.
32+
* Emails should send properly now when a server is marked as installed to let the owner know it is ready for action.
33+
* Cancelling a file manager operation should cancel correctly across all browsers now.
1434

1535
### Changed
1636
* Attempting to upload a folder via the web file manager will now display a warning telling the user to use SFTP.
37+
* Changing your account password will now log out all other sessions that currently exist for that user.
38+
* Subusers with no permissions selected can be created.
1739

1840
## v0.7.7 (Derelict Dermodactylus)
1941
### Fixed

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
[![Logo Image](https://cdn.pterodactyl.io/logos/Banner%20Logo%20Black@2x.png)](https://pterodactyl.io)
22

3-
[![Build Status](https://travis-ci.org/pterodactyl/panel.svg?branch=develop)](https://travis-ci.org/pterodactyl/panel) [![StyleCI](https://styleci.io/repos/47508644/shield?branch=develop)](https://styleci.io/repos/47508644) [![codecov](https://codecov.io/gh/pterodactyl/panel/branch/develop/graph/badge.svg)](https://codecov.io/gh/Pterodactyl/Panel)
3+
[![Build status](https://img.shields.io/travis/pterodactyl/panel/develop.svg?style=flat-square)](https://travis-ci.org/pterodactyl/panel)
4+
[![StyleCI](https://styleci.io/repos/47508644/shield?branch=develop)](https://styleci.io/repos/47508644)
5+
[![Codecov](https://img.shields.io/codecov/c/github/pterodactyl/panel/develop.svg?style=flat-square)](https://codecov.io/gh/Pterodactyl/Panel)
6+
[![Discord](https://img.shields.io/discord/122900397965705216.svg?style=flat-square&label=Discord)](https://pterodactyl.io/discord)
47

58
# Pterodactyl Panel
9+
610
Pterodactyl is the open-source game server management panel built with PHP7, Nodejs, and Go. Designed with security in mind, Pterodactyl runs all game servers in isolated Docker containers while exposing a beautiful and intuitive UI to administrators and users.
711
What more are you waiting for? Make game servers a first class citizen on your platform today.
812

913
![Image](https://cdn.pterodactyl.io/site-assets/mockup-macbook-grey.png)
1014

1115
## Support & Documentation
12-
Support for using Pterodactyl can be found on our [Documentation Website](https://docs.pterodactyl.io), [Guides Website](https://guides.pterodactyl.io), or via our [Discord Chat](https://discord.gg/QRDZvVm).
16+
Support for using Pterodactyl can be found on our [Documentation Website](https://pterodactyl.io/project/introduction.html), [Guides Website](https://guides.pterodactyl.io), or via our [Discord Chat](https://discord.gg/QRDZvVm).
1317

1418
### Supported Games
1519
We support a huge variety of games by utilizing Docker containers to isolate each instance, giving you the power to host your games across the world without having to bloat each physical machine with additional dependencies.

app/Console/Commands/Schedule/ProcessRunnableCommand.php

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,14 @@
99

1010
namespace Pterodactyl\Console\Commands\Schedule;
1111

12-
use Carbon\Carbon;
12+
use Cake\Chronos\Chronos;
1313
use Illuminate\Console\Command;
1414
use Illuminate\Support\Collection;
1515
use Pterodactyl\Services\Schedules\ProcessScheduleService;
1616
use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface;
1717

1818
class ProcessRunnableCommand extends Command
1919
{
20-
/**
21-
* @var \Carbon\Carbon
22-
*/
23-
protected $carbon;
24-
2520
/**
2621
* @var string
2722
*/
@@ -45,31 +40,28 @@ class ProcessRunnableCommand extends Command
4540
/**
4641
* ProcessRunnableCommand constructor.
4742
*
48-
* @param \Carbon\Carbon $carbon
4943
* @param \Pterodactyl\Services\Schedules\ProcessScheduleService $processScheduleService
5044
* @param \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface $repository
5145
*/
52-
public function __construct(
53-
Carbon $carbon,
54-
ProcessScheduleService $processScheduleService,
55-
ScheduleRepositoryInterface $repository
56-
) {
46+
public function __construct(ProcessScheduleService $processScheduleService, ScheduleRepositoryInterface $repository)
47+
{
5748
parent::__construct();
5849

59-
$this->carbon = $carbon;
6050
$this->processScheduleService = $processScheduleService;
6151
$this->repository = $repository;
6252
}
6353

6454
/**
6555
* Handle command execution.
66-
*
67-
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
68-
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
6956
*/
7057
public function handle()
7158
{
72-
$schedules = $this->repository->getSchedulesToProcess($this->carbon->now()->toAtomString());
59+
$schedules = $this->repository->getSchedulesToProcess(Chronos::now()->toAtomString());
60+
if ($schedules->count() < 1) {
61+
$this->line('There are no scheduled tasks for servers that need to be run.');
62+
63+
return;
64+
}
7365

7466
$bar = $this->output->createProgressBar(count($schedules));
7567
$schedules->each(function ($schedule) use ($bar) {
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?php
2+
3+
namespace Pterodactyl\Contracts\Core;
4+
5+
use Pterodactyl\Events\Event;
6+
7+
interface ReceivesEvents
8+
{
9+
/**
10+
* Handles receiving an event from the application.
11+
*
12+
* @param \Pterodactyl\Events\Event $notification
13+
*/
14+
public function handle(Event $notification): void;
15+
}

app/Contracts/Repository/RepositoryInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public function insert(array $data): bool;
202202
public function insertIgnore(array $values): bool;
203203

204204
/**
205-
* Get the amount of entries in the database
205+
* Get the amount of entries in the database.
206206
*
207207
* @return int
208208
*/

0 commit comments

Comments
 (0)