Commit graph

3918 commits

Author SHA1 Message Date
Dane Everitt
050fe307f0
Merge pull request #2098 from pterodactyl/fix-2094
Fix Validable class in Models/ServerTransfer
2020-06-09 20:15:33 -07:00
Matthew Penner
0bec5b8581 Merge branch 'develop' into feature/server-mounts 2020-06-06 11:41:18 -06:00
Matthew Penner
3338c49831 Fix Validable class on ServerTransfer.php 2020-06-06 11:37:43 -06:00
Charles Morgan
5e68290267
Apply same logic to databases
Same logic as PR #2088

Shows using x of x databases.
Once limit is reached the create button is removed
2020-06-02 23:40:40 -04:00
Charles Morgan
2c326dcbe7
Fix condition
Fix condition for using message
2020-06-02 23:30:43 -04:00
Charles Morgan
e3ac933591
Add using x of x when limit > 0
Added a using x of x so the end user knows how many they have and are using.
2020-06-02 23:27:10 -04:00
Charles Morgan
48869d2eda
Remove create backup button if limit = 0, display message none can be created
Removes the create button if the limit is 0, just like it does with the database page
Also once limit is reached the create button is removed from view.
2020-06-02 23:14:16 -04:00
Charles Morgan
4d3563b8e1
Merge branch 'develop' into showunlimited 2020-06-02 11:18:00 -05:00
Dane Everitt
0795f8763d
Fix admins being unable to select permissions for subusers; closes #2055 2020-05-31 11:14:31 -07:00
Dane Everitt
1f943d957a
Merge pull request #2071 from Sir3lit/serverviewchanges
Change to BytesToHuman on server view for limits, to match index page. Changes to CPU/Memory Graph
2020-05-28 19:04:19 -07:00
Charles Morgan
3b42f110fb
Show BytestoHuman value, not server limit, change graph
Changes server view to use bytestohuman to show 10 GB like it does on the main index.

Removed animation duration so the graph dosn't look likes it glitching when a new value is pushed, also made it a little more curved.
2020-05-27 00:00:50 -04:00
Dane Everitt
a26f527f44
Merge pull request #2048 from Sir3lit/fixmaxconn
Save maxconnection value to DB
2020-05-25 15:11:27 -07:00
Dane Everitt
fece67ff50
Create SECURITY.md 2020-05-25 15:08:47 -07:00
Dane Everitt
2d8573a363
Merge pull request #2065 from parkervcp/update/forge_egg
update forge egg
2020-05-24 15:40:50 -07:00
Michael Parker
8bef5078de update forge egg
Updates the forge egg to use the json api from forge to get versions instead of the old way of scraping the site and getting invalid jar files.

Also updates to validate download links.

Allows for setting a specific forge version
2020-05-24 12:23:53 -04:00
Charles Morgan
6c60305617
Show Unlimited instead of 0, admin view
Guess i missed this one when i set everything to show unlimited when its 0 / -1.

