Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4125 commits 62 branches 124 tags 29 MiB
Commit graph

1814 commits

Author SHA1 Message Date
Dane Everitt
638ea2e815
Support creating/updating docker images on eggs 2020-12-13 10:13:32 -08:00
Dane Everitt
78c4ac80bc
Basic implemention of multiple selectable images for an egg 
The admin side of this is quite ugly when creating/editing a server, but I'm not putting effort into that right now with React Admin soon™
 2020-12-13 09:53:17 -08:00
Charles Morgan
9d6f4e00d7 Properly copy database-password 2020-12-09 00:42:56 -05:00
Dane Everitt
3e65a2d055
Pass one at unfucking the stupid file encoding issues 2020-12-08 21:24:17 -08:00
Dane Everitt
24417ac516
Slightly less obtuse way of handling this little checkbox 2020-12-08 20:34:31 -08:00
Dane Everitt
a66ee9673b
Merge pull request #2797 from pterodactyl/matthewpi/breadcrumb-patch-1 
Add mb-4 to File Manager Breadcrumb when editing a file
 2020-12-08 19:56:05 -08:00
Dane Everitt
f31a1288af
Don't show file mode in the manager 2020-12-08 19:54:32 -08:00
Matthew Penner
2fafd4fbbf Add mb-4 to File Manager Breadcrumb when editing a file 2020-12-06 20:42:05 -07:00
Dane Everitt
fcff9085b8
Merge pull request #2781 from pterodactyl/matthewpi/server-details-patch-1 
Show installing status instead of offline when a server is installing
 2020-12-06 15:27:03 -08:00
Dane Everitt
d22456d9ca
Block API access when 2FA is required on account; closes #2791 2020-12-06 13:56:14 -08:00
Matthew Penner
ac8b7fec28
Merge branch 'develop' into matthewpi/server-details-patch-1 2020-12-06 13:30:56 -07:00
Dane Everitt
af360d49dd
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2020-12-06 12:01:43 -08:00
Dane Everitt
a8d9eccf9c
Support pagination of server backups, closes #2787 2020-12-06 12:01:42 -08:00
Dane Everitt
a06f8e0d21
Merge pull request #2763 from AreYouRlyScared/hidedelifown 
Hide delete button on own subuser if for the subuser looking at the page
 2020-12-06 11:30:40 -08:00
Dane Everitt
7b9a8c8441
Merge pull request #2768 from pterodactyl/feature/chmod-files 
Chmod Files from the File Manager
 2020-12-06 11:30:33 -08:00
Dane Everitt
0ca13fc9d0
Merge branch 'develop' into hidedelifown 2020-12-06 11:27:00 -08:00
Dane Everitt
e2be4e5ebf
Merge branch 'develop' into feature/chmod-files 2020-12-06 11:26:58 -08:00
Dane Everitt
616a6b8ea3
Merge branch 'develop' into matthewpi/file-manager-patch-1 2020-12-06 11:26:56 -08:00
Dane Everitt
8241ea5f98
Merge branch 'develop' into matthewpi/server-details-patch-1 2020-12-06 11:26:54 -08:00
Omar Kamel
ce0e9b7ded
Correct JDBC typo 
from `JBDC CONNECTION STRING` > `JDBC CONNECTION STRING`
 2020-12-06 13:17:47 -05:00
Matthew Penner
f9a1bc6c9b Show installing status instead of offline when a server is installing 2020-12-04 09:48:47 -07:00
Matthew Penner
ed5613e207 Show file mode on file listing, add ability to change file mode 2020-12-04 09:24:06 -07:00
Matthew Penner
de1f7ea906 Move file manager buttons beside the breadcrumb, other tweaks 2020-12-04 09:23:17 -07:00
danny6167
b97ebcbe39
Allow 0 in first octet of database client IP address Fixes #2779 
Allow user to enter database connection IP address that contains a a 0 in the first octet. Fixes #2779
 2020-12-04 19:18:08 +08:00
