Dane Everitt
802f88fc78
Merge branch 'develop' into permissions
2020-11-08 11:47:45 -08:00
Dane Everitt
ce425435d4
Merge pull request #2666 from Yomanz/patch-1
...
Use app key from environment
2020-11-08 11:47:26 -08:00
Charles Morgan
e340cf16bf
remove permission based view
...
recent changes that were made always show the primary allocation to the end users even if they don't have the read permission.
2020-11-07 17:25:05 -05:00
Dane Everitt
c20d53bb17
Always return the primary allocation for a server, even without the allocation permissions
2020-11-07 09:57:53 -08:00
Dane Everitt
f99ac0ecde
Fix some failing test cases
2020-11-06 22:33:39 -08:00
Dane Everitt
625fd92130
Fix URKL encoding hellscape; closes #2664 closes #2663
2020-11-06 20:47:03 -08:00
Daave
80574e991b
Remove quotes and fix indentation
2020-11-06 13:23:05 +00:00
Daave
9c33288902
Change entrypoint so it doesn't overwrite app key.
...
APP_KEY is overwritten by a generated one even if it's in the environment.
2020-11-06 13:21:09 +00:00
Dane Everitt
009f9c297d
Revoke JWT JTIs when modifying a subuser's permissions
2020-11-03 21:01:15 -08:00
Dane Everitt
c4df534722
Handle reconnect events for websocket errors
2020-11-03 20:33:05 -08:00
Dane Everitt
910a2d7a23
Back to checks all around
2020-11-03 19:07:52 -08:00
Charles Morgan
b2d2a931a9
Add missing descriptions for permissions
2020-11-03 16:11:59 -05:00
Dane Everitt
fb03c411ad
Get EULA hook modal into working order and start server when accepted
2020-11-02 21:06:47 -08:00
Dane Everitt
aba7df3afa
Basic concept for the EULA feature to demo how this will all work
2020-11-02 20:52:41 -08:00
Dane Everitt
505a9a6cbd
Update MC eggs to enable EULA feature flag
2020-11-02 20:24:24 -08:00
Dane Everitt
95d605c1e3
Fix validation schema
2020-11-02 20:24:11 -08:00
Dane Everitt
7618f306bd
Support functionality for per-egg features
2020-11-02 20:20:36 -08:00
Dane Everitt
7ec614ed2c
Reset modal spinner state when dismissed; closes #2647
2020-11-02 20:03:28 -08:00
Dane Everitt
027c705733
Correctly overlay spinner over all modal elements
2020-11-02 20:03:02 -08:00
Dane Everitt
b482632af4
Remove unnecessary calls to Wings to add/remove mounts
2020-11-02 19:58:14 -08:00
Dane Everitt
ebd81e9d1d
Properly pass along build information to Wings; closes #2552
2020-11-02 19:58:03 -08:00
Charles Morgan
274ed6c232
Update ServerDetailsBlock.tsx
2020-11-02 02:32:38 -05:00
Charles Morgan
40eee1220c
Update ServerDetailsBlock.tsx
2020-11-02 02:31:57 -05:00
Charles Morgan
c75a621c52
Only show allocation if user has permission
...
prevents just a blank scetion in the details box if a sub user dosn't have the permission of `allocation.read`
Also fixes the server router where it was set to `allocations` and not `allocation` making it not showup period even if the sub user had the correct permissions.
2020-11-02 00:49:07 -05:00
Charles Morgan
6d909a4a97
Add admin area link to view config
2020-11-02 00:14:02 -05:00
Dane Everitt
964a1436ce
Code cleanup for signed URL generation endpoint
2020-11-01 14:46:01 -08:00
Dane Everitt
6eff9d6211
Merge pull request #2634 from pterodactyl/issue/2599
...
Switch to s3 multipart uploads for backups
2020-11-01 14:34:03 -08:00
Matthew Penner
6af848ccea
Tweaks to BackupRemoteUploadController.php
2020-11-01 15:27:43 -07:00
Matthew Penner
63ac81586d
Tweaks to BackupRemoteUploadController.php
2020-11-01 15:27:43 -07:00
Matthew Penner
85af073438
Switch to s3 multipart uploads for backups
2020-11-01 15:27:43 -07:00
Dane Everitt
23d2352a9b
Don't ever return per_page as a string here...
2020-11-01 14:27:14 -08:00
Dane Everitt
4082503190
Show next schedule run time
2020-11-01 14:07:31 -08:00
Dane Everitt
b946b20193
Avoid pass-by-reference issues in config parsing leading to duplicated responses; ref #2511
2020-11-01 13:07:00 -08:00
Dane Everitt
63f8f53367
Fix server pagination when using search queries; closes #2593
2020-11-01 12:28:14 -08:00
Dane Everitt
48cde2e007
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop
2020-11-01 12:25:04 -08:00
Dane Everitt
61f501abc9
Fix file parser failing if multiple configuration values are present on same line; closes #2604
2020-11-01 12:25:02 -08:00
Dane Everitt
0132b51642
Merge pull request #2637 from AreYouRlyScared/fix2434
...
Fixes for PR#2434
2020-11-01 11:45:31 -08:00
Dane Everitt
8c8feffcb7
Encode all parts of the URI individually, closes #2620
2020-11-01 11:44:47 -08:00
Charles Morgan
6ac5741d8a
Update app.php
2020-11-01 03:19:28 -05:00
Charles Morgan
f029b7239e
re-remove console limiting options
2020-11-01 03:16:30 -05:00
Charles Morgan
fc0f8ee48e
Update ServerDetailsBlock.tsx
2020-11-01 02:55:29 -05:00
Charles Morgan
e80b125543
Add network info
...
Adds network info to the server details section, Also copied to clipboard when clicked.
Closes https://github.com/pterodactyl/panel/issues/2585
2020-11-01 02:50:35 -05:00
Dane Everitt
9ff691bfde
Merge pull request #2554 from AreYouRlyScared/subusers
...
Duplicate save/invite button at top
2020-10-31 22:30:52 -07:00
Dane Everitt
fda50bb6e1
Merge pull request #2434 from pressstartearly/develop
...
Added Autoallocation Button
2020-10-31 22:30:16 -07:00
Dane Everitt
49c29aae47
Logic fixes
2020-10-31 22:30:03 -07:00
Dane Everitt
6cb21fb920
Add test coverage for allocation auto-assignment service
2020-10-31 22:17:32 -07:00
Dane Everitt
d493685518
Add test coverage for allocation assignment endpoint
2020-10-31 21:57:27 -07:00
Dane Everitt
b2be067f38
Support deleting an allocation for a server
2020-10-31 21:22:44 -07:00
Dane Everitt
365f5e0806
server_id is irrelevant at this stage
2020-10-31 14:59:06 -07:00
Dane Everitt
c6bd7ff661
Improve logic handle auto-allocation of ports for a server
2020-10-31 14:58:15 -07:00
