Dane Everitt
6e5c365018
Use the client API to load servers on the listing page
2018-05-28 13:23:40 -07:00
Dane Everitt
ad69193ac0
Add JWT to login forms
2018-05-28 12:48:42 -07:00
Jakob Schrettenbrunner
89f47c6dbb
mocked server page and better navigation and overall layout
2018-05-28 00:37:03 +02:00
Dane Everitt
6f2fcabf22
Add very basic server search and dynamic rendering functionality
2018-05-26 23:17:02 -07:00
Dane Everitt
9d8830a2d7
Get initial mockup of new server list up
2018-05-26 17:20:36 -07:00
stanjg
60e1ffa564
Added a test for the controller and cleaned up the controller
2018-05-27 00:16:13 +02:00
Dane Everitt
f09eb8eec9
Double encoding happens by default now
2018-05-26 12:22:02 -07:00
Dane Everitt
cf90f56777
Merge branch 'develop' into feature/vuejs-auth
2018-05-26 12:17:14 -07:00
stanjg
7a81c61ad8
Wording changes and fix of major fail last commit
2018-05-26 21:02:47 +02:00
stanjg
86e7085396
Cleaned up the controller and prepared for tests
2018-05-26 20:58:49 +02:00
Dane Everitt
e648e50d90
Write some example tests for @stanjg
2018-05-26 11:00:28 -07:00
Dane Everitt
e3bbd85f3f
Merge branch 'develop' into pr/1129
2018-05-26 10:34:29 -07:00
Dane Everitt
0e1b4661ce
Don't allow access to manage page if server failed installing
2018-05-23 22:23:26 -07:00
Dane Everitt
6967b9ba12
Fix exception thrown due to lack of pre-validation on the model.
...
closes #1158
2018-05-20 17:11:52 -07:00
Dane Everitt
fae5acf99f
Fix bug when loading server owner dropdown
...
closes #1137
2018-05-20 17:00:50 -07:00
Dane Everitt
b4e510fbe3
Fixes before release
2018-05-20 16:49:54 -07:00
Dane Everitt
7e2e5fd7c1
Merge branch 'develop' into feature/upgrade-laravel-to-5.6
2018-05-20 16:30:42 -07:00
Dane Everitt
00df0b66a6
Merge pull request #1148 from pterodactyl/feature/doc-block-improvements
...
@throws docblock improvements
2018-05-20 16:25:59 -07:00
Dane Everitt
002efddc96
Merge pull request #1146 from pterodactyl/feature/windows-pathinfo-support
...
Add support for Windows, replace all backslashes with forwardslashes
2018-05-20 16:24:58 -07:00
Dane Everitt
457e461f45
Merge pull request #1144 from pterodactyl/feature/spelling
...
Spellchecked the whole application
2018-05-20 16:24:09 -07:00
Lance Pioch
6a4443b751
Fix the styling
2018-05-13 17:41:01 -04:00
Lance Pioch
02379b657d
Replace the log writer class with the new one
2018-05-13 16:40:31 -04:00
Lance Pioch
b232055676
Fix style change
2018-05-13 12:43:59 -04:00
Lance Pioch
71257c67bf
Add more throwing
2018-05-13 12:42:22 -04:00
Lance Pioch
3bc2397795
Library doesn't exist anymore
2018-05-13 12:42:16 -04:00
Lance Pioch
f82b419d47
Update php doc blocks
2018-05-13 12:42:11 -04:00
Lance Pioch
8bf030793f
Replace loggin contract
2018-05-13 12:25:34 -04:00
Lance Pioch
9cbada17b2
Merge branch 'feature/cron-job-fix' into feature/upgrade-laravel-to-5.6
2018-05-13 11:59:51 -04:00
Lance Pioch
53829399de
Make sure this trust proxies is also changed
2018-05-13 11:59:25 -04:00
Lance Pioch
f42f211e65
Add support for Windows, replace all back slashes with forward slashes
2018-05-13 11:39:44 -04:00
Lance Pioch
e2dc0638d9
Fix app/ spelling errors
2018-05-13 11:12:41 -04:00
Lance Pioch
ba96829d13
Fix cron jobs by removing the extra unusable argument
2018-05-13 00:42:25 -04:00
Xander Smeets
5f6ee45f44
Fixed typo ( #1134 )
2018-05-06 11:22:30 -07:00
stanjg
095d85bb60
Added the server as argument, and improved the bug fix
2018-05-06 17:59:11 +02:00
stanjg
06a67bb4bb
Cleaned up some duplicate code
2018-05-05 10:39:20 +02:00
stanjg
28a97fea54
Polished it up
2018-05-04 22:48:43 +02:00
stanjg
93a7d11c28
Made a base
2018-05-04 18:45:37 +02:00
stanjg
86c8ecdcdf
Added the actual logic
2018-05-04 15:02:51 +02:00
stanjg
17a72d0895
StyleCI fixes
2018-05-04 14:05:42 +02:00
stanjg
9ae25538c3
Made it so users can switch languages themselves
2018-05-04 13:08:41 +02:00
stanjg
9a06647435
Added support for user specific languages
2018-05-04 12:56:30 +02:00
Dane Everitt
4fad244073
Show correct auth error.
2018-04-08 16:16:04 -05:00
Dane Everitt
b6e94d9a1e
Code cleanup
2018-04-08 16:00:52 -05:00
Dane Everitt
6d970a4cc3
Finalize login page!
2018-04-08 15:46:32 -05:00
Lance Pioch
88fd83d413
Remove unused imports ( #1102 )
2018-04-08 15:37:27 -05:00
Lance Pioch
ceff5acb85
Public is just the boolean ( #1101 )
2018-04-08 15:36:40 -05:00
Dane Everitt
d63624f607
Working login form with password reset functionality.
2018-04-08 15:18:13 -05:00
Dane Everitt
c3e462ab2f
Cleanup login/reset functionality, address security issue with 2FA pathways
2018-04-07 16:17:51 -05:00
Dane Everitt
4f3c668420
Refactor auth controllers to be cleaner and easier to maintain
2018-04-07 12:35:15 -05:00
Dane Everitt
324b989a29
Get a working rough copy of the login page
2018-04-01 17:46:16 -05:00
Dane Everitt
791cbaa5ce
Get things into a somewhat working state on the login form
2018-03-31 15:52:11 -05:00
Dane Everitt
8d704ae5c8
Inital commit with gulp and base asset setup
2018-03-27 00:44:14 -05:00
Dane Everitt
68f0811273
Merge branch 'feature/api-integration-testing' into develop
2018-03-26 19:55:28 -05:00
Stan
f1a76ec7fd
Add description field to nodes ( #1065 )
2018-03-26 13:57:24 -05:00
Stan
56478d81da
Added cast for 'public' field ( #1085 )
...
The missing cast was resulting in the API to send a 0 or 1 instead of true or false for the public field
2018-03-26 13:56:58 -05:00
Dane Everitt
565c5ddc52
Add integration tests for nests
2018-03-25 17:41:36 -05:00
Dane Everitt
bde4d4187f
Merge branch 'develop' into feature/api-integration-testing
2018-03-21 22:25:16 -05:00
Dane Everitt
b96c2d16ee
Added validation to variable validation rules to validate that the validation rules are valid
...
closes #988
2018-03-17 15:09:09 -05:00
Dane Everitt
3e2ac981a9
Add API endpoint for getting server resource utilization, closes #900
...
This endpoint is throttled to 15 requests per minute to avoid destroying the daemon since clients can use it.
2018-03-17 14:01:53 -05:00
Dane Everitt
21cd0688e0
Added giant warning message if you attempt to change an encryption key once one has been set.
2018-03-10 15:18:24 -06:00
Dane Everitt
f8e98e9c9e
Add ability to change server name, closes #563
2018-03-10 14:44:21 -06:00
Dane Everitt
e55d3c1a9a
Add check on SFTP page to make sure the permission is assigned before showing
2018-03-10 14:26:00 -06:00
Dane Everitt
abd2a42471
Fix data integrity exception thrown when attempting to store updated server egg variables
2018-03-10 13:55:24 -06:00
Dane Everitt
40c74ae1e7
Add validation to prevent invalid ports, closes #1034
2018-03-10 13:10:40 -06:00
Dane Everitt
e5c59c4984
Change exception handling for display exception
2018-03-10 13:02:41 -06:00
Dane Everitt
ef371a508d
Change check on debugbar to use debug not environment
2018-03-10 12:03:23 -06:00
Dane Everitt
dfb002fb33
Change config value for daemon
2018-03-08 23:35:36 -06:00
Dane Everitt
5839034e8f
Fix egg copy from, closes #995
2018-03-06 23:07:00 -06:00
Dane Everitt
4964d294f6
Throw 504 where necessary
2018-03-06 22:17:01 -06:00
Dane Everitt
ac9f83a8fe
Fix test to run with new bootstrapping
2018-03-04 22:42:33 -06:00
Dane Everitt
e8ea218f20
Add integration test for remaining application api user endpoints
2018-03-04 22:35:57 -06:00
Dane Everitt
bbbab4bf81
Handle error codes from custom rules better
2018-03-04 22:21:23 -06:00
Dane Everitt
e2aa01c9cc
First go at integration tests
2018-03-04 16:30:16 -06:00
Dane Everitt
36837df0a6
Use beginning of UUID for server uuidShort
2018-03-03 22:20:53 -06:00
Dane Everitt
85e75a2808
Fix bulk key revocation
2018-03-03 21:53:07 -06:00
Dane Everitt
d7efb4c4a2
Fix inability to revoke admin tokens from daemon
2018-03-03 21:45:10 -06:00
Dane Everitt
a4f03f5d02
Handle missing daemon keys better and fix subuser missing key errors
2018-03-03 21:31:44 -06:00
Dane Everitt
6d217869e0
Don't load daemon key on server models automatically.
2018-03-03 18:09:49 -06:00
Dane Everitt
a31334c0c5
Fix SQl queries being executed unnecessarily when listing servers
2018-03-03 18:00:23 -06:00
Dane Everitt
c739f292e4
paginate databases when viewing a host
2018-03-03 17:52:35 -06:00
Dane Everitt
dff7e8f734
Fix server creation in UI and API
2018-03-02 23:11:30 -06:00
Dane Everitt
0135f7ee8e
Add test for new command
2018-03-02 21:26:42 -06:00
Dane Everitt
021710aa1c
Add bulk power management via CLI
2018-03-02 20:58:58 -06:00
Dane Everitt
c6137db529
Fix build limit management in Admin CP
2018-03-02 19:49:09 -06:00
Dane Everitt
e39353a18d
Add tests for new service
2018-03-02 19:37:21 -06:00
Dane Everitt
bcb69603ad
Add support for user management of databases
2018-03-02 19:03:55 -06:00
Dane Everitt
07893effa3
Add initial go at user created databases for servers, still needs cleaning
2018-03-01 21:27:37 -06:00
Dane Everitt
87b96bdfc8
Add core logic to allow for limited databases and allocations
2018-03-01 20:08:27 -06:00
Dane Everitt
5f6c153537
Validate resource existence before validating data sent
2018-03-01 20:00:14 -06:00
Dane Everitt
070239abcf
Fix inability to edit certain environment vars and start line, closes #1008
2018-03-01 19:26:11 -06:00
Dane Everitt
85bdbdce14
Better handling of file download requests
2018-03-01 19:19:19 -06:00
Dane Everitt
838b9a9093
Add support for filesystem caching, closes #993
2018-03-01 18:46:59 -06:00
Dane Everitt
ab2973c4d1
Add pack transformer support
2018-03-01 18:43:39 -06:00
Dane Everitt
0a39a9b6bf
Don't require an environment variable to be present if none are required anyways, closes #1007
2018-03-01 18:35:53 -06:00
Dane Everitt
8f72571895
Fix IP access middleware
2018-02-28 23:39:59 -06:00
Dane Everitt
9b93629f45
Add UI for client API keys
2018-02-28 23:30:39 -06:00
Dane Everitt
2017e640b6
Add client API
2018-02-28 22:51:04 -06:00
Dane Everitt
4e12c289ed
Add command sending
2018-02-27 22:09:34 -06:00
Dane Everitt
cef3e4ced4
Add base routes for managing servers as a client
2018-02-27 21:28:43 -06:00
Dane Everitt
9a32b9fd03
Merge branch 'develop' into feature/client-api
2018-02-27 21:04:18 -06:00
Dane Everitt
23e07689a7
Handle 404 errors in API bindings correctly to avoid explosing that a resource exists before validating a key
2018-02-27 21:04:04 -06:00
Dane Everitt
d4e331c20a
Merge branch 'develop' into feature/client-api
2018-02-27 19:49:06 -06:00
Dane Everitt
a765e0dbb6
closes #991
2018-02-27 19:43:47 -06:00
Dane Everitt
4cfb8941d5
Fix broken users table in database causing validation errors.
2018-02-25 16:08:01 -06:00
Dane Everitt
e28973bcae
Move everything around as needed to get things setup for the client API
2018-02-25 15:30:56 -06:00
Dane Everitt
8daf97021a
Add ability to modify external id for a server
2018-02-25 14:45:16 -06:00
Dane Everitt
6a4b5e04e2
Fix broken external_id handling when creating servers
2018-02-25 14:43:40 -06:00
Dane Everitt
bdbed7706d
Set much higher throttle limits by default
2018-02-24 16:00:53 -06:00
Dane Everitt
5c4200dc0c
Make external_id fillable
2018-02-24 14:47:53 -06:00
Dane Everitt
fb1b2406b5
Add API endpoint to get a server by external ID
2018-02-24 14:09:09 -06:00
Dane Everitt
a1e704d3a7
Add back server sidebar list
2018-02-24 13:58:48 -06:00
Dane Everitt
5b6d3b8325
Slightly more clear errors
2018-02-24 12:27:41 -06:00
Dane Everitt
baeffef24b
Fix bad permissions check on server API route
2018-02-24 12:15:21 -06:00
Dane Everitt
807521b97c
Fix schedules with no names being uneditable
2018-02-24 12:04:14 -06:00
Dane Everitt
633bba6d6e
Add support for external_id on servers, closes #975
2018-02-24 11:57:12 -06:00
Dane Everitt
f655188c58
Fix searching servers
2018-02-24 11:48:24 -06:00
Dane Everitt
be6b398e2d
add support for egg variables, closes #974
2018-02-24 11:17:21 -06:00
Dane Everitt
620c624e6f
Fix exception thrown when accessing /nests/:id/eggs/:id API endpoint
2018-02-24 11:11:57 -06:00
Dane Everitt
e7e50bc45d
Add a few new internal configs to the node config
2018-02-18 20:39:43 -06:00
Dane Everitt
0341dbdfad
Add very basic cache busting
2018-02-18 15:15:53 -06:00
Dane Everitt
1eb76c4457
Log more information for PDOExceptions while also keeping passwords out.
2018-02-18 14:31:40 -06:00
Dane Everitt
4b9f025e98
Fix exception when trying to edit a host, ref #957
2018-02-18 14:10:12 -06:00
Dane Everitt
541b9ec7f5
Fix database name using d#_ rather than s#_, ref #957
2018-02-18 13:46:42 -06:00
Dane Everitt
3fb02a4b3c
Fix FQDN failing validation in database host UI, ref #957
2018-02-18 13:43:54 -06:00
Dane Everitt
c61c2bc5fd
Fix User model validation behavior, closes #950
2018-02-18 13:29:28 -06:00
Dane Everitt
50809cad36
Fix exception when no 2FA token is entered when enabling or disabling
2018-02-18 13:15:10 -06:00
Dane Everitt
e9680fc29c
Fix for StyleCI
2018-02-17 16:21:37 -06:00
ShadowKitten
d8be167a9c
Add support for allowing subusers to access SFTP. ( #918 )
2018-02-17 16:10:44 -06:00
Dane Everitt
f61a5fa0cb
Use left join, not inner here
2018-02-17 15:52:41 -06:00
Dane Everitt
7562e501af
Fix an auto deployment bug causing a node to be ignored if it had no servers already attached to it
...
closes #919
2018-02-17 15:51:28 -06:00
Dane Everitt
d86c35d80f
Prevent duplicate allocations for servers
2018-02-17 13:53:38 -06:00
Dane Everitt
241f7d0125
Fix some data integrity issues
2018-02-17 13:37:53 -06:00
Dane Everitt
d52f8d9215
Fix behavior of validation when creating egg variables
2018-02-17 13:09:54 -06:00
Dane Everitt
303b64ced1
Fix improperly named mailgun environment variable, closes #942
2018-02-17 13:00:11 -06:00
Dane Everitt
8e1aa15dba
Fixes a bug that would cause non-editable variables on the front-end to throw a validation error
2018-02-15 20:58:51 -06:00
Dane Everitt
e2cdb3b4b1
Add test cases for services
2018-02-11 17:32:45 -06:00
Dane Everitt
3ecab82358
Fix exception when empty default value is passed for an egg variable, closes #934
2018-02-11 16:47:50 -06:00
Dane Everitt
bf537922a3
Fix username validation and auto-generation, closes #927
2018-02-11 16:39:50 -06:00
Dane Everitt
cfb7415e2a
Fix data integrity exception, closes #922
2018-02-10 14:01:49 -06:00
Dane Everitt
db29b04c39
Fix improper allocation id validation on API
2018-02-07 22:50:22 -06:00
Dane Everitt
a9c1946319
Add support for finding a user by external ID.
2018-02-07 21:56:11 -06:00
Dane Everitt
2e693067b8
Add search to API endpoints
2018-02-07 21:33:44 -06:00
Dane Everitt
dd54c5abb1
Fix user password handling in Admin CP
2018-02-07 21:13:40 -06:00
Dane Everitt
2ec76d283b
Fix bad API behavior
2018-02-04 15:38:38 -06:00
Dane Everitt
d4d9eda57a
Add schedule edit support
2018-02-04 13:51:24 -06:00
Dane Everitt
f42bc8a031
Cleanup exception reporting, stop logging PDO exception stacks.
...
PDOException stacks include the MySQL password for the connection attempt and many people do not realize this when providing logs.
2018-02-04 13:31:39 -06:00
Dane Everitt
ff8b5fc5a3
Fix exception when modifying existing DB host, closes #910
2018-02-04 12:59:14 -06:00
Dane Everitt
de1d9502c1
fix error when resetting daemon secret, closes #915
2018-02-04 12:55:50 -06:00
Dane Everitt
0b00895261
fix saving of egg variable values, closes #905
2018-02-03 12:36:57 -06:00
Dane Everitt
d9355b93b4
Fix exception when adjusting mail settings, closes #907
2018-02-03 12:28:39 -06:00
Dane Everitt
48c933fa0f
fix exception when deleting allocations, closes #908
2018-02-03 12:22:10 -06:00
Dane Everitt
ffa09d81e2
Pass strings for deletion of user sessions, closes #906
2018-02-03 12:18:18 -06:00
Dane Everitt
7a19019980
Fix suspension/installed handling for servers
...
closes Pterodactyl/Panel#891
2018-01-30 22:40:21 -06:00
Dane Everitt
c599112021
Finalize server management API
2018-01-30 20:36:59 -06:00
Dane Everitt
1be7805481
Add line?
2018-01-28 17:14:34 -06:00
Dane Everitt
5ed164e13e
Implement server creation though the API.
...
Also implements auto-deployment to specific locations and ports.
2018-01-28 17:14:14 -06:00
Dane Everitt
97ee95b4da
Fix some error handling
2018-01-27 13:26:43 -06:00
Dane Everitt
8afced3410
Add nests & eggs
...
Cleanup middleware handling and parameters on controllers...
2018-01-27 12:38:56 -06:00
Dane Everitt
de07b3cc7f
Add server database management support to API.
2018-01-25 22:34:53 -06:00
Dane Everitt
2bd691efad
Add database list endpoint, add more resource name magic
2018-01-25 21:26:06 -06:00
Dane Everitt
407120a854
Merge branch 'develop' into feature/api-v1
2018-01-21 17:06:31 -06:00
Dane Everitt
655d2485b5
Fix error causing inability to save variables.
2018-01-21 17:02:25 -06:00
Dane Everitt
aca0819bcd
Add server build management to API
2018-01-21 16:02:03 -06:00
Dane Everitt
d3dba3fcf9
Fix bug when modifying server descriptions
2018-01-21 14:45:20 -06:00
Dane Everitt
faaf27632c
Fix behavior on automatic resource name setter
2018-01-21 14:37:57 -06:00
Dane Everitt
8dcab927e5
Merge branch 'develop' into feature/api-v1
2018-01-21 14:31:32 -06:00
Dane Everitt
c369151397
Allow editing symlinked files
2018-01-21 14:24:59 -06:00
Dane Everitt
c69f48ad83
Fix filemanager file edit bug, closes #867
2018-01-21 12:31:41 -06:00
Dane Everitt
2212f28351
Don't break the page if no variable rules are provided.
2018-01-21 11:58:59 -06:00
Dane Everitt
62fd299fa2
Fix some egregious search and replace action...
2018-01-21 11:38:16 -06:00
Dane Everitt
17f6f3eeb6
Add server details modification endpoint to API.
2018-01-20 16:03:23 -06:00
Dane Everitt
3e327b8b0e
Use more logical route binding to not reveal resources on the API unless authenticated.
2018-01-20 15:33:04 -06:00
Dane Everitt
17544481b5
More server management via the API
2018-01-20 13:48:02 -06:00
Dane Everitt
3724559468
Forgotten changes
2018-01-19 21:48:26 -06:00
Dane Everitt
a497a3d153
Make server listing and single server view API endpoints work
2018-01-19 21:47:06 -06:00
Dane Everitt
74bdbea6a4
Sneaky files
2018-01-19 20:01:56 -06:00
Dane Everitt
0e7f8cedf0
Reorganize API files
2018-01-19 19:58:57 -06:00
Dane Everitt
bdadec002c
Push updates to server transformer
2018-01-18 21:56:12 -06:00
Dane Everitt
c3b9738364
Implement application API Keys
2018-01-18 21:36:15 -06:00
Dane Everitt
f9fc3f4370
Update interface to begin change to seperate account API keys and application keys
...
Main difference is permissions, cleaner UI for normal users, and account keys use permissions assigned to servers and subusers while application keys use R/W ACLs stored in the key table.
2018-01-14 13:30:55 -06:00
Dane Everitt
14f9e1ad43
More permission removal cleanup
2018-01-14 12:11:04 -06:00
Dane Everitt
ad3a954256
Rename APIKey to ApiKey
2018-01-14 12:06:15 -06:00
Dane Everitt
7aa540b895
Remove api permissions table
2018-01-14 12:05:18 -06:00
Dane Everitt
e0fb7fa30c
Fix failing ApiKeyCreationService test
2018-01-13 16:23:43 -06:00
Dane Everitt
e3df0738da
Change the way API keys are stored and validated; clarify API namespacing
...
Previously, a single key was used to access the API, this has not changed in terms of what the user sees. However, API keys now use an identifier and token internally. The identifier is the first 16 characters of the key, and the token is the remaining 32. The token is stored encrypted at rest in the database and the identifier is used by the API middleware to grab that record and make a timing attack safe comparison.
2018-01-13 16:06:19 -06:00
Dane Everitt
11c4f3f6f2
Finish putting permissions on the API
2018-01-13 14:08:19 -06:00
Dane Everitt
d644a53951
Update users & locations to use new permissions format
2018-01-12 20:39:15 -06:00
Dane Everitt
a31e5875dc
First round of changes to API to support simpler permissions.
2018-01-11 22:49:46 -06:00
Dane Everitt
0e24c669c4
docblock
2018-01-11 20:08:49 -06:00
Dane Everitt
cf21fd5a4b
More API updates, better support for node config edits
2018-01-10 23:19:03 -06:00
Dane Everitt
800e2df6b2
Merge branch 'develop' into feature/api-v1
...
# Conflicts:
# app/Contracts/Repository/RepositoryInterface.php
# app/Repositories/Eloquent/EloquentRepository.php
# app/Services/Nodes/NodeUpdateService.php
# tests/Unit/Services/Nodes/NodeUpdateServiceTest.php
2018-01-10 20:55:22 -06:00
Dane Everitt
bd238c7555
No more OOME checkboxes
2018-01-08 23:03:14 -06:00
Dane Everitt
02e4c1424e
Select less data from servers
2018-01-08 22:23:12 -06:00
Dane Everitt
0acc260b81
Change order that allocations are loaded in on the allocation listing
2018-01-08 22:21:35 -06:00
Dane Everitt
22511c8e24
Fix allocation behavior, closes #712
2018-01-08 22:12:19 -06:00
Dane Everitt
036bea2b94
Update schedule process to allow toggling/triggering via UI
2018-01-08 21:43:10 -06:00
Dane Everitt
94809b953c
Fix server setting bug
2018-01-06 15:20:47 -06:00
Dane Everitt
4b5ee920bd
Fix logic mistake with findOrFail
2018-01-06 13:08:20 -06:00
Dane Everitt
adcab5969a
Fix server description nullablility
2018-01-06 12:58:30 -06:00
Dane Everitt
a75b15cd8d
closes #852
2018-01-06 12:53:17 -06:00
Dane Everitt
59f8ae4b50
Too much grep
2018-01-06 12:49:32 -06:00
Dane Everitt
b3d7c6f1af
Fix search weighting for servers
2018-01-05 18:49:00 -06:00
Dane Everitt
21a78f465b
Fix node return being too strict
2018-01-05 18:44:20 -06:00
Dane Everitt
d2afc29a80
Refactor how repositories for the daemon work.
2018-01-05 18:27:47 -06:00
Dane Everitt
5f9fe4a69b
Update calls to missing function
2018-01-05 16:33:50 -06:00
Dane Everitt
60eb60013c
Update repository base code to be cleaner and make use of PHP 7 features
2018-01-04 22:49:50 -06:00
Dane Everitt
f32cee3ae5
Add location control through API
2018-01-03 21:14:53 -06:00
Dane Everitt
15289b76a7
Finish first round of User/Node API additions
...
Will still need some tweaking and improvements to allow everything to be used.
2018-01-01 15:11:44 -06:00
Dane Everitt
d21f70c04b
Merge branch 'develop' into feature/api-v1
2018-01-01 13:33:06 -06:00
Dane Everitt
0ec5a4e08c
Fix some file management bugs, closes #621
2018-01-01 13:21:10 -06:00
Dane Everitt
ffc8d4875f
Fix unability to store '-1' in the database properly
2018-01-01 12:32:33 -06:00
Dane Everitt
958c29cfbf
Fix empty server descriptions throwing SQL errors, closes #842
2018-01-01 12:23:45 -06:00
Dane Everitt
4457634127
Fix user creation to use UUIDs correctly
...
Also updates the notification send method to be cleaner and more maintainable
2018-01-01 12:13:08 -06:00
Dane Everitt
8a38a8af4a
Update file manager to account for new API error responses
2017-12-31 10:39:07 -06:00
Dane Everitt
46d7ba7585
Merge branch 'develop' into feature/api-v1
2017-12-31 10:32:28 -06:00
Dane Everitt
6b2d7b6488
If folder does not exist, reload the file manager index
2017-12-31 10:30:19 -06:00
Dane Everitt
8ce0863559
Fix settings service provider to actually work when no migrations have been run.
2017-12-30 20:53:34 -06:00
Dane Everitt
5efee34378
close #840
2017-12-30 20:25:04 -06:00
Dane Everitt
10e2e6e379
close #841
2017-12-30 19:56:42 -06:00
Dane Everitt
e4feee6932
Fix setting of environment variable
2017-12-30 16:34:22 -06:00
Dane Everitt
1b9b92ac62
Cleanup settings use in panel.
2017-12-30 16:33:00 -06:00
Lance Pioch
59b50ca75e
Allow the environment setup without loading the database (settings provider) first ( #823 )
2017-12-30 17:16:49 -05:00
Dane Everitt
54b6fb5ebd
More work on the API utilizing Laravel 5.5 exception rendering
...
Also corrects API format to maintain JSONAPI spec
2017-12-17 14:57:05 -06:00
Dane Everitt
b9d67459b2
Update to Laravel 5.5 ( #814 )
2017-12-17 13:07:38 -06:00
Dane Everitt
f30f4b45ba
Merge branch 'feature/laravel-55-update' into feature/api-v1
2017-12-16 17:19:35 -06:00
Dane Everitt
631b5eb1b2
Fix form requests
2017-12-16 13:44:30 -06:00
Dane Everitt
c6cece51ee
Fix the surprisingly few broken tests
2017-12-16 13:35:32 -06:00
Dane Everitt
3c48947f9d
Fix known issues from the upgrade guide
2017-12-16 13:15:09 -06:00
Dane Everitt
0dcf2aaed6
Inital upgrade to 5.5
...
This simply updates dependencies and gets all of the providers and config files updated based on what the laravel/laravel currently ships with
2017-12-16 12:20:09 -06:00
Dane Everitt
4a65dff940
Implement admin user management API routes
2017-12-16 11:31:18 -06:00
Dane Everitt
a1da8a3c9d
Merge branch 'develop' into feature/api-v1
2017-12-14 21:12:17 -06:00
Dane Everitt
f9df463d32
Implement a better management interface for Settings ( #809 )
2017-12-14 21:05:26 -06:00
Anand Capur
e085b8e109
enable php 7.2 in travis and fix repository ( #797 )
...
This was really amusing to watch @arcdigital attempt to do.
2017-12-05 09:26:29 -06:00
Dane Everitt
285485d7b0
Change how API keys are validated ( #771 )
2017-12-03 14:29:14 -06:00
Dane Everitt
975597b4d0
Implement changes to administrative user revocation, closes #733
2017-12-03 14:00:47 -06:00
Dane Everitt
20beb2f280
Fix error causing tasks to be un-deletable.
...
closes #786
2017-12-01 20:10:06 -06:00
Dane Everitt
fb7d8a9626
Merge branch 'feature/api-key-changes' into feature/api-v1
2017-11-26 13:27:39 -06:00
Dane Everitt
a10db204ab
Misc fixes
2017-11-26 13:26:38 -06:00
Dane Everitt
4c57b5e8ee
Merge branch 'develop' into feature/api-v1
2017-11-26 13:22:25 -06:00
Dane Everitt
80ddd5b659
Merge branch 'develop' into feature/api-key-changes
2017-11-26 13:20:25 -06:00
Dane Everitt
47f2ca0673
Fix incorrect CPU usage display for limited servers, closes #758
2017-11-26 13:17:40 -06:00
Dane Everitt
a710bdf457
Make a todo a todid, closes #774
2017-11-25 13:45:47 -06:00
Dane Everitt
20c1c74116
Fix issues with validation in admin CP for server variables, closes #780
2017-11-25 13:15:46 -06:00
Dane Everitt
0bb44a4972
Fix server startup dropdown for egg being incorrect, fixes #778
2017-11-25 12:27:08 -06:00
Dane Everitt
166c43c259
Apply fixes from StyleCI
...
[ci skip] [skip ci]
2017-11-23 21:08:43 +00:00
Dane Everitt
d4758efef8
Implement fix for console spam when using invalid environment variable values
2017-11-23 15:08:35 -06:00
Dane Everitt
698c121e11
First round of API additions
2017-11-19 16:30:00 -06:00
Dane Everitt
bf9708fe4f
Add permissions checking to API middleware list
2017-11-19 15:23:37 -06:00
Dane Everitt
49379bd115
Pop some tests for new middleware in there.
2017-11-19 14:34:55 -06:00
Dane Everitt
45a153427e
Add new API middleware
2017-11-19 14:05:13 -06:00
Dane Everitt
47e14ccaae
API key UI changes and backend storage of the keys
2017-11-19 13:32:17 -06:00
Dane Everitt
3e8514b966
Merge pull request #768 from Pterodactyl/feature/auth-controller-cleanup
...
Push updates to login page, mostly UI enhancements.
2017-11-18 18:00:01 -05:00
Dane Everitt
24d0ae18fd
Include permission for subusers to access the server console.
2017-11-18 16:50:58 -06:00
Dane Everitt
897338bfa7
Show socketio error messages
2017-11-18 16:50:08 -06:00
Dane Everitt
6f52f4a614
Push updates to login page, mostly UI enhancements.
2017-11-18 15:09:58 -06:00
Dane Everitt
c7c2c1a45e
Implement changes to 2FA system ( #761 )
2017-11-18 13:35:33 -05:00
Dane Everitt
a0c96f2c15
Merge pull request #763 from Pterodactyl/feature/unused-imports
...
Remove unused imports
2017-11-18 13:35:00 -05:00
Lance Pioch
c7f01d66d5
Fix namespace
2017-11-17 20:02:09 -05:00
Lance Pioch
c2408a28d8
Remove unused imports
2017-11-17 18:08:10 -05:00
Lance Pioch
f94e4c15b0
Replace magic numbers with constants ( #754 )
...
* Replace magic numbers with constants
2017-11-12 18:16:54 -05:00
Dane Everitt
26eeffd764
Fix bug preventing changing of the server startup on first save attempt.
2017-11-11 15:07:01 -06:00
Dane Everitt
81869bd5f2
Fix allocation alias setting
2017-11-10 21:47:43 -06:00
Dane Everitt
1740b8dfb5
Revert change to node allocation selection query
2017-11-10 21:42:24 -06:00
Dane Everitt
4dfc7a0053
Cleanup pagination CSS and UI
2017-11-10 21:41:39 -06:00
Dane Everitt
b1f6058e31
Fix daemon key provider service
...
Handles missing keys if user is an admin or the server owner. Step in the right direction for #733 where all users have their own keys now. Still need to address admin status revocation in order to fully address that issue.
2017-11-05 16:07:50 -06:00
Dane Everitt
88562b5cd6
Fix inability to create a server
2017-11-05 15:36:37 -06:00
Dane Everitt
5170bcf41a
Remove server creation notification temporarily
2017-11-05 14:24:54 -06:00
Dane Everitt
ac2abd89e6
Fix bug listing allocations when making a new server.
...
closes #730
2017-11-05 14:12:53 -06:00
Dane Everitt
2f42396317
Fix bug with permissions including more than one dash, closes #727
2017-11-05 13:42:57 -06:00
Dane Everitt
30ab6ed692
Update PHPCS and other dependencies.
2017-11-05 13:33:42 -06:00
Dane Everitt
82b7bff7f7
Apply fixes from StyleCI ( #735 )
...
[ci skip] [skip ci]
2017-11-05 13:59:51 -05:00
Dane Everitt
a4cf06ba77
Fix missing HASHIDS_SALT setting in app setup command, closes #724
2017-11-05 12:58:25 -06:00
Dane Everitt
4898d4f9d2
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop
2017-11-05 12:43:03 -06:00
Dane Everitt
22ba6cbecb
Fix subuser URL redirect, closes #723
2017-11-05 12:42:58 -06:00
Dane Everitt
aa86fe83e8
Apply fixes from StyleCI ( #732 )
...
[ci skip] [skip ci]
2017-11-05 13:40:12 -05:00
Dane Everitt
6409fffdad
Implement fix to allow root admins to view all servers.
...
closes #722
2017-11-05 12:38:39 -06:00
Dane Everitt
799b8a7f5f
database command fixes
2017-11-04 17:41:52 -05:00
Dane Everitt
ecdd133b75
Fix daemon auth
2017-11-04 17:16:44 -05:00
Dane Everitt
1438a50ae9
More fixes
2017-11-04 16:46:18 -05:00
Dane Everitt
bda42b673f
Unset redis password if empty.
2017-11-04 16:40:48 -05:00
Dane Everitt
69cd330eb8
Fix setup command issues
2017-11-04 16:27:15 -05:00
Dane Everitt
6a2cb72ede
Fix debug bar getting loaded in production
2017-11-04 14:21:30 -05:00
Dane Everitt
f5b20e38c4
Fix failing tests due to way nest creation worked
2017-11-04 13:01:54 -05:00
Dane Everitt
233cbfda09
Merge branch 'develop' into feature/fixed-seeders
2017-11-04 12:50:32 -05:00
Dane Everitt
71b90650de
Fix failing test suite
2017-11-04 12:49:05 -05:00
Dane Everitt
f8c89f8331
Add support for seeding nests and eggs
2017-11-03 23:07:18 -05:00
Dane Everitt
7882250baf
Add more middleware tests
2017-11-03 18:16:49 -05:00
Dane Everitt
133fd17da6
Fix subuser unit tests
2017-11-03 16:52:18 -05:00
Dane Everitt
54228e8124
Fix multiple controller unit test failures
2017-11-03 16:43:28 -05:00
Dane Everitt
7b3393aff9
More middleware tests
2017-11-01 20:45:43 -05:00
Dane Everitt
d844a36167
Begin adding unit tests for middleware
2017-10-29 21:40:34 -05:00
Dane Everitt
e9aecfe6db
Shorten imports
2017-10-29 15:57:43 -05:00
Dane Everitt
79decafdc8
Update all the middlewares
2017-10-29 12:37:25 -05:00
Dane Everitt
e0d03513e4
Cleanup frontend controllers and middleware
2017-10-27 21:42:53 -05:00
Dane Everitt
fa62a0982e
Refactor startup modification and environment variable services
...
Better setup, more flexibility, more tests.
2017-10-26 23:49:54 -05:00
Dane Everitt
508ff8cfb3
Finish front-end server modification changes.
...
Everything is back to the point that it was before this massive code overhaul began. FInal steps before merging this into develop will be some unit tests.
2017-10-25 22:33:28 -05:00
Dane Everitt
058e490ec4
Implement Panel changes to support internal SFTP subsystem on Daemon ( #703 )
2017-10-25 00:35:25 -04:00
Dane Everitt
57db949a9c
Tests a'hoy
2017-10-23 21:10:32 -05:00
Dane Everitt
532025a348
Fix tests
2017-10-23 20:12:15 -05:00
Dane Everitt
d50ea18598
Add support for changing the server default allocation as a normal user
2017-10-20 21:32:57 -05:00
Dane Everitt
97dc0519d6
Add database management back to front-end and begin some refactoring
...
Here we go again boys...
2017-10-18 22:32:19 -05:00
Dane Everitt
5e712f0bb1
Merge branch 'develop' into feature/service-export-import
2017-10-17 21:31:35 -05:00
arioioio
b3fdf64435
Redirect to users list on user deletion ( #680 )
...
closes #675
2017-10-09 15:13:52 -05:00
Dane Everitt
b602ea1f66
Trying to make tests not fail for random reasons?
2017-10-09 00:02:33 -05:00
Dane Everitt
e01d7497f5
Add ability to update an Egg by re-uploading a file.
2017-10-08 23:50:52 -05:00
Dane Everitt
e2cb789b2b
Stop Dane from submitting invalid arrays and breaking the entire application...
2017-10-08 23:44:27 -05:00
Dane Everitt
aaf96669d4
Misc fixes
2017-10-08 21:36:22 -05:00
Dane Everitt
864513c44b
Fix failing test suite
2017-10-08 20:57:59 -05:00
Dane Everitt
6e02e9491a
Egg tests updated
2017-10-08 15:29:46 -05:00
Dane Everitt
787346525b
Update a batch of failing tests
2017-10-07 23:29:08 -05:00
Anand Capur
b08d6a4b9d
Make config caching less aggressive
2017-10-07 20:00:44 -07:00
Dane Everitt
c19c423568
More fixes
2017-10-07 18:08:19 -05:00
Dane Everitt
17642bffe7
More code updates
2017-10-07 17:21:41 -05:00
Dane Everitt
cc297eea09
Misc changes
2017-10-07 16:19:07 -05:00
Dane Everitt
6b8464ea3a
Nest & Egg management working through the ACP now.
2017-10-07 16:16:51 -05:00
Dane Everitt
df87ea0867
This breaks literally the entire panel.
2017-10-06 23:57:53 -05:00
Dane Everitt
344c1a9885
First push before 🥚
2017-10-06 21:22:32 -05:00
Dane Everitt
675e780946
Fix test failures
2017-10-06 00:16:22 -05:00
Dane Everitt
38075c6b9f
Update panel to send correct service option configuration to the daemon.
2017-10-05 23:09:43 -05:00
Dane Everitt
29cfae86b1
Merge branch 'develop' into feature/service-export-import
2017-10-05 00:17:17 -05:00
Dane Everitt
fbd5c25ed0
Finalize tests
2017-10-04 23:52:25 -05:00
Dane Everitt
609bf32843
Add test for service option exporter
2017-10-04 23:42:04 -05:00
Dane Everitt
3e689cf212
Please fix failing tests? ✋
2017-10-03 23:57:13 -05:00
Dane Everitt
8952043600
Fix some test runner issues
2017-10-03 23:36:39 -05:00
Dane Everitt
6269a08db7
Finalize service option import/export
2017-10-03 23:31:04 -05:00
Dane Everitt
d608c313c3
Complete the service option export configuration
2017-10-03 20:18:27 -05:00
TrixterTheTux
6482f79088
Grant execute privilege ( #655 )
...
closes #654
2017-10-03 12:53:28 -10:00
Dane Everitt
0d739257a9
First pass at XML exporter for services
2017-10-03 00:01:04 -05:00
Dane Everitt
ae671e6b19
Begin updating UI
2017-10-02 22:51:13 -05:00
Dane Everitt
92ca84a37f
Remove unused controller
2017-10-02 20:03:47 -05:00
Dane Everitt
b1834307d5
Update demon routes to use /v1/
2017-09-30 21:00:24 -05:00
Dane Everitt
15d38ce823
Add ability to switch between new and existing daemon
2017-09-30 19:23:44 -05:00
Dane Everitt
281337943f
Fix SQL call
2017-09-30 19:04:36 -05:00
Dane Everitt
1216f950e2
Prevent deletion of options that have children attached to them.
...
closes #562
2017-09-30 12:54:09 -05:00
Dane Everitt
d5bf8734ef
Add unit tests for RunTaskJob.
2017-09-30 12:40:07 -05:00
Dane Everitt
238ce435d6
interface_exists does not work how I expected, switch to is_subclass_of
2017-09-30 12:06:16 -05:00
Dane Everitt
048784607d
Minor bug fixes
2017-09-30 11:45:24 -05:00
Dane Everitt
28d838eccd
Fix subuser auth token again
2017-09-29 21:57:36 -05:00
Dane Everitt
0e0a8d4347
Fix 404 when trying to view a server
2017-09-29 21:54:00 -05:00
Dane Everitt
fb7ef2d775
test post please ignore
2017-09-26 22:54:34 -05:00
Dane Everitt
774c9680a3
More test suite coverage
2017-09-26 22:16:26 -05:00
Dane Everitt
6efecaeb69
Merge branch 'develop' into feature/api-daemon-changes
2017-09-25 21:55:02 -05:00
Dane Everitt
6915ecb4f1
Literally fix everything. 💯
2017-09-25 21:53:44 -05:00
Dane Everitt
fb8a26f141
Merge branch 'develop' into feature/api-daemon-changes
2017-09-25 21:46:44 -05:00
Dane Everitt
e56f4cdd33
Update license headers on files.
2017-09-25 21:43:01 -05:00
Dane Everitt
75fd3d985c
Merge pull request #643 from lancepioch/class-string
...
Use class string instead of magic string
2017-09-25 16:03:36 -10:00
Lance Pioch
09d958249d
Add togglable 2FA user requirements ( #635 )
2017-09-25 15:58:16 -10:00
Lance Pioch
6ffa4e62e0
Merge branch 'develop' into class-string
2017-09-25 11:10:50 -04:00
Dane Everitt
55ae9138f6
Fix failing builds due to SQL changes
2017-09-24 22:34:30 -05:00
Dane Everitt
dd456a4c9c
Fix all currently failing tests
2017-09-24 22:28:16 -05:00
Lance Pioch
02cabf73a0
Use class string instead of magic string
2017-09-24 22:59:34 -04:00
Dane Everitt
3aa6e4e74e
Merge pull request #638 from lancepioch/middleware-changes
...
Use proper route name instead of using class in route file
2017-09-24 16:14:22 -10:00
Dane Everitt
7d1c233c49
Final adjustments to Daemon <-> Panel communication change
2017-09-24 21:12:30 -05:00
Lance Pioch
8197b1733f
Fix some more routes
2017-09-24 21:27:57 -04:00
Dane Everitt
8e2b77dc1e
Final touches to new key-rotation service
2017-09-24 12:34:00 -05:00
Dane Everitt
0f0c319ec0
Allow exceptions to throw their own error codes from within.
...
Temp work-around for tons of logic until upgrade to 5.5 is done.
2017-09-24 12:32:29 -05:00
Dane Everitt
c43ab595cf
Fix error in console scheduler spamming logs.
2017-09-24 12:31:31 -05:00
Dane Everitt
906a699ee2
Begin implementation of new daemon authentication scheme
2017-09-23 20:45:25 -05:00
Dane Everitt
8722571037
Finish console command cleanup
2017-09-22 21:19:57 -05:00
Dane Everitt
68cc71ecfe
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop
2017-09-22 00:30:11 -05:00
Dane Everitt
6e5b0b8027
Update command unit tests to use helper functions
2017-09-22 00:30:09 -05:00
Lance Pioch
0f07d6bcf5
The nodes create page will redirect you to the locations page if you don't have a location, the concept is the same here ( #640 )
2017-09-21 13:05:55 -10:00
Lance Pioch
0c21d401e3
Combine Locations and Nodes on Create Server page ( #641 )
2017-09-21 13:03:29 -10:00
Lance Pioch
8bfebf5b32
Use proper route name instead of using class in route file
2017-09-21 13:48:57 -04:00
Lance Pioch
afa328577f
Add missing cli descriptions ( #632 )
2017-09-20 19:16:01 -10:00
Dane Everitt
8df5d5beaf
Remove unnecessary test and cleanup rebuild command
2017-09-19 22:15:52 -05:00
Dane Everitt
ccda2b63fa
Add more CLI commands for panel management
2017-09-19 22:10:14 -05:00
Dane Everitt
c5f2dfd6f6
Begin adding schedule processing jobs.
2017-09-16 23:10:00 -05:00
Dane Everitt
c0d7e02481
Add a better panel info output command
2017-09-16 19:47:14 -05:00
Dane Everitt
4de326ad02
Add command to disable 2FA for a user account.
2017-09-16 18:50:12 -05:00
Dane Everitt
c46f2cb274
More command tests
2017-09-16 17:39:52 -05:00
Dane Everitt
12ba96bd42
Add unit tests for user management commands
2017-09-16 01:45:56 -05:00
Dane Everitt
22459a877a
Add test for make user command and add admin option
2017-09-15 23:46:22 -05:00
Dane Everitt
542d1f8db7
Add new location and user management via CLI
2017-09-15 22:13:33 -05:00
Dane Everitt
a498bbc7d5
Move location service to match other services
2017-09-15 00:16:03 -05:00
Dane Everitt
4e5398fb6b
Add tests for schedule stuff
2017-09-14 23:02:31 -05:00
Dane Everitt
a8c4d6afdb
Update random ID method to use str_random and not random_bytes
...
The use of random_bytes in combination with bin2hex was producing a lot of duplicate keys when tested in batches of 10k (anywhere from 2 to 6). The use of str_random yielded no duplicates even at scales of 100k keys that were 8 characters.
2017-09-13 23:07:02 -05:00
Dane Everitt
7f76684453
More schedule changes
2017-09-13 21:46:43 -05:00
Dane Everitt
2ac90b50f2
Begin refactoring Tasks to be apart of the Scheduler system
2017-09-12 23:45:19 -05:00
Dane Everitt
1873c1e9b9
Who doesn't love a good mystery novel. 🍞
...
Fix ide helper stubs?
2017-09-11 00:27:43 -05:00
Dane Everitt
f9bf8603b2
wot ❓
2017-09-11 00:15:48 -05:00
Dane Everitt
131159c246
Fix some forgotten logic checks temporarily
2017-09-10 23:57:18 -05:00
Dane Everitt
97d87ff57c
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop
2017-09-10 23:45:33 -05:00
Dane Everitt
7b454980ab
Fix version display in node list
2017-09-10 23:45:27 -05:00
Dane Everitt
6c6a3c9458
Merge pull request #615 from Pterodactyl/feature/customized-theme
...
Feature/customized theme
2017-09-10 18:14:15 -10:00
Dane Everitt
bab28dbc85
Initial implementation of new task mgmt system 👮
2017-09-09 23:55:21 -05:00
Dane Everitt
f157c06d04
Fix PHPCS to order by length not alphabetical
2017-09-04 19:07:00 -05:00
Jakob Schrettenbrunner
2ac1e08f47
Merge branch 'develop' into feature/customized-theme
2017-09-05 01:47:43 +02:00
Dane Everitt
dc310ffdea
Finish subuser controller
2017-09-04 18:12:13 -05:00
Jakob Schrettenbrunner
73d153cacb
fix pterodactyl:user command
2017-09-04 23:50:21 +02:00
Dane Everitt
7222754580
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop
2017-09-04 14:34:40 -05:00
Dane Everitt
b12f6f1156
Tests for RemoteRequestController
2017-09-04 14:34:38 -05:00
Dane Everitt
8f14ee989d
Apply fixes from StyleCI
2017-09-03 21:41:03 +00:00
Dane Everitt
54554465f2
Add more front-end controllers, language file cleanup
2017-09-03 16:32:52 -05:00
Dane Everitt
4532811fcd
Improved middleware, console page now using new setup
2017-09-02 21:35:33 -05:00
Dane Everitt
37508a370d
Finish up unit tests for base controllers
2017-09-02 18:56:15 -05:00
Dane Everitt
4203cdcb77
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop
2017-09-02 00:21:17 -05:00
Dane Everitt
53d1182645
Add unit tests for API key controller
2017-09-02 00:21:15 -05:00
Georgiy Slobodenyuk
7feb8bcedc
Fix typo
2017-09-01 23:39:10 -04:00
Dane Everitt
30660cfac2
Apply fixes from StyleCI ( #609 )
2017-08-30 21:14:20 -05:00
