Code

Add json5/jsonc support#5002

Code

Closed

notAreYouScared wants to merge 99 commits intopterodactyl:1.0-developpterodactyl/panel:1.0-developfrom notAreYouScared:4997Copy head branch name to clipboard

+26,412-38,553

Commits

Commits on Nov 25, 2022

• React 18 and Vite (#4510)

  matthewpi

  authored
  21613fa

• PostgreSQL Support (#4486)

  Show description for 3bf5a71
  

  lancepioch

  and

  matthewpi

  authored
  3bf5a71

Commits on Nov 27, 2022

• ui: remove unused codemirror 5 editor

  matthewpi

  committed
  c475d60

• docker: overhaul container image

  matthewpi

  committed
  490690f

• docker: cleanup, install shadow-utils

  matthewpi

  committed
  db4aa86

• ci(docker): temporarily disable arm64 dev build

  matthewpi

  committed
  dae40ee

Commits on Nov 28, 2022

• ci(docker): update build-push-action from v2 to v3

  matthewpi

  committed
  f76155a

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  3f7e2a5

• chore: add phpstan static analysis minimum (#4511)

  lancepioch

  authored
  a1a5275

Commits on Nov 29, 2022

• composer: update dependencies

  matthewpi

  committed
  fd356c7

• Update Containerfile

  matthewpi

  committed
  56839a1

• nix: add panel and container packages

  matthewpi

  committed
  16e34af

• php-cs-fixer

  matthewpi

  committed
  3ea6d45

• phpstan

  matthewpi

  committed
  ee863fa

• ui(server): disable file manager upload, due to library issues

  matthewpi

  committed
  209711c

Commits on Dec 4, 2022

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  ae27a8a

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  8425076

Commits on Dec 12, 2022

• yarn: upgrade dependencies

  matthewpi

  committed
  3b062ed

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  e64e288

• chore: run prettier

  matthewpi

  committed
  c44842e

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  4138fb7

Commits on Dec 13, 2022

• nix&docker: simplify Caddyfile

  matthewpi

  committed
  5fbc7a8

Commits on Dec 14, 2022

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  7fde336

• yeet

  matthewpi

  committed
  4cd0bee

Commits on Dec 15, 2022

• api(application): v2 backport

  matthewpi

  committed
  67bf3e3

• php-cs-fixer

  matthewpi

  committed
  363c4fd

• php-cs-fixer and phpstan

  matthewpi

  committed
  7ed2be5

• phpstan

  matthewpi

  committed
  3670dc6

• eggs: remove config_logs field

  matthewpi

  committed
  f68c46b

• database: fix migrations with postgres

  matthewpi

  committed
  2f15d94

• user: remove name_first and name_last

  matthewpi

  committed
  6b11836

• user: remove name_first and name_last from tests

  matthewpi

  committed
  a24c594

• composer: update dependencies

  matthewpi

  committed
  160c3dd

• cli: fix up command override

  matthewpi

  committed
  0c5416e

• database-host: reverse node relationship

  matthewpi

  committed
  507a802

• Attempt to fix Fractal object type being null

  matthewpi

  committed
  8fff084

• Make sure to actually update other references as well

  matthewpi

  committed
  10b2380

• tests: more fixes, but stuff is still broken

  matthewpi

  committed
  7f66982

• user: cleanup

  matthewpi

  committed
  926c856

• app: fix DeployServerDatabaseService

  matthewpi

  committed
  d1c7494

Commits on Dec 16, 2022

• ui(admin): add "working" React admin ui

  matthewpi

  committed
  5402584

Commits on Dec 21, 2022

• yarn: upgrade dependencies

  matthewpi

  committed
  4e56f6d

• ui(admin): update button components, fix Editor for eggs

  matthewpi

  committed
  089860b

Commits on Jan 1, 2023

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  f68864d

Commits on Jan 12, 2023

• yarn: upgrade @codemirror/*

  matthewpi

  committed
  27e3eec

• ui(server): fix file editor and file manager

  matthewpi

  committed
  42d8f2c

• ui: fix IPv6 formatting logic

  matthewpi

  committed
  76b67cb

• ui(editor): fix editor child styling

  matthewpi

  committed
  bc77378

• ui(admin): update New Nest button

  matthewpi

  committed
  216c464

• ui(admin): fix server editing

  matthewpi

  committed
  9cdbbc3

• chore: run prettier

  matthewpi

  committed
  155d7bb

• ui: fix tests

  matthewpi

  committed
  7e1aa8d

• ui: fix eslint

  matthewpi

  committed
  3d7112b

• chore: run php-cs-fixer

  matthewpi

  committed
  f45eac6

• tests: fix remaining failures

  matthewpi

  committed
  b59e1da

Commits on Jan 13, 2023

• ui: fix DashboardRouter trailing slashes

  matthewpi

  committed
  e88197c

• ui: add read-only styling to Input element

  matthewpi

  committed
  f6cf4a1

Commits on Jan 17, 2023

• ui(admin): fix oom killer setting toggle

  matthewpi

  committed
  450fba0

• app(server): rename oom_disabled to oom_killer and invert existing values

  matthewpi

  committed
  7665eea

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  62238ad

• Update README.md, fix CI status badge

  matthewpi

  committed
  0b23707

Commits on Jan 25, 2023

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  5063db7

• ui(admin): fix users list

  matthewpi

  committed
  4b82ca1

• Update Containerfile to node 18, install composer through rpms

  matthewpi

  committed
  d09e61b

• yarn: upgrade dependencies

  matthewpi

  committed
  7c67ff3

• ui(server): lazy load server console to reduce main bundle size

  matthewpi

  committed
  d8b7747

• nix: update flake lock

  matthewpi

  committed
  c5be3ad

Commits on Jan 27, 2023

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  3bd8164

Commits on Feb 6, 2023

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  582c50c

Commits on Feb 23, 2023

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  18f6611

• composer: update lock

  matthewpi

  committed
  a1e5afc

• ci(laravel): add PHP 8.2 to test matrix

  matthewpi

  committed
  85df1a4

• nix: update flake lock

  matthewpi

  committed
  733771a

• app(services): fix DeployServerDatabaseService phpstan

  matthewpi

  committed
  0af3949

• yarn: upgrade dependencies

  matthewpi

  committed
  187c7f7

• ci(docker): upgrade to php 8.2

  matthewpi

  committed
  2195aa6

• ui: fix prettier

  matthewpi

  committed
  673f728

• ci(container): replace old docker workflow

  matthewpi

  committed
  ab4b4e6

• ci(container): update to ubuntu-22.04

  matthewpi

  committed
  f98aa11

• ci(container): tweak options

  matthewpi

  committed
  05d8de0

• containerfile: reinstall tzdata

  Show description for 7241829
  matthewpi

  committed
  7241829

• containerfile: remove platform arg

  matthewpi

  committed
  8ae40a7

• ci(docker): revert workflow changes

  matthewpi

  committed
  0d225b0

• switch from yarn to pnpm

  matthewpi

  committed
  8320c64

• ci: install pnpm

  matthewpi

  committed
  f5ce1a2

Commits on Mar 11, 2023

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  dc6fadd

Commits on May 13, 2023

• Update README.md

  matthewpi

  committed
  bad7650

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  eaf4642

Commits on Jun 29, 2023

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  b7b128e

Commits on Jul 12, 2023

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  d3c6568

Commits on Aug 23, 2023

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  6f5fb09

Commits on Sep 28, 2023

• ui(admin): fix egg creation

  matthewpi

  committed
  3721b20

Commits on Sep 29, 2023

• ui(admin): fix server egg select improperly switching

  matthewpi

  committed
  35ded9d

• ui: make the Input component slightly shorter

  matthewpi

  committed
  9b35a55

Commits on Oct 2, 2023

• chore: fix eslint

  matthewpi

  committed
  8ffe0f1

• nix: update flake.lock

  matthewpi

  committed
  804a08b

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  a9bdf7a

Commits on Dec 30, 2023

• Merge branch '1.0-develop' into develop

  matthewpi

  committed
  fe83a4f

Commits on Feb 9, 2024

• Add json5/jsonc

  Show description for ab7950e
  notAreYouScared

  committed
  ab7950e