5598 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dane Everitt	59f9ab6e90	Help @schrej not have an aneurysm.	2017-02-16 15:49:14 -05:00
Dane Everitt	5e63ac0baa	Fix double encoding of JSON	2017-02-16 15:38:56 -05:00
Dane Everitt	f9dc66b4dd	Update footer	2017-02-16 15:02:40 -05:00
Dane Everitt	d4e1bc6cc0	Discord link via CDN now.	2017-02-16 15:01:26 -05:00
Dane Everitt	4e66ba078d	Fix locations error on create	2017-02-16 14:56:28 -05:00
Dane Everitt	6148a3bb9b	Fix EULA checking	2017-02-16 14:56:27 -05:00
Dane Everitt	ba288e5bef	Courageous Carniadactylus	2017-02-16 14:50:38 -05:00
Jakob	d230ee179a	Merge pull request #299 from Pterodactyl/feature/allow-login-with-username ... allow to use the username for login as well	2017-02-16 20:47:25 +01:00
Jakob Schrettenbrunner	bdf8b473d4	fix translations for login field	2017-02-16 20:46:37 +01:00
Jakob Schrettenbrunner	4fc832838b	use ‚required|string‘ to validate usernames	2017-02-16 20:45:36 +01:00
Jakob Schrettenbrunner	0b2c5279a8	allow to use the username for login as well ... add translation strings	2017-02-16 20:40:21 +01:00
Dane Everitt	10164f5a51	Require admin to update startup argument.	2017-02-16 14:23:22 -05:00
Dane Everitt	8740be05b3	Fix adding variables	2017-02-16 14:07:10 -05:00
Dane Everitt	c8ae776ab8	Fix settings redirection for server	2017-02-16 14:04:15 -05:00
Dane Everitt	2e134b7a55	Set out some roach traps to catch all these 🐛	2017-02-16 13:56:28 -05:00
Dane Everitt	336234843d	Remove deprecated function calls	2017-02-16 13:31:25 -05:00
Dane Everitt	38feac9f0b	Fix server deletion mechanics	2017-02-16 13:26:39 -05:00
Dane Everitt	516e2dc5ee	Add back API key deletion	2017-02-16 12:57:48 -05:00
Dane Everitt	d3e4f944f7	Update the README	2017-02-15 18:03:30 -05:00
Dane Everitt	6d2ffabe46	Merge pull request #286 from Pterodactyl/feature/updated-models ... Implementation of improved Model logic and relationships throughout code base.	2017-02-15 17:02:43 -05:00
Dane Everitt	2fdde75f9c	Fix boolean flipping	2017-02-15 16:59:50 -05:00
Dane Everitt	788de1b23a	Fix grepping about.	2017-02-15 16:57:45 -05:00
Jakob Schrettenbrunner	cea2d040eb	fix @DaneEveritt grepping arround	2017-02-13 23:20:49 +01:00
Dane Everitt	afb0451bcd	Drop a forgotten foreign key	2017-02-12 20:27:06 -05:00
Dane Everitt	7aa4608399	Commit new lockfile.	2017-02-12 16:43:43 -05:00
Dane Everitt	b5c39a1212	Fix @schrej's proxy code.	2017-02-12 16:41:17 -05:00
Dane Everitt	24a8bfab97	Update server observer to use new model code.	2017-02-12 16:26:55 -05:00
Dane Everitt	53cd32aac8	Commit new lockfile.	2017-02-12 16:23:42 -05:00
Dane Everitt	6855e76c2b	Fix @schrej's proxy code.	2017-02-12 16:23:31 -05:00
Dane Everitt	19d352619e	More singularization and correct file names.	2017-02-12 16:03:17 -05:00
Dane Everitt	8ba479e51f	Singularize model names.	2017-02-12 16:02:23 -05:00
Dane Everitt	2290118a0d	Apply fixes from StyleCI (#293)	2017-02-12 15:17:14 -05:00
Dane Everitt	7c916ad38f	Apply fixes from StyleCI (#294)	2017-02-12 15:10:39 -05:00
Jakob Schrettenbrunner	a10e235beb	revert accidental changes to migrations	2017-02-12 17:38:15 +01:00
Dane Everitt	a14df81f27	Merge branch 'develop' into feature/updated-models	2017-02-10 20:30:20 -05:00
Dane Everitt	32a1dc17ed	API model updates, as well as general model updates and code fixes.	2017-02-10 20:26:38 -05:00
Dane Everitt	8dc1f41b73	More code cleanup.	2017-02-10 17:41:56 -05:00
Dane Everitt	c70d31c08f	More model updates.	2017-02-10 17:36:58 -05:00
Dane Everitt	3b3002b77a	API Model updates.	2017-02-10 17:29:10 -05:00
Dane Everitt	efef356870	Assorted model code updates.	2017-02-10 17:18:46 -05:00
Dane Everitt	ba175e6b55	Cleanup location model and controller for Admin.	2017-02-10 17:09:56 -05:00
Dane Everitt	0720bfe62f	Cleanup database query code.	2017-02-10 17:03:58 -05:00
Dane Everitt	99812b0407	More subuser Model updates.	2017-02-09 19:38:54 -05:00
Dane Everitt	c8f6c93d26	Modify subusers model setup	2017-02-09 18:44:07 -05:00
Dane Everitt	4f61637284	More model updates to more places than I anticipated. ... This probably broke a lot of things.	2017-02-09 17:43:54 -05:00
Jakob	c7d48d73c1	Merge pull request #284 from Pterodactyl/fix/trusted-proxies ... Allow to set trusted proxies to allow usage of load balancers and reverse proxies	2017-02-09 13:32:23 +01:00
Dane Everitt	0d61417814	Addresses security flaw allowing unauthenticated access to server overview.	2017-02-05 19:59:16 -05:00
Dane Everitt	02458c909d	Improves server model and cleans up model code calls.	2017-02-05 19:19:46 -05:00
Dane Everitt	b1389262e2	Use belongsTo versus hasOne when more logical.	2017-02-05 18:00:39 -05:00
Dane Everitt	323f1d943f	Completed model updates for Services	2017-02-05 17:58:17 -05:00