Commit Graph

3943 Commits

Author SHA1 Message Date
Dane Everitt
fc6f3271a0 Merge pull request #3089 from WaffleThief123/develop
Adding CHS to readme as well as some typos
2021-02-11 14:37:16 -08:00
Cyra Westmere
d67cd5f221 Minor grammatical change to Spillhosting.no 2021-02-11 13:44:35 -08:00
Cyra Westmere
c9ebbf161e Rewrote CHS after talking to the team. 2021-02-11 13:36:53 -08:00
Cyra Westmere
deaeb3fa99 Fixed a typo on Line 10 "in isolated Docker container" -> "in isolated
Docker conatiners"
Fixed a typo in SpillHosting's Company: "which aims to cheap services" ->
"which aims for cheap services"
Added CHS to sponsors
2021-02-11 13:29:33 -08:00
Dane Everitt
9af1b9c3ac Merge pull request #3072 from pterodactyl/matthewpi/fix-server-installs
api(remote): fix inproper reading of boolean for installation status
2021-02-08 10:04:45 -08:00
Matthew Penner
352910f897 api(remote): fix inproper reading of boolean for installation status 2021-02-06 10:16:08 -07:00
Dane Everitt
00da092e45 Fix tests 2021-01-30 19:12:22 -08:00
Dane Everitt
2f08456ed9 Merge branch 'dane/restore-backups' into develop 2021-01-30 18:51:16 -08:00
Dane Everitt
c8ecbe6e79 Update logic to listen for a restoration completion event 2021-01-30 18:43:46 -08:00
Dane Everitt
f558bc880a Correctly handle error; don't overwrite laravel method 2021-01-30 18:07:48 -08:00
Dane Everitt
32fb21d0b7 Update use of server error blocks 2021-01-30 18:01:32 -08:00
Dane Everitt
e30a765071 Simplify logic when a server is in an unsupported state 2021-01-30 13:28:31 -08:00
Dane Everitt
be26921fcc Merge branch 'develop' into dane/restore-backups 2021-01-30 10:10:29 -08:00
Dane Everitt
8c2d1cdffc Merge pull request #3050 from pterodactyl/fix/release-building
actions(release): copy .babel-plugin-macrosrc.js to release archive
2021-01-28 21:10:49 -08:00
Matthew Penner
6c2dcbce9c actions(release): copy .babel-plugin-macrosrc.js to release archive 2021-01-28 16:47:37 -07:00
Dane Everitt
5515871b2f Turns out I hate that huge space formatting, disable that mess 2021-01-27 20:52:11 -08:00
Dane Everitt
0ae90eacaa Don't try to store null values in the DB for variables; closes #3038 2021-01-27 20:45:26 -08:00
YinScape
8e7fcb484c Update "not viable" message to be more informative (#2987) 2021-01-26 21:13:13 -08:00
Charles Morgan
b8db5bc8b0 Allow copy on click for SFTP information (#3027) 2021-01-26 21:10:30 -08:00
Dane Everitt
25f656116a Merge pull request #3031 from Software-Noob/patch/rust_egg
Rust+ app support
2021-01-26 21:10:12 -08:00
Dane Everitt
b00def2537 Switch to JSON from TEXT when storing denylist items for an egg; closes #3034 2021-01-26 21:08:53 -08:00
Dane Everitt
0dd0f09238 Formatting cleanup for backups 2021-01-25 19:25:15 -08:00
Dane Everitt
0a2c89e9f4 Reeformat with new rules post merge 2021-01-25 19:20:51 -08:00
Dane Everitt
663143de0b Merge branch 'develop' into dane/restore-backups 2021-01-25 19:16:40 -08:00
Softwarenoob
dc5cf9ced5 Rust+ app support 2021-01-25 08:03:24 +02:00
Dane Everitt
b7d1c45bcc Merge pull request #3028 from zKoz210/patch-6
Fixed tests
2021-01-24 10:16:30 -08:00
Oreo Oreoniv
09078bc1d2 Fixed tests 2021-01-24 13:12:40 +03:00
Dane Everitt
d838ddb006 Merge branch 'dane/self-update' into develop 2021-01-23 16:33:41 -08:00
Dane Everitt
bf2291357f Just stop people right there. 2021-01-23 16:32:43 -08:00
Dane Everitt
2a8d336336 Ensure slow commands have time to run 2021-01-23 16:29:18 -08:00
Dane Everitt
fd9245b2c5 Make sure we chown the files at the end of the process 2021-01-23 16:27:23 -08:00
Dane Everitt
db5c9b3675 Allow specification of a version 2021-01-23 16:12:13 -08:00
Dane Everitt
fb98b1892d Add simple logic to download and unpack the archive 2021-01-23 16:07:49 -08:00
Dane Everitt
6f3ea462a7 Add command to execute all of the normal upgrade commands for the application 2021-01-23 15:52:57 -08:00
Dane Everitt
fa9431c54d Slightly cleanup 2021-01-23 14:12:15 -08:00
Dane Everitt
07798b7366 Update file contents 2021-01-23 13:59:52 -08:00
Dane Everitt
b480a9e4e2 Make php-cs-fixer work in phpstorm 2021-01-23 13:44:35 -08:00
Dane Everitt
91cdf08489 Update .php_cs.dist 2021-01-23 13:37:07 -08:00
Dane Everitt
29e0bebc73 Allow composer to run in local environments even without DB 2021-01-23 13:27:20 -08:00
Dane Everitt
c449ca5155 Use more standardized phpcs 2021-01-23 12:33:34 -08:00
Dane Everitt
a043071e3c Update to Laravel 8
Co-authored-by: Matthew Penner <me@matthewp.io>
2021-01-23 12:12:54 -08:00
Dane Everitt
028921b42a Merge pull request #2985 from pterodactyl/fix/docker-build-version
Properly add the version to Docker builds
2021-01-20 21:33:51 -08:00
Dane Everitt
8df44b3280 Merge pull request #2997 from gOOvER/ts3-query-fix
Teamspeak 3 Egg - added queryport and use default query port
2021-01-20 21:33:29 -08:00
Dane Everitt
ef1989f38b Merge branch 'develop' into ts3-query-fix 2021-01-20 20:12:53 -08:00
Dane Everitt
aab353d91e Merge pull request #3011 from AreYouRlyScared/addcronmonth
Adds months for schedules
2021-01-20 20:10:26 -08:00
Dane Everitt
914ee65ded Don't use a persisted setting when switching users; ref #3021 2021-01-20 20:07:52 -08:00
Dane Everitt
3053a896f4 Update CHANGELOG.md v1.2.2 2021-01-19 21:45:32 -08:00
Dane Everitt
63f945bc3a Add test coverage to cehck the authorization state of client resources 2021-01-19 21:20:55 -08:00
Dane Everitt
e8dcd30e0c [security] fix resources not properly returning an error when they don't match the server in the URL
Prior to this fix certain resources were accessible even when their assigned server was not the same as the server in the URL. This causes the resource server relationship to not match the server variable present on the request.

Due to this failed logic it was possible for users to access resources they should not have been able to access otherwise for some areas of the panel.
2021-01-19 21:19:17 -08:00
Dane Everitt
eecd550c48 Make debugging test failures easier 2021-01-19 20:11:00 -08:00