Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2141 commits 62 branches 124 tags 29 MiB
Commit graph

2141 commits

This branch
This branch
All branches
Author SHA1 Message Date
ViViV_
ac71a56fd1 Adding variable for Server Map Selection [ARK SERVER] (#1230) 2018-07-21 10:40:51 -07:00
Michael (Parker) Parker
1ac13c82fa more docker changes 2018-07-18 17:15:28 -04:00
Michael (Parker) Parker
b7da8532ba Fixing install 
Adding php fpm conf and fixing dockerfile
 2018-07-18 15:31:35 -04:00
Dane Everitt
6dfaba9042
Merge pull request #1238 from jcsnider/develop 
Treat white space in terminal output as preformatted...
 2018-07-18 09:26:46 -07:00
Michael (Parker) Parker
5427b7e172 dockerfile changes 2018-07-18 12:15:33 -04:00
JC Snider
955617d7ce
Update terminal.css 
Treat white space in terminal output as preformatted so ascii art/other formatting works.
 2018-07-17 18:09:05 -04:00
Lance Pioch
44a65b4b3c Move to its own dir 2018-07-08 11:28:26 -04:00
Lance Pioch
7ef3b76499 Consolidate commands 2018-07-08 11:19:51 -04:00
Lance Pioch
925f28b29c Update alpine version 2018-07-08 11:19:46 -04:00
Lance Pioch
0667b61abf Combine and consolidate 2018-07-08 11:19:40 -04:00
Asherslab
a93a73ef4d Moved files 2018-07-08 11:19:35 -04:00
Asherslab
737bae300c Some Additions 2018-07-08 11:19:30 -04:00
Asherslab
42e3eecf80 Add docker files 2018-07-08 11:19:24 -04:00
Dane Everitt
d9948f2876
Update changelog 2018-07-04 11:42:57 -07:00
Dane Everitt
8f5bd214a4
[Security] Address 2FA bypass in password reset functionality 
Thanks to Trixter#0001 on Discord for this security report.

There was a two-factor authentication bypass present in all previous versions of Pterodactyl that would allow a user to login without providing a token by going through the password reset process. A person would still have to have access to the targeted account's email, but if they did manage to get a password reset link they would be able to reset the account password and then proceede to login without a token being required.

This logic has since been changed to check if 2FA is enabled on an account, and if so they will NOT be logged in when their password is changed. This will force them to continue through the normal login pathway where a token will be needed.

Overall the impact of this issue is minor, but I am still addressing it and disclosing the mechanism behind it.
 2018-07-04 11:41:56 -07:00
Jan
422e5dd99f Update strings.php (#1227) 
Fixed typo.
 2018-07-02 15:04:16 -07:00
Dane Everitt
8915c3ec28
Update dependencies 2018-07-01 14:50:11 -07:00
Lance Pioch
b5022766df Do not keep processing the file/folder paths if the user has cancelled the operation and fix #1124 (#1177) 2018-07-01 14:42:01 -07:00
Stan
1ffb5acfad Send an email when a server is marked as installed (#1213) 
Co-authored-by: @stanjg
 2018-07-01 14:34:40 -07:00
Dane Everitt
c42605e495
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2018-07-01 13:50:56 -07:00
Dane Everitt
eeb4d88cbd
Disable codecov failing PRs 2018-07-01 13:50:55 -07:00
Isaac A
b6d18b0a36 Add support for authentication via Unix socket (#1206) 
Co-authored-by: @tenten8401
 2018-07-01 13:47:00 -07:00
Dane Everitt
1df3efdfb0
Fix eggs (#1224) 2018-06-30 18:52:32 -07:00
Dane Everitt
d2bc791d74
Fix links sent to users when accounts are created 
closes #1093
 2018-06-30 18:47:31 -07:00
Dane Everitt
304d947536
Allow creating subuser with no permissions 2018-06-30 18:25:46 -07:00
Dane Everitt
96699b192e
Don't verify SSL signatures in dev 
[skip ci]
 2018-06-30 18:24:35 -07:00
Dane Everitt
59730dcbc9
Speed up tests, allow coverage to fail since thats a slow process 2018-06-30 18:01:23 -07:00
Dane Everitt
5a97f54013
Try concurrent build process for travis 2018-06-30 17:55:41 -07:00
Dane Everitt
974318ffb4
Logout other sessions when password is changed 
closes #1222
 2018-06-30 17:50:58 -07:00
Matthew Penner
1da05a2ee2 Fix typo (#1210) 2018-06-30 13:25:51 -07:00
Sergzy
bad9ae58e8 Fix environment_variables name (#1212) 2018-06-30 13:25:40 -07:00
Stan
ad9ed5ea00 Fixed the permission (#1217) 2018-06-30 13:23:48 -07:00
Jayden Downes
5f90d841d0 Fixed Search Bar Scaling in Firefox (#1187) 
Fixed scaling issue with Firefox where it would scale the search bar to 30% of the width of the box-tools container instead of 30% of the row container. (Note this is not a fix for the issue with it appearing on a separate line on mobiles).
 2018-06-04 19:33:34 -07:00
Lance Pioch
f54dc24cf4 Remove dupe issues thanks Microsoft (#1189) 
* Delete bug-report.md

* Delete feature-request.md
 2018-06-03 20:40:38 -07:00
Lance Pioch
8f0c740a15 Update issue templates (#1188) 
* Update issue templates

* Delete ISSUE_TEMPLATE.md
 2018-06-03 20:36:35 -07:00
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
stanjg
b56f3a8671
Expanded the middleware test 2018-06-01 16:22:06 +02:00
stanjg
e9ac014bf4
Removed the use of Auth facade and removed unnecesary option 2018-06-01 16:10:32 +02:00
stanjg
3bb9e5e8a8 Merge branch 'develop' of https://github.com/stanjg/panel into feature/user-specific-language 2018-06-01 15:58:09 +02:00
Stan
d7ab24a8ce
Merge pull request #2 from pterodactyl/develop 
Keep up to date
 2018-06-01 15:58:03 +02:00
stanjg
28e34f77b6 Merge branch 'master' of https://github.com/stanjg/panel into feature/user-specific-language 2018-06-01 15:55:08 +02: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