Dane Everitt
|
3d224993cd
|
Fix logic for parsing egg data to not explode with nested objects
|
2020-04-11 18:27:47 -07:00 |
|
Michael Parker
|
55c8ddd5f2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-04-11 21:11:34 -04:00 |
|
Michael Parker
|
8fdee3554c
|
update docker stuff
|
2020-04-11 21:11:21 -04:00 |
|
Michael Parker
|
1995c2425e
|
update docker stuff
|
2020-04-11 21:01:42 -04:00 |
|
Dane Everitt
|
1327bbbbe5
|
Fix logic to update a daemon's configuration
|
2020-04-11 16:33:15 -07:00 |
|
Dane Everitt
|
60f6e86b8b
|
Remove all of the old references to unused interfaces outside the test code
|
2020-04-11 15:35:32 -07:00 |
|
Matthew Penner
|
4d833af5f4
|
Fix script paths in layouts
|
2020-04-11 14:49:40 -06:00 |
|
Matthew Penner
|
a7dab69711
|
Persist service variables
|
2020-04-11 14:46:30 -06:00 |
|
Matthew Penner
|
dec6868a55
|
Persist nest_id, egg_id, pack_id
|
2020-04-11 14:14:05 -06:00 |
|
Matthew Penner
|
432e28b6bb
|
Fix all StyleCI errors and probably break everything in the process
|
2020-04-11 14:07:40 -06:00 |
|
Matthew Penner
|
b5e50719ac
|
Remove old Theme::js calls in blade layouts. Persist checkboxes, Server Owner, Node, Default Allocation, and Additional Allocations on servers/new.blade.php
|
2020-04-11 13:56:03 -06:00 |
|
Matthew Penner
|
fb96d9468e
|
Prevent primary allocation from being an additional allocation at the same time when creating a server
|
2020-04-11 12:35:27 -06:00 |
|
Dane Everitt
|
25f18dccdc
|
Merge pull request #1903 from matthewpi/enhancement/wings-improved-server-loading
[Wings] Improved Server Loading
|
2020-04-10 17:37:04 -07:00 |
|
Matthew Penner
|
658a959e5d
|
Fix trailing comma in DaemonAuthenticate.php, change ServerDetailsController.php to use node authentication
|
2020-04-10 17:54:50 -06:00 |
|
Matthew Penner
|
a37e30cd49
|
Merge branch 'develop' into enhancement/wings-improved-server-loading
|
2020-04-10 16:55:22 -06:00 |
|
Dane Everitt
|
c8a78c688f
|
Apply unique key after assigning all of the values
|
2020-04-10 15:54:28 -07:00 |
|
Matthew Penner
|
1564f38d5c
|
Merge branch 'develop' into enhancement/wings-improved-server-loading
|
2020-04-10 16:53:38 -06:00 |
|
Dane Everitt
|
2532a73425
|
Don't throw errors if bad data is sent in the header
|
2020-04-10 15:53:19 -07:00 |
|
Matthew Penner
|
0c12b78772
|
Merge branch 'develop' into enhancement/wings-improved-server-loading
|
2020-04-10 16:29:03 -06:00 |
|
Dane Everitt
|
2b1585a2ba
|
Merge pull request #1905 from matthewpi/issues/1902
Fixes stupid query and issue #1902 🤬
|
2020-04-10 15:25:17 -07:00 |
|
Matthew Penner
|
c9ad4ea811
|
Merge branch 'develop' into issues/1902
|
2020-04-10 16:23:58 -06:00 |
|
Matthew Penner
|
94d46affb8
|
Merge branch 'develop' into enhancement/wings-improved-server-loading
|
2020-04-10 16:23:46 -06:00 |
|
Dane Everitt
|
7557dddf49
|
Store node daemon tokens in an encrypted manner
|
2020-04-10 15:15:38 -07:00 |
|
Dane Everitt
|
2ac82af25a
|
Fix migration to not require beta versions of MariaDB
|
2020-04-10 14:09:57 -07:00 |
|
Dane Everitt
|
568328596a
|
Cleanup migration
|
2020-04-10 14:02:16 -07:00 |
|
Dane Everitt
|
fd8b7182e7
|
Merge migrations
|
2020-04-10 14:01:36 -07:00 |
|
Dane Everitt
|
b72a770ec9
|
Don't execute unnecessary HTTP requests when browing a file directory
|
2020-04-10 13:57:24 -07:00 |
|
Dane Everitt
|
76300209f1
|
Correctly clear the interval for resource use checking
|
2020-04-10 12:49:09 -07:00 |
|
Matthew Penner
|
c46ece0d6b
|
Fix stupid query that makes me want to punch my monitor
|
2020-04-10 13:47:08 -06:00 |
|
Dane Everitt
|
d3a06e1ca8
|
Add progress bar to top of page for nicer loading indicator styles
|
2020-04-10 12:41:08 -07:00 |
|
Matthew Penner
|
87e95f4195
|
Fix StyleCI
|
2020-04-10 13:08:43 -06:00 |
|
Matthew Penner
|
3163517f8d
|
Add linebreak because code style is important
|
2020-04-10 13:06:10 -06:00 |
|
Matthew Penner
|
42fb9fdbd9
|
Add the ability for a node to fetch a list of all servers it has been assigned
|
2020-04-10 13:04:11 -06:00 |
|
Dane Everitt
|
708c15eba8
|
Make database rows use context better
|
2020-04-10 10:56:25 -07:00 |
|
Dane Everitt
|
0ebf842757
|
Clean up most of the schedules code to use server context
|
2020-04-10 10:46:00 -07:00 |
|
Dane Everitt
|
07d19ad326
|
Code cleanup and formatting
|
2020-04-10 10:11:15 -07:00 |
|
Dane Everitt
|
4e2602e1e7
|
Merge pull request #1898 from Sir3lit/fixformatting
New server formatting
|
2020-04-10 09:56:26 -07:00 |
|
Dane Everitt
|
558f7ba6dd
|
Merge pull request #1901 from pterodactyl/feature/auto-deploy
re-enable auto-deploy daemon endpoint
|
2020-04-10 09:54:11 -07:00 |
|
Jakob Schrettenbrunner
|
a1f4baa800
|
re-enable auto-deploy daemon endpoint
|
2020-04-10 17:38:20 +02:00 |
|
Dane Everitt
|
06707fd33a
|
Better throttling of backup generation
|
2020-04-09 22:35:38 -07:00 |
|
Dane Everitt
|
63d8cd4f3f
|
Throttle backups to two per 10 minute interval
|
2020-04-09 22:09:01 -07:00 |
|
Dane Everitt
|
c1a7e4ebe1
|
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop
|
2020-04-09 22:08:16 -07:00 |
|
Dane Everitt
|
9ba6aaebde
|
Move actions into context menu, add support for deleting a backup
|
2020-04-09 22:08:09 -07:00 |
|
AreYouScared
|
7daf6e2e93
|
Uniformity is Key
Updated logical order to match new server page on build and overview page.
|
2020-04-10 00:54:40 -04:00 |
|
AreYouScared
|
411ed41582
|
New server formatting
Fixed auto-sizing for resource mangemnet
Moved them in logical order(CPU->RAM->Disk) with advanced stuff to the right.
|
2020-04-09 23:46:12 -04:00 |
|
Dane Everitt
|
323c3e4689
|
Merge pull request #1893 from pterodactyl/feature/issue-1891
Change to new password and fix #1891
|
2020-04-09 20:16:40 -07:00 |
|
Dane Everitt
|
2da0d8b083
|
Merge pull request #1897 from Sir3lit/fixCR
Fixed Copyright year
|
2020-04-09 20:16:28 -07:00 |
|
AreYouScared
|
27a92d6f45
|
Fixed Copyright year
|
2020-04-09 23:00:59 -04:00 |
|
Lance Pioch
|
53c7ec9126
|
Update UpdatePasswordRequest.php
|
2020-04-08 03:00:03 -04:00 |
|
Lance Pioch
|
78e03cb9b2
|
Update AccountController.php
|
2020-04-08 02:59:38 -04:00 |
|