9 commits

Author	SHA1	Message	Date
Dane Everitt	71eae1eb68	Update TwoFactorSetupService.php	2019-05-01 20:57:54 -07:00
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	7711b697ad	Finalize two-factor handling on account.	2018-06-20 23:05:35 -07:00
Dane Everitt	5f9fe4a69b	Update calls to missing function	2018-01-05 16:33:50 -06:00
Dane Everitt	c7c2c1a45e	Implement changes to 2FA system (#761)	2017-11-18 13:35:33 -05:00
Dane Everitt	e56f4cdd33	Update license headers on files.	2017-09-25 21:43:01 -05:00
Dane Everitt	30660cfac2	Apply fixes from StyleCI (#609)	2017-08-30 21:14:20 -05:00
Dane Everitt	e045ef443a	Should wrap up the base landing page stuff for accounts, next step is server rendering	2017-08-30 21:11:14 -05:00