Charles Morgan
76d671aa8a Update UserRow.tsx 2020-11-29 19:35:16 -05:00
Charles Morgan
947fdf72ed Update UserRow.tsx 2020-11-29 18:13:20 -05:00
Dane Everitt
2b5d5c9e55
Merge pull request #2718 from j00005h/patch-1 
Update index.blade.php
 2020-11-29 13:43:14 -08:00
Dane Everitt
9a1c9f3e46
Merge pull request #2691 from GravityCube/develop 
Backup rotation for schedules.
 2020-11-29 13:42:48 -08:00
Dane Everitt
e54612d533
Merge pull request #2731 from AreYouRlyScared/fix2710 
Rename duplicated input id
 2020-11-29 11:07:23 -08:00
Dane Everitt
b9e72c0034
Merge pull request #2739 from m0uka/develop 
Add clickable URLs in console
 2020-11-29 11:01:01 -08:00
Charles Morgan
ec99859590 Don't show delete button if its own user 
Don't show the delete button if a sub-user is looking at sub-users, as they cannot delete themselves.
 2020-11-28 14:48:35 -05:00
booky10
76958cc6e7
Changed "Mojang" to "Minecraft" in EulaModalFeature.tsx 2020-11-26 17:59:29 +01:00
m0uka
2a54ac4f52 Add clickable URLs in console 2020-11-24 22:04:44 +01:00
Charles Morgan
bdad2621b2 Rename duplicated input id 
Renames the field id so its unique and chrome dosen't complain <3

Closes https://github.com/pterodactyl/panel/issues/2710
 2020-11-22 03:06:18 -05:00
Josh Miles
4b1f320004
Update index.blade.php 2020-11-16 13:51:02 +00:00
GravityCube
5eebc7221d
Merge branch 'develop' into develop 2020-11-13 01:11:18 -03:00
Gonzalo Chavez
7b8322e9c9 Backup Rotation - Minor changes 2020-11-11 10:52:28 -03:00
Dane Everitt
0c8b7101c3
Merge pull request #2682 from AreYouRlyScared/minorfixes 
Update database page layout to be more consistent with other pages, fixes text visibility issues
 2020-11-10 20:15:26 -08:00
Dane Everitt
a07e6bd36f
Merge pull request #2687 from occanowey/fix/file_manager_404 
Dont add trailing slash to file manager rows
 2020-11-10 10:46:20 -08:00
Gonzalo Chavez
1eaf486eaa Backup Rotation - Minor Changes 2020-11-09 21:14:47 -03:00
Gonzalo Chavez
1f01c653f1 Backup rotation for schedules. 2020-11-09 20:35:57 -03:00
Griffin T
f65cdd2dfb Dont add trailing slash to file manager row NavLink 2020-11-09 16:22:52 +08:00
Griffin T
76e3bcaa42 Keep cursor at the end of line when going through history 2020-11-09 15:34:56 +08:00
Charles Morgan
4a234af7a3
Minor changes 
Changes CopyOnClick to allow any.
Allows database information to be copied on click.
Changes layouts on database/backups to match the network tab.
Changes text to lighten it one level from 400 to 300 for easier visibility.
Moves database api endpoints to their own folder for some organization.
 2020-11-08 21:09:22 -05:00
Dane Everitt
085fa8dcb5
Update CopyOnClick.tsx 2020-11-08 17:13:55 -08:00
Dane Everitt
842652a6b8
Update CopyOnClick.tsx 2020-11-08 17:13:33 -08:00
Dane Everitt
6795bae335
Fix server state not being updated correctly when adding/removing allocation; closes #2680 2020-11-08 17:12:07 -08:00
Dane Everitt
74e90e087f
Fix allocation permission 2020-11-08 17:07:26 -08:00
Dane Everitt
7cf6b4bcfe
Only load GA when valid key is provided; closes #2678 2020-11-08 13:18:15 -08:00
Dane Everitt
de943eac4a
Merge pull request #2636 from AreYouRlyScared/copynetwork 
Network info added to details + ClickToCopy
 2020-11-08 11:48:45 -08:00
Dane Everitt
74b1776c00
Merge pull request #2646 from AreYouRlyScared/#2608 
Add admin area link to view config
 2020-11-08 11:48:22 -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
