Commit graph

1894 commits

Author SHA1 Message Date
Jacob Gee-Clarke
d73e5a2274 Fixed my fix to fix the 500 error on /api/application/nodes when not specifying a daemon_base (#1182) 2018-06-02 14:34:01 -07:00
Dane Everitt
7319ef1b60
Merge pull request #1184 from pterodactyl/analysis-qgQ7ad
Apply fixes from StyleCI
2018-06-02 14:33:04 -07:00
Dane Everitt
969b16a563 Apply fixes from StyleCI
[ci skip] [skip ci]
2018-06-02 21:32:26 +00:00
Dane Everitt
3078b61ac6
Update changelog 2018-05-31 22:58:28 -07:00
Dane Everitt
fd8d7c3571
Merge pull request #1130 from stanjg/feature/stats-page
Added a statistics page to monitor the panel usage
2018-05-31 22:56:58 -07:00
Dane Everitt
5be4520d37
Merge pull request #1129 from stanjg/feature/node-maintenance
Added a maintenance mode for nodes
2018-05-31 22:49:47 -07:00
Dane Everitt
8aadc62882
Merge branch 'develop' into feature/node-maintenance 2018-05-31 22:49:07 -07:00
Lance Pioch
357c9e1aed Enable undo history after loading initial file and fix #1159 (#1180) 2018-05-31 22:43:18 -07:00
Lance Pioch
b7eed67f2f Warn users about uploading folders not working and resolve #599 (#1181) 2018-05-31 20:36:00 -07:00
Matthew Penner
6e6ce652b2 Fix logo-mini image (#1183) 2018-05-31 20:35:24 -07:00
stanjg
ccf3e3511f
Renamed middleware, and fixed the test 2018-05-31 16:40:18 +02:00
stanjg
013dde75ae
Renamed the field and made some improvements 2018-05-31 16:34:35 +02:00
stanjg
60e1ffa564
Added a test for the controller and cleaned up the controller 2018-05-27 00:16:13 +02:00
stanjg
7a81c61ad8
Wording changes and fix of major fail last commit 2018-05-26 21:02:47 +02:00
stanjg
86e7085396
Cleaned up the controller and prepared for tests 2018-05-26 20:58:49 +02:00
Dane Everitt
4e2eafe73f
Update dependencies 2018-05-26 11:42:13 -07:00
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 35d108c410, reversing
changes made to f39720f15d.
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