4400 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dane Everitt	545e44df4e	Update file manager code	2018-05-26 11:41:46 -07:00
Dane Everitt	e648e50d90	Write some example tests for @stanjg	2018-05-26 11:00:28 -07:00
Dane Everitt	5a9d76a7e1	Revert "Merge branch 'master' into pr/1129" ... This reverts commit 35d108c41082eb7aa2328d0beb4366cf14cd450f, reversing changes made to f39720f15db760e05a49c691d8b545d196e6592b.	2018-05-26 10:35:20 -07:00
Dane Everitt	e3bbd85f3f	Merge branch 'develop' into pr/1129	2018-05-26 10:34:29 -07:00
Dane Everitt	35d108c410	Merge branch 'master' into pr/1129	2018-05-26 10:32:21 -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	db9b80fe78	Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop	2018-05-23 22:01:51 -07:00
Dane Everitt	9133406a35	Update changelog	2018-05-23 22:01:48 -07:00
Michael (Parker) Parker	52ae3f1062	Parkervcp patch 1 (#1169)	2018-05-23 22:00:57 -07:00
Michael (Parker) Parker	5fddf02247	Update to build spigot (#1168)	2018-05-23 21:58:16 -07:00
Jakob	4d91cc697b	no longer lie about spigot being built when no url provided (#1104)	2018-05-23 21:38:39 -07:00
Dane Everitt	de6bd85e5b	Merge pull request #1166 from ZeroxTV/fix/german-localization ... Fix mistakes in the German lang files and add missing translations	2018-05-23 21:36:37 -07:00
Dane Everitt	39730668ef	Merge pull request #1164 from JaydenDownes/patch-1 ... Fixed minor punctuation errors.	2018-05-23 21:36:24 -07:00
Leon Baronick	866c2f6a89	Changed "User" to "Benutzer" in the whole German localization	2018-05-23 13:05:03 +02:00
Leon Baronick	e2370fb22f	Fixed typos and made minor changes	2018-05-23 13:00:04 +02:00
Leon Baronick	e6dd67b6ee	Fixed typo in auth.php	2018-05-23 12:20:28 +02:00
Leon Baronick	a69a067fbc	Fix mistakes in the German lang files and add missing translations	2018-05-22 22:09:16 +02:00
Jayden Downes	119ec418cf	Fixed minor punctuation errors.	2018-05-21 18:16:23 +08: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	3bb9c521c0	Merge pull request #1147 from pterodactyl/feature/upgrade-laravel-to-5.6 ... Upgrade Laravel to 5.6	2018-05-20 16:58:10 -07:00
Dane Everitt	341f6e48c4	Merge branch 'develop' into feature/upgrade-laravel-to-5.6	2018-05-20 16:53:45 -07:00
Dane Everitt	a0cdd3f1c6	Merge pull request #1149 from pterodactyl/feature/exception-tests ... Add Base SecurityController and IndexController Exception tests	2018-05-20 16:53:35 -07:00
Dane Everitt	5d06a96f43	Bump changelog	2018-05-20 16:51:14 -07:00
Dane Everitt	b4e510fbe3	Fixes before release	2018-05-20 16:49:54 -07:00
Dane Everitt	49903e0590	Changes for new hashing to keep tests speedy	2018-05-20 16:38:27 -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	37a5e29db9	Merge branch 'develop' into feature/exception-tests	2018-05-20 16:26:18 -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
Dane Everitt	ce242d0cb0	Merge pull request #1143 from pterodactyl/feature/cron-job-fix ... Fix cron jobs by removing the extra unusable argument	2018-05-20 16:22:20 -07:00
Lance Pioch	a17570c1cb	Fix styling	2018-05-13 18:33:51 -04:00
Lance Pioch	06229a328f	Fix the description of the tests	2018-05-13 17:49:36 -04:00
Lance Pioch	a6bca34677	Add more exception tests	2018-05-13 17:49:31 -04:00
Lance Pioch	038e5e1b7d	Add exception tests	2018-05-13 17:49:25 -04: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	2b89eff2b4	Add the new logging config	2018-05-13 11:59:29 -04:00
Lance Pioch	53829399de	Make sure this trust proxies is also changed	2018-05-13 11:59:25 -04:00
Lance Pioch	cd523f2489	Replace with new bit header	2018-05-13 11:59:21 -04:00
Lance Pioch	c5c520a562	Update dependencies to support Laravel 5.6	2018-05-13 11:59:13 -04:00
Lance Pioch	b5fea3ee7f	Update php-cs-fixer	2018-05-13 11:59:08 -04:00
Lance Pioch	f37a21d1b6	Update php-mock	2018-05-13 11:59:03 -04:00