625fd92130
Fix URKL encoding hellscape; closes #2664 closes #2663 2020-11-06 20:47:03 -08:00
Dane Everitt
c4df534722
Handle reconnect events for websocket errors 2020-11-03 20:33:05 -08: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
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
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
Matthew Penner
85af073438 Switch to s3 multipart uploads for backups 2020-11-01 15:27:43 -07:00
Dane Everitt
4082503190
Show next schedule run time 2020-11-01 14:07:31 -08:00
Dane Everitt
63f8f53367
Fix server pagination when using search queries; closes #2593 2020-11-01 12:28:14 -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
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
49c29aae47
Logic fixes 2020-10-31 22:30:03 -07:00
Dane Everitt
b2be067f38
Support deleting an allocation for a server 2020-10-31 21:22:44 -07:00
Dane Everitt
c6bd7ff661
Improve logic handle auto-allocation of ports for a server 2020-10-31 14:58:15 -07:00
Charles Morgan
aad3019747
Merge branch 'develop' into subusers 2020-10-31 17:32:10 -04:00
Charles Morgan
0f09dfed92
Update EditSubuserModal.tsx 2020-10-31 17:29:41 -04:00
Dane Everitt
7638ffccde
Merge branch 'develop' into pr/2434 2020-10-31 14:12:13 -07:00
Dane Everitt
31ad238e8b
Thanks for that highlight phpstorm... 2020-10-31 14:11:53 -07:00
Dane Everitt
db7e4e749f
UI cleanup for add allocation button 2020-10-31 14:10:53 -07:00
Dane Everitt
abb043c1cc
Merge branch 'develop' into pr/2434 2020-10-31 13:55:56 -07:00
Dane Everitt
283cb08e33
Remove unused 2020-10-31 13:55:45 -07:00
Dane Everitt
665a4dd8a4
Merge branch 'develop' into develop 2020-10-31 13:47:12 -07:00
Dane Everitt
7fd49dd823
Merge pull request #2610 from occanowey/feature/command_history 
Add console command history.
 2020-10-31 13:46:24 -07:00
Dane Everitt
e157b8baf2
Merge pull request #2627 from pterodactyl/matthewpi/admin-patch-1 
Tweaks to admin area
 2020-10-31 13:45:26 -07:00
Dane Everitt
c757abfdc2
Merge pull request #2633 from AreYouRlyScared/changes 
Network view changes
 2020-10-31 13:45:09 -07:00
Charles Morgan
394cd815d2
Network tab changes 
Allows address feild to be copied to the clipboard when clicked
If alias is used changes it to hostname instead of ip address ( might just make it say address as that would cover both? )
Fixed overflow for allocations with a long alias
 2020-10-31 16:16:41 -04:00
Dane Everitt
8eaa44411f
Update ServerRow.tsx 2020-10-31 12:09:59 -07:00
Dane Everitt
87a8238c56
Correctly render suspended server in dashboard listing; closes #2613 2020-10-31 12:07:20 -07:00
Matthew Penner
d9ad4af6a7 admin: update description on Mounts index view 2020-10-30 11:02:55 -06:00
Matthew Penner
48013eddcc admin: update transfer server box on manage tab 2020-10-30 11:02:29 -06:00
Griffin T
6e4261b3a7 Limit per server command history to 32. 2020-10-27 18:19:33 +08:00
Griffin T
a4d3e7db1b Add console command history. 2020-10-26 20:30:30 +08:00
Dane Everitt
0a6cf5ba25
lint; skip ci 2020-10-25 17:31:24 -07:00
Dane Everitt
092c942764
Fix server owner filtering; improve searching for servers; closes #2581 2020-10-25 17:29:57 -07:00
Dane Everitt
39dddba1d6
Refactor subuser modal and fix to be less of a code monstrosity; closes #2583 2020-10-25 15:47:50 -07:00
Dane Everitt
23872b844a
Fix unnecessary object structuring 2020-10-22 21:33:06 -07:00
Dane Everitt
7ed3c25d61
Merge pull request #2545 from wardpieters/develop 
fix: duplicate 2FA error messages
 2020-10-22 21:31:37 -07:00