Shows Unlimited disk space instead of 0 on admin about page.
2020-05-24 00:57:30 -04:00
Matthew Penner
f255399171 Fix StyleCI issues 2020-05-21 15:16:16 -06:00
Matthew Penner
65393914c3 Send mounts when wings fetches server information, fix issue with mount fields not being updated 2020-05-21 15:14:09 -06:00
Matthew Penner
e601b35f2f Fix even more StyleCI issues 2020-05-21 14:27:23 -06:00
Matthew Penner
0eb29dac9c Add mount_server table, fix wrong field type on other many to many tables, add routes for mounting and unmounting mounts on a server, finish server admin mounts page 2020-05-21 14:23:12 -06:00
Matthew Penner
a0900b8b94 Fix StyleCI issues 2020-05-21 13:22:32 -06:00
Matthew Penner
fa902cc074 Add mounts page to server admin view 2020-05-21 13:19:59 -06:00
Matthew Penner
34f718a8b1 Finish mount admin view page, add unique index to migration 2020-05-20 20:50:56 -06:00
Matthew Penner
0db7debb46 Add mount update and deletion services, add MountController@update and MountController@delete 2020-05-20 19:35:30 -06:00
Matthew Penner
77150b2551 Add increment id to mount, add basic mount view page 2020-05-20 19:17:35 -06:00
Matthew Penner
976b669059 Make StyleCI happy 2020-05-20 18:57:30 -06:00
Matthew Penner
a4af8ec977 Add the ability to create mounts 2020-05-20 18:55:59 -06:00
Matthew Penner
a750362e5a Move MountController.php 2020-05-20 18:45:00 -06:00
Matthew Penner
00d1b5861a Properly setup Mount model, add database migration, get mount admin page added 2020-05-20 18:07:56 -06:00
Matthew Penner
59a150148a feature/server-mounts initial commit 2020-05-20 17:29:03 -06:00
Charles Morgan
4ab32498d4
Save request to DB
Fixes #2047
2020-05-19 04:14:36 -04:00
Charles Morgan
917a1e8a87
Update ServerConsole.tsx 2020-05-18 13:33:02 -04:00
Dane Everitt
5dbcddc862
Decode URL fragments correctly before sending to the daemon; ref #2040 ref #2038 2020-05-17 15:07:32 -07:00
Dane Everitt
57f7aa1638
Remove unused routes; closes #2039 2020-05-17 14:20:43 -07:00
Charles Morgan
3df0febd0c
Less Lines = Better
Same logic, just more compact and react like
2020-05-17 00:34:25 -04:00
Daniel Blittschau
826258787b
Fix outdated AdminLTE link in README.md 2020-05-16 16:46:07 -05:00
Charles Morgan
564933fcb1
Show "unlimited" not 0
Shows unlimited for resources if they're set to "0"
Im sure we could also just remove the "of {limit}" part if its unlimited? Dane Advise

Im sure there is a 100x better way of doing this? Dane please advise.
2020-05-16 03:16:06 -04:00
Dane Everitt
6e588b37d3
Merge pull request #2018 from Sir3lit/morecss
CSS Changes
2020-05-12 19:34:23 -07:00
Charles Morgan
46285fefd7
CSS Changes
More CSS Changes....

Server overview page now looks more..... fluid
Boxes have their correct color top colors back, When admin side was changed to dark theme all by the yellow was changed to a single color, this is reverted.
Node overview page uses blue over gray box for total servers.
Lightened the text color on the side bar
Removed delete button for allocations that are assigned.
Changes Node configuration box to not hurt eyes
2020-05-10 18:09:01 -04:00
Dane Everitt
086abb2a55
Actually delete the backup in the DB 2020-05-09 20:01:45 -07:00
Dane Everitt
225ef2917a
Support downloading and deleting S3 backups 2020-05-09 19:43:58 -07:00
Dane Everitt
d4e037db9c
Don't abort deleting a backup if the daemon cannot find it 2020-05-09 19:19:45 -07:00
Dane Everitt
52966ede89
Clean this code up, just use the updated model's FQDN; references #1931 2020-05-09 16:26:37 -07:00
Dane Everitt
33a7762152
Fix connection issues when changing node FQDN; closes #1931 2020-05-09 16:25:22 -07:00
Dane Everitt
86dbb141f4
Make this helper text more correct 2020-05-09 15:45:38 -07:00
Dane Everitt
3b2e2c63c6
Only show relevant configuration; update default path to be what the daemon expects 2020-05-09 15:44:13 -07:00
Dane Everitt
a342df8c13
Merge pull request #2010 from Sir3lit/patch1
Remove timezone from config
2020-05-09 15:40:27 -07:00
Dane Everitt
b94781e40e
Merge pull request #2008 from Sir3lit/emailfix
Fix Subuser welcome email
2020-05-09 14:47:47 -07:00
Dane Everitt
8cb401760f
Merge pull request #2012 from devfrey/develop
Add return type hints and missing test dependencies
2020-05-09 14:19:26 -07:00
devfrey
6ed35ad83c Add missing testing dependencies 2020-05-09 18:09:50 +02:00