Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pterodactyl/panel
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.11.7
Choose a base ref
...
head repository: pterodactyl/panel
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref

Commits on Nov 25, 2022

  1. React 18 and Vite (#4510)

    matthewpi authored Nov 25, 2022
    Copy the full SHA
    21613fa View commit details
  2. PostgreSQL Support (#4486)

    Co-authored-by: Matthew Penner <matthew@pterodactyl.io>
    lancepioch and matthewpi authored Nov 25, 2022
    Copy the full SHA
    3bf5a71 View commit details

Commits on Nov 27, 2022

  1. Copy the full SHA
    c475d60 View commit details
  2. Copy the full SHA
    490690f View commit details
  3. Copy the full SHA
    db4aa86 View commit details
  4. Copy the full SHA
    dae40ee View commit details

Commits on Nov 28, 2022

  1. Copy the full SHA
    f76155a View commit details
  2. Copy the full SHA
    3f7e2a5 View commit details
  3. Copy the full SHA
    a1a5275 View commit details

Commits on Nov 29, 2022

  1. Copy the full SHA
    fd356c7 View commit details
  2. Update Containerfile

    matthewpi committed Nov 29, 2022
    Copy the full SHA
    56839a1 View commit details
  3. Copy the full SHA
    16e34af View commit details
  4. php-cs-fixer

    matthewpi committed Nov 29, 2022
    Copy the full SHA
    3ea6d45 View commit details
  5. phpstan

    matthewpi committed Nov 29, 2022
    Copy the full SHA
    ee863fa View commit details
  6. Copy the full SHA
    209711c View commit details

Commits on Dec 4, 2022

  1. Copy the full SHA
    ae27a8a View commit details
  2. Copy the full SHA
    8425076 View commit details

Commits on Dec 12, 2022

  1. yarn: upgrade dependencies

    matthewpi committed Dec 12, 2022
    Copy the full SHA
    3b062ed View commit details
  2. Copy the full SHA
    e64e288 View commit details
  3. chore: run prettier

    matthewpi committed Dec 12, 2022
    Copy the full SHA
    c44842e View commit details
  4. Copy the full SHA
    4138fb7 View commit details

Commits on Dec 13, 2022

  1. Copy the full SHA
    5fbc7a8 View commit details

Commits on Dec 14, 2022

  1. Copy the full SHA
    7fde336 View commit details
  2. yeet

    matthewpi committed Dec 14, 2022
    1
    Copy the full SHA
    4cd0bee View commit details

Commits on Dec 15, 2022

  1. Copy the full SHA
    67bf3e3 View commit details
  2. php-cs-fixer

    matthewpi committed Dec 15, 2022
    Copy the full SHA
    363c4fd View commit details
  3. php-cs-fixer and phpstan

    matthewpi committed Dec 15, 2022
    Copy the full SHA
    7ed2be5 View commit details
  4. phpstan

    matthewpi committed Dec 15, 2022
    Copy the full SHA
    3670dc6 View commit details
  5. Copy the full SHA
    f68c46b View commit details
  6. Copy the full SHA
    2f15d94 View commit details
  7. Copy the full SHA
    6b11836 View commit details
  8. Copy the full SHA
    a24c594 View commit details
  9. Copy the full SHA
    160c3dd View commit details
  10. Copy the full SHA
    0c5416e View commit details
  11. Copy the full SHA
    507a802 View commit details
  12. Copy the full SHA
    8fff084 View commit details
  13. Copy the full SHA
    10b2380 View commit details
  14. Copy the full SHA
    7f66982 View commit details
  15. user: cleanup

    matthewpi committed Dec 15, 2022
    Copy the full SHA
    926c856 View commit details
  16. Copy the full SHA
    d1c7494 View commit details

Commits on Dec 16, 2022

  1. Copy the full SHA
    5402584 View commit details

Commits on Dec 21, 2022

  1. yarn: upgrade dependencies

    matthewpi committed Dec 21, 2022
    Copy the full SHA
    4e56f6d View commit details
  2. Copy the full SHA
    089860b View commit details

Commits on Jan 1, 2023

  1. Copy the full SHA
    f68864d View commit details

Commits on Jan 12, 2023

  1. yarn: upgrade @codemirror/*

    matthewpi committed Jan 12, 2023
    Copy the full SHA
    27e3eec View commit details
  2. Copy the full SHA
    42d8f2c View commit details
  3. Copy the full SHA
    76b67cb View commit details
  4. Copy the full SHA
    bc77378 View commit details
  5. Copy the full SHA
    216c464 View commit details
  6. Copy the full SHA
    9cdbbc3 View commit details
Showing 1,073 changed files with 26,459 additions and 38,618 deletions.
20 changes: 0 additions & 20 deletions .env.ci

This file was deleted.

1 change: 0 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
APP_ENV=production
APP_DEBUG=false
APP_KEY=
APP_THEME=pterodactyl
APP_TIMEZONE=UTC
APP_URL=http://panel.example.com
APP_LOCALE=en
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -28,15 +28,16 @@ module.exports = {
// 'standard',
'eslint:recommended',
'plugin:react/recommended',
'plugin:react/jsx-runtime',
'plugin:@typescript-eslint/recommended',
'plugin:jest-dom/recommended',
],
rules: {
eqeqeq: 'error',
'prettier/prettier': ['error', {}, { usePrettierrc: true }],
// TypeScript can infer this significantly better than eslint ever can.
'react/prop-types': 0,
'react/display-name': 0,
'react/no-unknown-property': ['error', {ignore: ['css']}],
'@typescript-eslint/no-explicit-any': 0,
'@typescript-eslint/no-non-null-assertion': 0,
// This setup is required to avoid a spam of errors when running eslint about React being
21 changes: 21 additions & 0 deletions .github/docker/Caddyfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
:8080 {
root * /var/www/pterodactyl/public/
file_server

header {
-Server
-X-Powered-By
Referrer-Policy "same-origin"
X-Frame-Options "deny"
X-XSS-Protection "1; mode=block"
X-Content-Type-Options "nosniff"
}

encode gzip zstd

php_fastcgi 127.0.0.1:9000 {
trusted_proxies 172.20.0.0/16
}

try_files {path} {path}/ /index.php?{query}
}
76 changes: 0 additions & 76 deletions .github/docker/README.md

This file was deleted.

51 changes: 0 additions & 51 deletions .github/docker/default.conf

This file was deleted.

70 changes: 0 additions & 70 deletions .github/docker/default_ssl.conf

This file was deleted.

81 changes: 0 additions & 81 deletions .github/docker/entrypoint.sh

This file was deleted.

21 changes: 21 additions & 0 deletions .github/docker/php-fpm.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[global]
error_log = /dev/stderr
daemonize = no

[www]
user = nobody
group = nobody

listen = 127.0.0.1:9000

pm = dynamic
pm.start_servers = 4
pm.min_spare_servers = 4
pm.max_spare_servers = 16
pm.max_children = 64
pm.max_requests = 256

clear_env = no
catch_workers_output = yes

decorate_workers_output = no
Loading