Dane Everitt
5b33a6a434
Update .gitignore
2021-08-07 09:21:19 -07:00
Dane Everitt
74a77a0e86
Merge branch 'develop' into v2
2021-08-07 09:21:05 -07:00
Dane Everitt
22f1341fea
reformat
2021-08-07 09:19:21 -07:00
Dane Everitt
75e0a862e7
Add another sanity check for websocket permissions
2021-08-07 09:16:29 -07:00
Dane Everitt
9bffa6a94c
Ignore files from V2 as well
2021-08-07 08:46:30 -07:00
Dane Everitt
4d1a7e6637
Improve client API route model binding and prevent accidental route access without valid model binds
2021-08-04 22:20:43 -07:00
Matthew Penner
56556e9660
ui(admin): implement new mount page
2021-08-04 22:41:52 -06:00
Dane Everitt
e1089e0b73
Update calls to abstract class
2021-08-04 21:36:57 -07:00
Dane Everitt
e8474271b3
Actually include sanctum post-force push
2021-08-04 21:17:56 -07:00
Matthew Penner
00b44bf3bb
ui(admin): tweaks to server management
2021-08-04 22:16:52 -06:00
Dane Everitt
47b895a98a
Update existing application API to use simplified user permission checking
2021-08-04 21:15:19 -07:00
Dane Everitt
622d292f39
Update the client API to be consistent with how validation is handled
2021-08-04 21:15:19 -07:00
Dane Everitt
b47d262ee0
Initial pass at deleting as much removed logic as possible; still need to migrate old keys and permissions over
2021-08-04 21:15:18 -07:00
Dane Everitt
dfff8ad667
Cleanup frontend to only pass the required description field
2021-08-04 21:15:18 -07:00
Dane Everitt
374910d73a
Fix support for authorization using sanctum tokens
2021-08-04 21:15:18 -07:00
Dane Everitt
1a3451fb0d
Update underlying model representation for PATs
2021-08-04 21:15:18 -07:00
Dane Everitt
d60e8a193b
Very basic working implementation of sanctum for API validation
2021-08-04 21:15:16 -07:00
Matthew Penner
4b32828423
Merge branch 'develop' into v2
2021-08-04 21:40:38 -06:00
Matthew Penner
10b357b71e
ui(server): fix used backup count ( #3526 )
...
* ui(server): fix used backup count
* ui(server): refactor backup count code
2021-08-04 20:34:00 -07:00
Matthew Penner
0ab124f026
Merge branch 'fix/backup-ui' into v2
2021-08-04 17:29:57 -06:00
Matthew Penner
94198f3bfd
Merge branch 'develop' into v2
2021-08-04 17:27:14 -06:00
Matthew Penner
f44833ca9c
ui(server): fix used backup count
2021-08-04 17:22:57 -06:00
Matthew Penner
7e91a33a67
Update CHANGELOG.md ( #3524 )
2021-08-03 20:51:18 -07:00
Matthew Penner
49c24b9c4c
Merge pull request #3523 from parkervcp/fix_dockerfile
...
fix ghcr builds
2021-08-03 21:37:23 -06:00
Michael Parker
94fd987400
fix ghcr builds
...
Fix nginx conf file location
Fix php-fpm conf file location
2021-08-03 23:33:25 -04:00
Matthew Penner
178a886d3b
Merge branch 'develop' into v2
2021-08-03 21:13:13 -06:00
Charles Morgan
0074c84001
Add javaversion to java eggs. ( #3518 )
...
Co-authored-by: Matthew Penner <me@matthewp.io>
2021-08-03 20:11:45 -07:00
Matthew Penner
81c788f524
cmd(upgrade): fix force and seed flags being ignored ( #3519 )
2021-08-03 19:48:34 -07:00
Matthew Penner
1c071b05aa
ui: fix spinner z-index ( #3520 )
2021-08-03 19:46:00 -07:00
Matthew Penner
970f281859
backups: default is_successful to false ( #3522 )
...
* backups: default is_successful to false
* backups: properly query backups
2021-08-03 19:45:25 -07:00
Matthew Penner
c6dccc568d
ui(server): add file upload status
2021-08-03 20:41:28 -06:00
Matthew Penner
3d3df30903
Merge branch 'fix/upgrade-command' into v2
2021-08-03 20:40:45 -06:00
Matthew Penner
38ddcfb0d9
Merge branch 'fix/backups' into v2
2021-08-03 20:40:40 -06:00
Matthew Penner
b9ab6e2c33
editor: fix Mod-s hotkey and save button
2021-08-03 20:21:52 -06:00
Matthew Penner
07617bcd27
backups: properly query backups
2021-08-03 16:37:22 -06:00
Matthew Penner
c46131e7ad
backups: default is_successful to false
2021-08-03 15:46:08 -06:00
Matthew Penner
a39802cb4e
Merge branch 'develop' into v2
2021-08-03 14:41:12 -06:00
Matthew Penner
d9740fff65
cmd(upgrade): fix force and seed flags being ignored
2021-08-03 14:35:48 -06:00
Matthew Penner
174cca9e49
tests(integration): fix user controller test, actually
2021-08-02 22:26:05 -06:00
Matthew Penner
d9d79d8c95
tests(integration): fix user controller test, allegedly
2021-08-02 22:23:47 -06:00
Matthew Penner
d2864410ed
user: yeet remaining name_* fields, again...
2021-08-02 22:17:11 -06:00
Matthew Penner
4d77d486ec
user: yeet remaining name_* fields
2021-08-02 22:10:53 -06:00
Dane Everitt
b19a1640f0
Update CHANGELOG.md
2021-08-02 20:48:16 -07:00
Dane Everitt
4960bc7eec
Merge branch 'develop' of github.com:pterodactyl/panel into develop
2021-08-02 20:45:04 -07:00
Matthew Hugley
cfb5b8c244
Updated formatting for the docker compose file to fix a error. ( #3421 )
...
This fixes the error message "There is an error in the yaml syntax: YAMLSemanticError: Map keys must be unique; "<<" is repeated" which is received if trying to deploy the docker compose using portainer it will not even allow you to click the button because of the formatting error. This is a page showing a example of what I did "http://yaml.org/type/merge.html " Instead of 2 merge requests docker/portainer only allows 1 merge request in this situation so they had to be combined into 1 line instead of 2.
2021-08-02 20:44:55 -07:00
Mia
bda1ff50ab
[UI] Display the 2FA token, show spinner on load ( #3367 )
...
Co-authored-by: Dane Everitt <dane@daneeveritt.com>
2021-08-02 20:39:12 -07:00
Charles Morgan
924f00ac9a
Java Docker image updater feature ( #3430 )
...
Co-Authored-By: Lance Pioch <me@lance.sh>
2021-08-02 20:32:10 -07:00
Linux123123
9c64fb29a4
Fix ScheduleEdit page not working directly by url ( #3477 )
2021-08-02 20:07:39 -07:00
Triassic
e8746feb97
Fix a typo in DisableTwoFactorModal.tsx ( #3507 )
2021-08-02 20:07:26 -07:00
VibeGAMESNL
208a547a2a
Adding VibeGAMES as a sponsor ( #3504 )
2021-08-02 20:06:33 -07:00
