Commit Graph

149 Commits

Author SHA1 Message Date
Dane Everitt
5c99cae779 Merge branch 'develop' into feature/vuejs 2019-05-01 20:57:49 -07:00
saibotk
7277b6449b Replace 2FA QR Code generation (#1548)
Due to the Google API for generating the 2FA QR code will be shut down on 14.04.2019, this adds the package "pragmarx/google2fa-qrcode" and updates "pragmarx/google2fa" to version 5.x. 
Due to now using BaconQR, Pterodactyl now needs the php-imagick extension to render the images.
2019-04-27 14:18:12 -04:00
Dane Everitt
21ffa08d66 Merge branch 'develop' into feature/vuejs 2018-12-16 14:20:35 -08:00
Dane Everitt
7c73f21b30 Fix Node daemon secret not being reset, closes #1390 2018-12-02 13:40:12 -08:00
Dane Everitt
5ca13839cf Merge branch 'develop' into feature/vue-serverview 2018-09-05 21:34:59 -07:00
Dane Everitt
c6112b4234 Fix tests 2018-09-03 14:59:00 -07:00
Dane Everitt
5bd3f59455 Fix schedules running twice, closes #1288 2018-09-03 14:32:33 -07:00
Dane Everitt
413a22a3d5 Changes to job running to clean up code 2018-09-03 14:04:25 -07:00
Dane Everitt
bcb3f5d5fa Fix handling of times 2018-08-31 21:12:10 -07:00
Dane Everitt
178b8f8ce6 More logical time handling 2018-08-31 21:00:13 -07:00
Dane Everitt
c82f273d85 Fix remaining broken tests 2018-07-04 19:38:23 -07:00
Dane Everitt
d2bc791d74 Fix links sent to users when accounts are created
closes #1093
2018-06-30 18:47:31 -07:00
Sergzy
bad9ae58e8 Fix environment_variables name (#1212) 2018-06-30 13:25:40 -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
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
78b40a8055 Spelling mistakes for tests 2018-05-13 11:12:54 -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
Lance Pioch
88fd83d413 Remove unused imports (#1102) 2018-04-08 15:37:27 -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
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
ac9f83a8fe Fix test to run with new bootstrapping 2018-03-04 22:42:33 -06:00
Dane Everitt
36837df0a6 Use beginning of UUID for server uuidShort 2018-03-03 22:20:53 -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
e39353a18d Add tests for new service 2018-03-02 19:37:21 -06:00
Dane Everitt
a765e0dbb6 closes #991 2018-02-27 19:43:47 -06:00
Dane Everitt
633bba6d6e Add support for external_id on servers, closes #975 2018-02-24 11:57:12 -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
241f7d0125 Fix some data integrity issues 2018-02-17 13:37:53 -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
dd54c5abb1 Fix user password handling in Admin CP 2018-02-07 21:13:40 -06:00
Dane Everitt
e49c739bde Fix failing tests 2018-02-04 15:43:09 -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
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
17f6f3eeb6 Add server details modification endpoint to API. 2018-01-20 16:03:23 -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
e0fb7fa30c Fix failing ApiKeyCreationService test 2018-01-13 16:23:43 -06:00
Dane Everitt
cf21fd5a4b More API updates, better support for node config edits 2018-01-10 23:19:03 -06:00