Skip to content

Commit 48cb01f

Browse files
committed
Merge branch 'develop' into feature/vuejs
2 parents e5e66fd + 422e5dd commit 48cb01f

File tree

52 files changed

+665
-528
lines changed

Some content is hidden

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

52 files changed

+665
-528
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: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,22 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
77
### Added
88
* Nodes can now be put into maintenance mode to deny access to servers temporarily.
99
* Basic statistics about your panel are now available in the Admin CP.
10+
* 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.
1011

1112
### Fixed
1213
* Hitting Ctrl+Z when editing a file on the web now works as expected.
1314
* Logo now links to the correct location on all pages.
15+
* Permissions checking to determine if a user can see the task management page now works correctly.
16+
* Fixed `pterodactyl.environment_variables` to be used correctly for global environment variables. The wrong config variable name was being using previously.
17+
* 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.
18+
* 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.
19+
* Emails should send properly now when a server is marked as installed to let the owner know it is ready for action.
20+
* Cancelling a file manager operation should cancel correctly across all browsers now.
1421

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

1827
## v0.7.7 (Derelict Dermodactylus)
1928
### Fixed
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
*/

app/Contracts/Repository/ServerRepositoryInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public function getServersForPowerActionCount(array $servers = [], array $nodes
147147
public function isUniqueUuidCombo(string $uuid, string $short): bool;
148148

149149
/**
150-
* Get the amount of servers that are suspended
150+
* Get the amount of servers that are suspended.
151151
*
152152
* @return int
153153
*/

app/Events/Server/Installed.php

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?php
2+
3+
namespace Pterodactyl\Events\Server;
4+
5+
use Pterodactyl\Events\Event;
6+
use Pterodactyl\Models\Server;
7+
use Illuminate\Queue\SerializesModels;
8+
9+
class Installed extends Event
10+
{
11+
use SerializesModels;
12+
13+
/**
14+
* @var \Pterodactyl\Models\Server
15+
*/
16+
public $server;
17+
18+
/**
19+
* Create a new event instance.
20+
*
21+
* @var \Pterodactyl\Models\Server
22+
*/
23+
public function __construct(Server $server)
24+
{
25+
$this->server = $server;
26+
}
27+
}

0 commit comments

Comments
 (0)