4240 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dane Everitt	c931d16369	Merge pull request #1737 from pterodactyl/lancepioch-patch-3 ... Clean sensitive email connection info	2019-12-28 11:16:30 -08:00
Dane Everitt	e6008d6392	Merge branch 'develop' into lancepioch-patch-3	2019-12-28 11:16:14 -08:00
Dane Everitt	bd68900346	Merge pull request #1734 from Sir3lit/uniform ... More uniformity	2019-12-28 11:15:04 -08:00
Dane Everitt	f7cf917378	Merge pull request #1724 from Sir3lit/mysql8-fix ... MySQL 8 fix	2019-12-28 11:14:51 -08:00
Dane Everitt	4bca3a4895	Merge pull request #1693 from TrixterTheTux/api-fixes	2019-12-28 11:13:00 -08:00
Dane Everitt	245f8e85e7	Merge branch '0.7-develop' into api-fixes	2019-12-28 11:12:45 -08:00
Stepan Fedotov	c377be2a7c	Include the egg name in egg model's response from the application API (#1684)	2019-12-28 11:12:01 -08:00
rtm516	86e6daf0aa	Update list.blade.php (#1674)	2019-12-28 11:10:59 -08:00
Oreo Oreoniv	741ae27f18	Fixed TooManyLoginAttempts not work correctly (#1668)	2019-12-28 11:10:39 -08:00
Stepan Fedotov	5f60a6c735	Fix the resource key for subusers	2019-12-28 13:53:33 +02:00
parkervcp	a948acfd1c	update vanilla minecraft script.	2019-12-25 20:38:49 -05:00
Dane Everitt	63918cb549	Use the correct certificate key in the config	2019-12-24 16:48:50 -08:00
Dane Everitt	4173001f10	Put this up one level so it doesn't disappear on releases	2019-12-22 21:44:50 -08:00
Dane Everitt	338ffd0a8f	Fix up build script	2019-12-22 21:27:26 -08:00
Dane Everitt	c4fdcb5937	Fix navigation bar issues	2019-12-22 21:22:08 -08:00
Dane Everitt	1f6f7c4bb4	Fix authentication page on mobile devices	2019-12-22 21:18:29 -08:00
Dane Everitt	513692fef5	Whoops, actually show servers	2019-12-22 20:56:34 -08:00
Dane Everitt	6ccac6e040	Mobile improvements for two-factor form	2019-12-22 20:51:50 -08:00
Dane Everitt	9a0ed6b291	Add ability to disable two factor authentication	2019-12-22 20:41:25 -08:00
Dane Everitt	2a653cdd8d	Automatically update the user data when 2FA is enabled	2019-12-22 20:23:43 -08:00
Dane Everitt	eb39826f46	Add base logic to configure two factor on account	2019-12-22 17:03:44 -08:00
Dane Everitt	edf27a5542	Don't cache the manifest like this, pointless	2019-12-22 15:41:38 -08:00
Dane Everitt	293ebc9344	Show note when no servers.	2019-12-22 15:31:12 -08:00
Dane Everitt	c96bad4080	FIx force deletion	2019-12-22 15:08:11 -08:00
Dane Everitt	446d5be62b	Show proper spinners	2019-12-22 14:53:27 -08:00
Dane Everitt	5a31771b4b	Fixes for purge CSS	2019-12-22 14:33:08 -08:00
Dane Everitt	6276a03a4e	Fix links in admin area	2019-12-22 14:03:49 -08:00
Dane Everitt	52ea0f2d0a	Fix allocation management	2019-12-22 13:55:58 -08:00
Dane Everitt	bc3286c7e4	Don't need this box anymore	2019-12-22 13:50:35 -08:00
Dane Everitt	34ffcdae7a	Remove unnecessary API calls to daemon	2019-12-22 13:45:40 -08:00
Dane Everitt	59bfc212c9	Include all server information in details endpoints for daemon to use	2019-12-22 13:28:51 -08:00
Dane Everitt	058f72c923	Don't disconnect from the websocket when updating the server object state	2019-12-22 00:16:25 -08:00
Dane Everitt	6966530165	Better redux devtooling support	2019-12-22 00:16:13 -08:00
Dane Everitt	ef5d0fb4a2	Add deletion code to the panel	2019-12-21 23:26:15 -08:00
Dane Everitt	04d67eaa10	Minor fixes for blocking indexing and notg interrupting user expierence	2019-12-21 21:56:45 -08:00
Dane Everitt	f6b414741d	Wait for connection before opening terminal	2019-12-21 21:51:42 -08:00
Dane Everitt	33eb1d259f	Add easy launch button for SFTP	2019-12-21 21:16:12 -08:00
Dane Everitt	e87db889e9	Fix server data not updating correctly on daemon	2019-12-21 21:01:38 -08:00
Dane Everitt	3e915e526b	Fix file creation in nested directory	2019-12-21 17:43:50 -08:00
Dane Everitt	a1a344bc48	Big red warning box to prevent the inevitable users trying to run this as a prod build	2019-12-21 17:40:03 -08:00
Dane Everitt	11c17245c2	Handle websocket authentication slightly differently to make errors easier to work with	2019-12-21 17:31:04 -08:00
Dane Everitt	02c0d934c3	Make text more readable	2019-12-21 16:40:28 -08:00
Dane Everitt	00bf5644f8	Remove debugging code	2019-12-21 16:39:25 -08:00
Dane Everitt	e784218645	Add support for creating a new file	2019-12-21 16:38:40 -08:00
Dane Everitt	d75073116f	Health check	2019-12-16 21:42:58 -08:00
Dane Everitt	7405d7c8ee	Fix routing to server pages	2019-12-16 21:27:01 -08:00
Dane Everitt	03f2c61431	Fix error when creating user	2019-12-16 21:25:48 -08:00
Dane Everitt	a247310372	Fix nav for servers	2019-12-16 21:14:27 -08:00
Dane Everitt	2a92304023	Fix server creation logic	2019-12-16 21:02:30 -08:00
Dane Everitt	85b47ceb79	Slightly more logical handling when moving things around	2019-12-16 19:55:02 -08:00