Commit graph

1941 commits

Author SHA1 Message Date
Jakob
19567ee311 Merge branch 'develop' into fix/trusted-proxies 2017-02-03 00:38:58 +01:00
Jakob
8cac2a3669 Merge pull request #285 from Pterodactyl/feature/phrase-in-context
add phraseapp in context editor
2017-02-03 00:36:50 +01:00
Jakob Schrettenbrunner
600cc75637 update changelog 2017-02-03 00:29:50 +01:00
Dane Everitt
644ee85f59
Fix for StyleCI 2017-02-02 18:25:46 -05:00
Dane Everitt
c4b76bf48e
Remove FKs correctly 2017-02-02 18:25:11 -05:00
Dane Everitt
d4bcf0be59
Initial implementation of improved sever model and logic 2017-02-02 18:21:36 -05:00
Jakob Schrettenbrunner
7f1000dd8a make dane and styleci happy 2017-02-03 00:08:10 +01:00
Jakob Schrettenbrunner
7b659a773e handle * and ** for TRUSTED_PROXIES 2017-02-02 23:31:42 +01:00
Jakob Schrettenbrunner
7f0608d412 better naming of PhraseApp related stuff 2017-02-02 23:14:53 +01:00
Dane Everitt
fb589a7f4e
Fix session timeout issues on browser close. 2017-02-02 16:29:37 -05:00
Dane Everitt
7f51e5df62
API tweaks to return more relevant information on server listing 2017-02-02 16:24:08 -05:00
Dane Everitt
32c21baab0
Return packs associated with a service when viewing it on the API. 2017-02-02 16:01:18 -05:00
Dane Everitt
6220f710df
Cache configuration file when editing environment or mail settings. 2017-02-02 15:06:35 -05:00
Dane Everitt
e18391e98a
Commit composer lock and use config:cache for security purposes. 2017-02-02 15:01:15 -05:00
Jakob Schrettenbrunner
d9225e65df move phraseapp js into own file 2017-02-02 15:30:40 +01:00
Jakob Schrettenbrunner
8fc30fbe3a add phraseapp in context editor 2017-02-02 15:05:33 +01:00
Dane Everitt
4be9e30eee
Include that 30 second limit on other 2FA checks 2017-02-01 23:05:19 -05:00
Dane Everitt
a93adce303
Only allow up to 30 seconds of overlap on comparing the 2FA tokens. 2017-02-01 23:02:54 -05:00
Dane Everitt
4abdee0efb
Better 2FA implementation on logins 2017-02-01 22:58:48 -05:00
Dane Everitt
a1a81ac980
Fix auth page not remembering users. 2017-02-01 22:28:50 -05:00
Jakob Schrettenbrunner
24650b67be Merge branch 'develop' into fix/trusted-proxies
sorry
2017-02-01 20:35:10 +01:00
Jakob Schrettenbrunner
8ab4faad8a remove TRUSTED_PROXIES from .env.example
make style ci happy
2017-02-01 20:31:24 +01:00
Jakob Schrettenbrunner
ee26a7e8dd add fideloper/proxy to support reverse proxies and load balancers 2017-02-01 20:10:28 +01:00
Dane Everitt
e5ed1c7f6a One day eslint will have a PHP counterpart that works in Atom... 🤔 2017-01-31 20:04:34 -05:00
Jakob Schrettenbrunner
f6d5ffaebb derp: add jquery 3.1.1 files 2017-01-29 01:21:04 +01:00
Jakob Schrettenbrunner
1cd9e8ca88 switch to jQuery 3.1.1 on new theme
will resolve #113
2017-01-29 01:20:37 +01:00
Dane Everitt
1679d866a5
Improved gzip detection 2017-01-27 16:47:50 -05:00
Dane Everitt
4b0197f2be
Implement basic security policy on daemon remote routes 2017-01-27 16:34:46 -05:00
Dane Everitt
9087feec4f
Remove build settings from packs. 2017-01-27 16:21:25 -05:00
Dane Everitt
4a6d62fded
Fix fatal error when trying to send server creation notification 2017-01-27 16:21:15 -05:00
Jakob Schrettenbrunner
c62312b8af redesign parts of the file manager
ignore yarn.lock file
2017-01-27 00:44:59 +01:00
Jakob Schrettenbrunner
0c1559c922 convert frontend javascript into revealing module pattern 2017-01-27 00:44:28 +01:00
Jakob Schrettenbrunner
344e3b4330 add console notification on new output that is out of view
fix the revealing module pattern (browser cache 😒)
change graph colors to theme primary color
move Socket.on(‚console’) to console.js
2017-01-26 22:57:33 +01:00
Jakob Schrettenbrunner
5142dce0e0 reorganize code of console module 2017-01-26 22:20:04 +01:00
Jakob Schrettenbrunner
96f5d15811 switch console javascript code to revealing module pattern to avoid global variables 2017-01-26 22:12:33 +01:00
Dane Everitt
e6d3e75024
Add new daemon routes for pack handling 2017-01-25 18:25:34 -05:00
Dane Everitt
95d0c646f9
Require packs to be a tarball 2017-01-25 18:25:34 -05:00
Dane Everitt
95730da419
Fix pack edit display 2017-01-25 18:25:34 -05:00
Dane Everitt
96e50506a1
Move notification email of server created into the event listener 2017-01-25 18:25:34 -05:00
Dane Everitt
b8271cf8f6 Merge pull request #272 from hammerdawn/ErrorImprovement
Location should be validated on creation of a server,
2017-01-25 14:10:59 -05:00
Emmet Young
58de6125c2 Location should be validated on creation of a server, 2017-01-25 22:01:57 +11:00
Dane Everitt
a137e6ed72
Add base implementation of extendable events classes
Modified server deletion to use internal event handlers from the
Eloquent models themselves. Also added a few preliminary event handlers
in the `Pterodactyl\Events\<USer|Server> namespace that users can hook
into in EventServiceProvider to perform their own actions as they
please (such as push notifications and such).
2017-01-24 19:15:03 -05:00
Dane Everitt
bf7b58470a
Update copyright headers 2017-01-24 17:57:08 -05:00
Dane Everitt
986d3c6e23
Fix babel setup for filemanager 2017-01-24 00:11:01 -05:00
Dane Everitt
ae8f53d8ef
Prevent clicky mcgee from clicking too quickly 2017-01-23 22:26:48 -05:00
Dane Everitt
b9512dccb8 Apply fixes from StyleCI (#269) 2017-01-23 17:11:25 -05:00
Dane Everitt
06232b84c2 Merge pull request #268 from hammerdawn/ThemeFixes
Repair the admin side add user functionality.
2017-01-23 17:10:32 -05:00
Emmet Young
9c87e03c0c Repair the admin side add user functionality. 2017-01-23 13:24:14 +11:00
Dane Everitt
d21e6b8c90 Merge pull request #267 from hammerdawn/ThemeFixes
Theme Changes
2017-01-22 19:59:37 -05:00
Emmet Young
921c7b1725 Configuration JSON should be including the FQDN instead of localhost for the certificate path. 2017-01-23 11:14:55 +11:00