Dane Everitt
903b5795db
Avoid breaking the entire UI when naughty characters are present in the file name or directory; closes #2575 2020-10-22 21:18:46 -07:00
Charles Morgan
e0bc9ac50f
Duplicate save/invite button at top 
Adds the Save / Invite User button at the top also
 2020-10-18 04:31:54 -04:00
Ward Pieters
1c4ee31491
fix: duplicate enable 2FA error messages 2020-10-18 00:46:46 +02:00
Ward Pieters
f5dfe86eff
fix: duplicate disable 2FA error messages 2020-10-18 00:42:52 +02:00
Ward Pieters
f859d37b25
fix: duplicate 2FA error messages (https://github.com/pterodactyl/panel/issues/2455) 2020-10-18 00:02:46 +02:00
Dane Everitt
cbbe5b6fa9
Reset error messages between login screens; ref #2455 2020-10-17 14:45:33 -07:00
Dane Everitt
527ba1adc4
Fix recaptcha not resetting on login fail; closes #2397 2020-10-17 14:30:54 -07:00
Dane Everitt
35f24e7f22
Fix theme stuff 2020-10-17 13:54:34 -07:00
Dane Everitt
0260efc966
Fix some PHPstorm nightmare 2020-10-17 13:47:21 -07:00
Dane Everitt
820d8f7560
Better logic for using theme values 2020-10-17 13:43:22 -07:00
Matthew Penner
ebe3375897 Fix white highlight hiding console text (fixes #2541) 2020-10-17 14:25:44 -06:00
Dane Everitt
f54151e0f6
Merge pull request #2525 from Spirit55555/patch-2 
Remove target="blank" from /admin link
 2020-10-17 10:38:14 -07:00
Nobody
10548c9d8f Update message and update query 2020-10-17 18:26:34 +01:00
Anders G. Jørgensen
7ad26fc456
Remove target="blank" from /admin link 
This should be changed to make it consistent with the admin panel, where the link back to the user panel does not open in a new tab.
 2020-10-16 15:49:35 +02:00
Dane Everitt
a4abb2543b
lint 2020-10-15 21:28:43 -07:00
Dane Everitt
f52f13600f
Fix text wrap on long server names in search bar 2020-10-15 21:23:31 -07:00
Dane Everitt
f30dab053b
Support much better server querying from frontend 
Search all servers if making a query as an admin, allow searching by a more complex set of data, fix unfocus on search field when loading indicator was rendered
 2020-10-15 21:21:38 -07:00
Dane Everitt
9726a0de46
Autofocus search when opening; closes #2522 2020-10-15 20:09:13 -07:00
Dane Everitt
2685295110
Merge branch 'develop' into xtermstuff 2020-10-15 19:56:09 -07:00
Charles Morgan
8f2e90d1e8
Update Console.tsx 2020-10-15 16:41:11 -04:00
Dane Everitt
e7c64bc60e
Add test coverage for schedule execution 2020-10-14 21:06:27 -07:00
Dane Everitt
c1ee0ac4f8
Add support for executing a scheduled task right now 2020-10-14 20:38:59 -07:00
Dane Everitt
f33d0b1d72
Update schedule view UI 2020-10-14 20:13:36 -07:00
Charles Morgan
28844bf62c
Merge branch 'develop' into xtermstuff 2020-10-14 11:42:01 -04:00
Charles Morgan
807707c07e
Update Console.tsx 2020-10-14 11:38:59 -04:00
Charles Morgan
cdb881efaf
Fix naming 2020-10-14 09:54:06 -04:00
Charles Morgan
c53b14acef
Close search bar on esacpe 
Allows the searchbar to be closed when a user clicks escape, just like in the browser.
 2020-10-14 07:23:02 -04:00
Charles Morgan
471cadda77
Update UsersContainer.tsx 
Closes #2514
 2020-10-14 04:54:17 -04:00
Charles Morgan
9dc0c3e2c3
Upgrade Xterm to v4.9, Add Search 
Changes:
Added ` xterm-addon-search ` v0.7.0
Added ` xterm-addon-search-bar ` v0.2.0
Updated ` webpack ` v4.43.0 -> v4.44.2
Updated ` xterm `  v3.14.4 -> v4.9.0
Updated ` xterm-addon-fit `  v0.1.0 -> v0.7.0
Updated ` xterm-addon-attach ` v0.1.0 -> v0.4.0

With the added packages above, when a user does Ctrl + F a search box will apear within the console for them to search whats in the console.

This was requested in discord to allow the lines in the console to be searchable.
 2020-10-14 02:34:53 -04:00
Caleb
ea778e9345
Merge branch 'develop' into develop 2020-10-13 15:35:38 -04:00
Dane Everitt
6274c451af
COrrectly set the breadcrumbs when using browser back; closes #2485 2020-10-12 21:02:51 -07:00
Dane Everitt
7a0ac1d5c2
Revert "Merge pull request #2482 from AreYouRlyScared/fix-2386" 
This reverts commit a967dbc6fc, reversing
changes made to 289de72aca.
 2020-10-12 20:59:11 -07:00
Charles Morgan
f7fd63dff9
Remove trailing slash if one is present 
Closes https://github.com/pterodactyl/panel/issues/2386
 2020-10-11 18:38:09 -04:00
Dane Everitt
08dcb85e5d
Merge pull request #2480 from AreYouRlyScared/fix-2435 
Remove unused settings from admin side
 2020-10-11 15:24:31 -07:00
Charles Morgan
5c105822b6
Remove unused settings 
Closes https://github.com/pterodactyl/panel/issues/2435
 2020-10-11 18:21:01 -04:00
Dane Everitt
1e08f7d2d2
Merge pull request #2454 from zKoz210/patch-1 
Fixed phantom shadow when opening modal window
 2020-10-11 12:36:49 -07:00
Dane Everitt
2f5e080074
Remove unnecessary break-all 2020-10-11 12:34:48 -07:00
Dane Everitt
c6d6221711
Correctly fix the UI for API keys 2020-10-11 12:29:00 -07:00
Dane Everitt
78a3f933d1
Merge pull request #2476 from AreYouRlyScared/fix 
Fix missing semi, Fixed task row overflow
 2020-10-11 12:07:06 -07:00
Charles Morgan
c8b00f0ccf
Fix missing semi, Fixed task tow overflow 
Was suppsoe to be correct in https://github.com/pterodactyl/panel/pull/2352 but seems to be picky. Should now correctly show a multiline text box and not a long skinny text box when the text overflows.

Also, fixed a missing semicolon. 👍
 2020-10-11 04:35:26 -04:00
Oreo Oreoniv
1e3f3fb053
Fixed incorrect button appearance 2020-10-09 12:15:23 +03:00
LeJeanbono
0b559f8acb Rename CPU Threads for CPU Pinning 2020-10-06 23:09:16 +02:00
Oreo Oreoniv
ec313a7362
Fixed description for API keys 2020-10-05 12:36:03 +03:00
Oreo Oreoniv
62e111657c
Fixed a bug with an incorrect size modal 2020-10-05 11:53:11 +03:00
Oreo Oreoniv
0fa503f923
Fixed phantom shadow when opening modal window 2020-10-05 11:36:47 +03:00
Dane Everitt
57457f0e9c
Oops, also include the server status 2020-10-03 19:37:36 -07:00
Dane Everitt
6b52a36b31
Significantly reduce the number of re-renders on the console page when stats are flowing 2020-10-03 19:36:26 -07:00
Dane Everitt
5fc4444f5a
Refit terminal when screen is resized; closes #2365 2020-10-03 19:21:11 -07:00
Dane Everitt
d1c30607cf
UI updates for server rows to show current status 2020-10-03 16:36:31 -07:00
Dane Everitt
2a42ef5c62
Mobile responsiveness fixes 2020-10-03 16:25:39 -07:00
Dane Everitt
47d59ca20f
Fix mobile UI for allocation rows 2020-10-03 15:48:31 -07:00
Dane Everitt
fb482abb9c
Also cache bust 2020-10-03 11:37:11 -07:00
Stepan Fedotov
62856556b9
Apply security fixes from #2441 to 1.0 2020-10-03 11:34:36 -07:00