Commit Graph

4109 Commits

Author SHA1 Message Date
Dane Everitt d79b3a9cd0 Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop v1.1.2 2020-11-14 20:46:49 -08:00
Dane Everitt aaaa05be93 Fix docker build 2020-11-14 20:46:37 -08:00
Dane Everitt 280bbce69f Update docker.yml 2020-11-14 20:45:42 -08:00
Dane Everitt 043dc20427 Update docker.yml 2020-11-14 20:27:11 -08:00
Dane Everitt 509c4e577b Update docker.yml 2020-11-14 20:15:46 -08:00
Dane Everitt 89e10fd7f2 Update CHANGELOG.md [docker skip] 2020-11-14 20:14:16 -08:00
Dane Everitt d18b7abf6c fixes [docker skip] 2020-11-14 20:06:58 -08:00
Dane Everitt d31a228220 properly skip action [docker skip] 2020-11-14 20:04:55 -08:00
Dane Everitt 8065b7d9f5 use GitHub container registry [skip docker] 2020-11-14 20:03:32 -08:00
Dane Everitt 181e4fa282 Update docker.yml 2020-11-14 20:02:07 -08:00
Dane Everitt e84008d19b Merge branch 'dane/docker' into develop 2020-11-14 20:01:25 -08:00
Dane Everitt 4ef04aa604 Update actions 2020-11-14 20:01:02 -08:00
Dane Everitt 9ffb5d2995 Add support for automated docker builds 2020-11-14 19:56:43 -08:00
Dane Everitt 7df3c1d013 Tweaks 2020-11-14 13:58:51 -08:00
Dane Everitt 83707079e8 Fixes for docker compose formatting and missing storage dir 2020-11-14 13:26:43 -08:00
Dane Everitt fe725397eb Code cleanup and improvement 2020-11-14 13:10:11 -08:00
GravityCube 5eebc7221d Merge branch 'develop' into develop 2020-11-13 01:11:18 -03:00
Gonzalo Chavez ebc8d40db8 Backup Rotation - Variable name changed 2020-11-11 16:03:57 -03:00
Gonzalo Chavez e6a4a17922 Backup Rotation - Comment change 2020-11-11 16:02:39 -03:00
Gonzalo Chavez 7b8322e9c9 Backup Rotation - Minor changes 2020-11-11 10:52:28 -03:00
Dane Everitt 3b4a096ddb Merge pull request #2684 from mattmalec/develop
Fix API 500 error
2020-11-10 20:16:32 -08: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 2f2d105a4f Fix test cases 2020-11-10 20:13:55 -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
Dane Everitt 9707da86e3 Merge pull request #2686 from occanowey/feature/command_history
Keep cursor at the end of the line when going through command history
2020-11-10 10:46:05 -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
Matt Malec df64026449 Update AuthenticateIPAccess.php
Fix a 500 error when processing a request with an IP filter
2020-11-08 21:57:22 -05: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 v1.1.1 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 2d19c12a5a Update CHANGELOG.md v1.1.0 2020-11-08 15:29:23 -08:00
Dane Everitt e0a087f077 Attempt to save a transaction a few times when creating a server; closes #2674 2020-11-08 13:19:52 -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
Dane Everitt b602473436 Merge pull request #2657 from AreYouRlyScared/permissions
Add missing descriptions for permissions
2020-11-08 11:47:54 -08:00
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