Commit graph

381 commits

Author SHA1 Message Date
Dane Everitt
829453f805
[Security] Address critical flaw in console rendering that allowed arbitrary command execution 2017-06-26 22:36:09 -05:00
Dane Everitt
b7b046c044
Merge branch 'develop' into feature/PTDL-472 2017-06-25 15:36:39 -05:00
Dane Everitt
2235481765
More service structure testing and configuration
Tests aren't working as well as I had hoped, so a lot are commented out while I wait to hear back on this bug causing them to fail.
2017-06-24 19:49:09 -05:00
Dane Everitt
cba54637fc
Fixes bug with newly created variables not being assigned to existing servers properly, closes #478 2017-06-18 21:38:00 -05:00
Dane Everitt
62a8f5737f
Block reinstall button if server doesn't install correctly. 2017-06-18 21:11:11 -05:00
Dane Everitt
81d265db08
Prevent the irritating moment when you logout accidentally when trying to click Admin CP. 2017-06-18 20:47:34 -05:00
Dane Everitt
0111ca7768
Push more changes to DBHost service.
Currently updating via the frontend is broken if you don't provide an actual node to attach it to.
2017-06-17 19:48:31 -05:00
Dane Everitt
5c2b9deb09
Push initial implementations of new repository structure
This breaks almost the entire panel, do not pull this branch in this state.

Mostly just moved old repository files to a new folder without updating anything else in order to start doing new things. Structure is not finalized.
2017-06-10 22:28:44 -05:00
Michael (Parker) Parker
0be8dc555e Mistyped words 2017-05-29 15:48:44 -04:00
Dane Everitt
0e48c94918
Don't allow reinstall if server install failed 2017-05-23 22:57:09 -05:00
Dane Everitt
0bb0d5df45
make clear that daemon must be rebooted after editing 2017-05-23 22:08:00 -05:00
Dane Everitt
8144535b82
Prevent invalid service tag names, ref #443 2017-05-23 21:59:47 -05:00
Dane Everitt
7460b5fdd2
fix broken file creation due to missing dependency, closes #453 2017-05-23 21:43:28 -05:00
Dane Everitt
72c0330486
Fixes 2FA not honoring 'Remember Me' checkbox, closes #439 2017-05-22 19:09:42 -05:00
Dane Everitt
de0b9beacb
Minor visual tweaking and filemanager backend improvements. 2017-05-05 23:13:42 -04:00
Dane Everitt
a52d9eb0fb
fix error display when server is installing, closes #424 2017-05-05 16:27:38 -04:00
Dane Everitt
c9c0e845b1
Go nuclear on Safari's autocomplete. 2017-05-01 16:41:39 -04:00
Dane Everitt
b539f26dab
Stop browser autofill on user view pages. 2017-05-01 16:17:31 -04:00
Dane Everitt
6dc1c15739
Fix display of associated servers when viewing an administrative user in the Admin CP. 2017-05-01 15:28:43 -04:00
Dane Everitt
b5c934d079
tiny boxes begone!
Mobile use was impossible with some accidentally small boxes defined…
2017-04-28 10:25:50 -04:00
Dane Everitt
1c37a8fe1a
Fixes account creation and password reset abilities. 2017-04-28 00:07:38 -04:00
Dane Everitt
3dc286b511
Actually use the right captcha IDs... 2017-04-27 23:46:42 -04:00
Dane Everitt
720cf5303e
Include recaptcha script on reset page. 2017-04-27 23:45:27 -04:00
Dane Everitt
aa6060846d
Actually show errors on password reset page. 2017-04-27 23:44:26 -04:00
Dane Everitt
3ee7b7cff1
Add ability to mark a node as being over a proxy 2017-04-27 22:52:37 -04:00
Dane Everitt
801aae968c
Show git version if panel is installed with git 2017-04-27 22:28:01 -04:00
Dane Everitt
30b4934013
Include default installation scripts, as well as ability to symlink a script 2017-04-27 16:16:59 -04:00
Dane Everitt
147f473eeb
Add back disk limiting! 2017-04-21 22:44:56 -04:00
Dane Everitt
a5a1ea3165
Add ability to change service implementation for a server. 2017-04-21 17:52:44 -04:00
Dane Everitt
8dc24471ae
Add reinstall abilities and cleanup process for new servers 2017-04-20 18:52:43 -04:00
Dane Everitt
3fe5d162f5
Add skip scripting option 2017-04-20 17:57:40 -04:00
Dane Everitt
c8f1335a09
Fixup merge 2017-04-20 17:26:20 -04:00
Dane Everitt
8d24e5f168
Merge branch 'develop' into feature/option-scripts
# Conflicts:
#	app/Http/Routes/AdminRoutes.php
#	app/Http/Routes/DaemonRoutes.php
#	app/Models/ServiceOption.php
2017-04-20 17:08:08 -04:00
Dane Everitt
205a10cd72
Fix display of subusers after creation. 2017-04-17 21:44:58 -04:00
Dane Everitt
a307ff4696
Should fix file editing in all bowsers 2017-04-17 21:22:36 -04:00
Dane Everitt
3acc7b338b
Allow deleting default allocation and setting new default at the same time. 2017-04-17 21:07:37 -04:00
Dane Everitt
776220636b
Fix password error when changing account email, closes #379 2017-04-17 20:35:07 -04:00
Dane Everitt
5359015248
Add link to front-end server view when managing server in Admin CP, closes #387 2017-04-17 20:24:17 -04:00
Dane Everitt
bdfab16af3
Show SFTP/Docker username on server list and view. 2017-04-17 20:12:04 -04:00
kasper Franz
de436d3c83 show Suspended server in overview fixes #386 (#388)
* show Suspended server in overview fixes #386

* changed to use just check instead of being specific for 1
2017-04-17 14:26:45 -04:00
kasper Franz
2006920427 added a check if the task has run yet (#385)
* added a null check on the last_run

* corrected a mistake made when changing the file

* another mistake :/

* changed to be less specific and so it checks against the value instead of >
2017-04-17 12:03:11 -04:00
Dane Everitt
f58858206e
Add console popout option.
Popout: https://s3.kelp.in/IrTyE.png
Menu: https://s3.kelp.in/JYwlC.png
Menu Hover: https://s3.kelp.in/cPtSf.png
2017-04-15 18:23:29 -04:00
Dane Everitt
7f48b757cd
Major cleanup of Ace editor files, as well as hopefully fixing broken editor issues. 2017-04-15 17:14:20 -04:00
Dane Everitt
7f1a97184b
Un-butcher task system. 2017-04-15 13:52:43 -04:00
Dane Everitt
97cc30e502
Assorted fixes 2017-04-14 20:10:09 -04:00
Dane Everitt
13742ef10a
Various thematic updates to improve responsive views 2017-04-14 01:44:06 -04:00
Dane Everitt
a2b451b990
Fix the terminal to stop glitching out and not displaying unless window is resized. 2017-04-14 01:21:38 -04:00
Dane Everitt
6fda3b72e4
Display total servers user can access in the Admin CP
closes #356
2017-04-13 23:49:47 -04:00
Dane Everitt
722fd614a1
Add new dynamic view for creating API keys 2017-04-09 18:59:54 -04:00
Dane Everitt
cbeecfe5e4
Implement front-end server searching 🍬 2017-04-01 13:14:49 -04:00
Dane Everitt
844ebfaf64
Add support for starting server on creation. 2017-04-01 12:29:49 -04:00
Dane Everitt
edaa270a33
Add server descriptions, closes #338 🐖
🐷 https://s3.kelp.in/D0n2Z.png
2017-03-31 23:07:19 -04:00
Dane Everitt
660cdca940
Hide random whitespace if there is only a single page 2017-03-31 22:14:56 -04:00
Dane Everitt
536865b22a
Remove deletion queue for servers. Just immediately delete. 2017-03-31 22:12:31 -04:00
Dane Everitt
75119611b9
Update API settings page to display checkboxes correctly. 2017-03-31 21:46:40 -04:00
Dane Everitt
fa04bb1aea Delete .githold 2017-03-31 16:43:49 -04:00
Dane Everitt
14946eea31 closes #336 2017-03-31 16:42:12 -04:00
Jakob Schrettenbrunner
ac2e29e4a1 show users server where he is a subuser
fixes #209
2017-03-31 13:54:20 +02:00
Jakob Schrettenbrunner
a51cf1ff47 remove ReCaptcha from views if it is disabled 2017-03-31 12:26:57 +02:00
Jakob Schrettenbrunner
207e0131fc Merge branch 'develop' of github.com:Pterodactyl/Panel into improve-password-reset 2017-03-31 12:20:41 +02:00
Jakob Schrettenbrunner
142cbb0641 Add invisible ReCAPTCHA to login and password reset 2017-03-31 12:19:44 +02:00
Dane Everitt
da003efb03
Fixes issue with DOCTYPE being discarded on JS injected views 2017-03-30 16:23:25 -04:00
Dane Everitt
b165f04b78
Fix up file display in sidebar as well as socket.io warnings, closes #357 2017-03-30 16:20:51 -04:00
Dane Everitt
95c739a3f3
Update subusers view 2017-03-30 15:31:02 -04:00
Dane Everitt
4e916cbf08
Fix auto-deploy checkbox triggering error 2017-03-19 12:39:22 -04:00
Dane Everitt
da19749098
Fix phraseapp and move config location 2017-03-19 11:55:36 -04:00
Jakob Schrettenbrunner
d46eac9b60 set theme-color meta to darker blue to match mobile design 2017-03-19 11:36:07 +01:00
Dane Everitt
c484bb6b2f
Move and delete JS and such so that themes are cleaner 2017-03-18 19:03:25 -04:00
Dane Everitt
f8a1a1789c
Fix EULA agreement popup 2017-03-18 17:21:49 -04:00
Jakob Schrettenbrunner
f410efa866 add favicons for everything 2017-03-18 21:57:12 +01:00
Jakob Schrettenbrunner
944f25e6e8 move api key create button in top right corner 2017-03-18 21:38:23 +01:00
Jakob Schrettenbrunner
bc4e42dcdd move tasks and subusers create button in top right corner 2017-03-18 21:36:46 +01:00
Jakob Schrettenbrunner
117ce5e51a remove tabbing on user quick navigation sidebar 2017-03-18 21:32:00 +01:00
Jakob Schrettenbrunner
02ab70ecfb move packs create button in top right corner 2017-03-18 21:27:31 +01:00
Jakob Schrettenbrunner
e90c9b6e01 move databases and locations create button in the top right corner to match other lists 2017-03-18 21:25:36 +01:00
Dane Everitt
4f16509447
Use env() properly throughout panel to avoid cache issues. 2017-03-18 15:56:19 -04:00
Dane Everitt
03e0de28d9
Initial implementation of option scripts on panel side. 2017-03-18 13:09:30 -04:00
Dane Everitt
202dd52e2b
Fixes bug causing MySQL user accounts to be corrupted when resetting a password via the panel.
closes #352
2017-03-17 17:17:36 -04:00
Dane Everitt
d5352e2b1e
Adjust filemanager display 2017-03-17 16:20:27 -04:00
Dane Everitt
7e45f917c7
Fix subuser permissions in file manager 2017-03-17 16:19:45 -04:00
Dane Everitt
a5902bf39c
Show indicator of user permissions on server when listing 2017-03-17 15:34:29 -04:00
Dane Everitt
34d5e81b7a
Fix new server page display 2017-03-16 20:29:48 -04:00
Dane Everitt
1aa191210a
closes #344 2017-03-16 19:54:31 -04:00
Dane Everitt
955d89c0c6
Move everything over to pterodactyl theme 2017-03-16 19:48:24 -04:00
Dane Everitt
198a021a97
Add database host management to panel. 2017-03-16 19:35:29 -04:00
Dane Everitt
05d2a6d370
Add back locations with new theme 2017-03-16 18:09:02 -04:00
Dane Everitt
1852018397
Add back missing node creation page. 2017-03-15 21:38:09 -04:00
Dane Everitt
65f9e30164 Merge pull request #350 from Pterodactyl/feature/service-changes
Merge service changes into develop
2017-03-15 20:54:13 -04:00
Dane Everitt
1c47b2ed55
Finish pack management in Admin CP 2017-03-15 20:52:37 -04:00
Dane Everitt
50558db7c3
Add initial pack creation and overview pages 2017-03-14 21:18:36 -04:00
Dane Everitt
fcadee7e67
Fix front and backend views with new service variable setups 2017-03-12 19:34:06 -04:00
Dane Everitt
f5a4ec981d
Add ability to create new service variable. 2017-03-12 16:28:38 -04:00
Dane Everitt
419031e0cd
Add function file editing, and move all service file items into database 2017-03-12 15:59:17 -04:00
Dane Everitt
d7682bb7c9
Complete new service, option, and variable management interface in Admin CP 2017-03-12 00:00:06 -05:00
Dane Everitt
70db461075
Start push of service changes.
Changes the way service files are stored and allows for much easier
updates in the future that won’t affect custom services.

Also stores more configurations in the database to make life easier for
everyone.
2017-03-10 18:25:12 -05:00
MeltedLux
887c859f61 Sneaky typo fix 2017-03-10 07:29:58 +00:00
Dane Everitt
3355554704
Fix frontend database password reset 2017-03-05 16:46:44 -05:00
Dane Everitt
32dec97e46
Improved database mechanics in admin CP for server view 2017-03-05 16:37:40 -05:00
Jakob Schrettenbrunner
16aaf531d6 switch user delete box to the style from nodes for consistency 2017-03-05 17:25:28 +01:00
Dane Everitt
349b36d38a
Added startup management, cleaned up code.
Refactored entire startup repository code block to be more efficient
and cleaner. Also includes modifications to front-end to make it match
backend name and design.
2017-03-04 23:45:25 -05:00
Dane Everitt
e688468920
Push updated server views 2017-03-04 19:03:49 -05:00
Dane Everitt
e6d3663b3b
Model and template cleanup 2017-03-03 23:37:41 -05:00
Dane Everitt
d38f89a468
Cleanup node routes, cleanup remote token 2017-03-03 23:14:25 -05:00
Dane Everitt
287015669a
Deleting nodes is now located on index 2017-03-03 23:14:25 -05:00
Jakob Schrettenbrunner
61d8332e93 make new user and view user consistent 2017-03-04 01:47:39 +01:00
Jakob Schrettenbrunner
23dfcbd7bc retheme admin create user page 2017-03-04 01:45:03 +01:00
Jakob Schrettenbrunner
d1811822f3 fix form on admin user view 2017-03-04 01:44:52 +01:00
Jakob Schrettenbrunner
ae980f9020 retheme admin user view 2017-03-04 01:10:03 +01:00
Jakob Schrettenbrunner
e331157f53 add users menu link to new admin layout
rename server list to servers
rename node list to nodes
2017-03-04 00:20:17 +01:00
Jakob Schrettenbrunner
6df573e50c retheme admin users list 2017-03-04 00:16:11 +01:00
Dane Everitt
fd5b74c873
Use usernames for @schrej 2017-03-03 17:53:35 -05:00
Dane Everitt
2854a55aa2
Fix server view to use owner username and named route locations 2017-03-03 17:50:45 -05:00
Jakob Schrettenbrunner
2efd6865e3 fix rethemed settings title 2017-03-03 23:36:11 +01:00
Dane Everitt
799f2ee6d9
Merge branch 'develop' into feature/admin-retheme
# Conflicts:
#	public/themes/pterodactyl/css/pterodactyl.css
2017-03-03 17:35:04 -05:00
Dane Everitt
fd9f1a68eb
Implement node view, cleanup other files.
Still in progress, need to do a lot of controller cleanup first and add
node deletion as well.
2017-03-03 17:30:41 -05:00
Jakob Schrettenbrunner
6c7fff1de0 fix rethemed settings breadcrumbs 2017-03-03 23:23:45 +01:00
Jakob Schrettenbrunner
c5e7f414f6 retheme admin settings view 2017-03-03 23:18:36 +01:00
Jakob Schrettenbrunner
3a88deb97a Merge branch 'develop' into feature/new-theme
# Conflicts:
#	.gitignore
#	public/themes/pterodactyl/js/frontend/files/filemanager.min.js
#	public/themes/pterodactyl/js/frontend/files/filemanager.min.js.map
#	public/themes/pterodactyl/js/frontend/serverlist.js
#	resources/themes/pterodactyl/server/files/list.blade.php
2017-03-03 23:08:24 +01:00
Dane Everitt
9f54ff236a
Add back manage and delete tabs to server view
Will come back to deal with Startup and Database tabs at a later date.
2017-02-25 14:14:07 -05:00
Dane Everitt
fb21bf9282
Begin implementation of server admin view
Currently completed tabs: About, Details, Build Configuration
2017-02-25 00:48:14 -05:00
Dane Everitt
cb6b44d4f0
Completed new server page with new theme. 2017-02-24 18:19:03 -05:00
Dane Everitt
58999913ba
More improvements to add server page. 2017-02-23 22:52:05 -05:00
Dane Everitt
b926d432e8
Thats enough re-theming for the day... 2017-02-18 19:31:44 -05:00
Dane Everitt
0f93ba2495
Add permissions checking to sidebar 2017-02-17 19:45:03 -05:00
Dane Everitt
5f8572fe1a
Fix power button permissions checking 2017-02-17 19:37:35 -05:00
Dane Everitt
008cccb098
Fix up email sending and add more notifications to the panel.
Closes #265
2017-02-17 19:23:27 -05:00
Dane Everitt
9af06b4b59
Add in query caching on server view 2017-02-17 18:19:53 -05:00
Dane Everitt
232e9a05ed
Update filemanager to be a little cleaner 2017-02-17 13:08:07 -05:00
Dane Everitt
ebe88bb1a8
Cleaner navigation bar for logout/admin 2017-02-16 18:19:52 -05:00
Dane Everitt
f9dc66b4dd
Update footer 2017-02-16 15:02:40 -05:00
Dane Everitt
6148a3bb9b
Fix EULA checking 2017-02-16 14:56:27 -05: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
516e2dc5ee
Add back API key deletion 2017-02-16 12:57:48 -05:00
Dane Everitt
99812b0407
More subuser Model updates. 2017-02-09 19:38:54 -05:00
Dane Everitt
02458c909d
Improves server model and cleans up model code calls. 2017-02-05 19:19:46 -05:00
Dane Everitt
242294598f Merge branch 'develop' into feature/updated-models 2017-02-02 19:47:10 -05:00
Dane Everitt
3114b7e52a
Complete implementation of new Server model. 2017-02-02 19:41:38 -05: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
Dane Everitt
d4bcf0be59
Initial implementation of improved sever model and logic 2017-02-02 18:21:36 -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
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
1cd9e8ca88 switch to jQuery 3.1.1 on new theme
will resolve #113
2017-01-29 01:20:37 +01:00
Jakob Schrettenbrunner
c62312b8af redesign parts of the file manager
ignore yarn.lock file
2017-01-27 00:44:59 +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
Dane Everitt
bf7b58470a
Update copyright headers 2017-01-24 17:57:08 -05:00
Dane Everitt
d21e6b8c90 Merge pull request #267 from hammerdawn/ThemeFixes
Theme Changes
2017-01-22 19:59:37 -05:00
Emmet Young
a2b56e865e Make sure where applying strtolower on the users email on the frontend as well. 2017-01-23 10:34:20 +11:00
Dane Everitt
5f1bfcf980
Much cleaner code for updating user details front-end 2017-01-22 16:16:43 -05:00
Dane Everitt
9e54dabe5b
Display if subusers are using 2FA 2017-01-22 16:16:26 -05:00
Emmet Young
7654d3652a Only show admin control menu if the user is a root admin 2017-01-23 01:13:53 +11:00
Dane Everitt
0e23f87724
Add task management views 2017-01-21 15:40:46 -05:00
Dane Everitt
aea9b020c5
Use words not symbols for revoking subuser 2017-01-21 13:59:02 -05:00
Dane Everitt
db7b741b28
Show server status in sidebar properly on subuser views 2017-01-21 13:49:14 -05:00
Dane Everitt
8e9069cced
Subuser updates 2017-01-21 00:04:09 -05:00
Dane Everitt
95f574ec67
Sidebar and API View tweaks 2017-01-20 23:48:12 -05:00
Dane Everitt
3d2278ba3e
Add subuser list and new subuser views
Holy 🐄 translations are annoying to implement for these views.
2017-01-20 23:39:37 -05:00
Dane Everitt
91178d78a4
Add support for creating files via file manager 2017-01-20 17:10:14 -05:00
Dane Everitt
5567269bf3
Fix menu toggle element element hiding, better mobile support 2017-01-19 23:19:26 -05:00
Dane Everitt
da92796ca1
Better file upload handling, add touch target 2017-01-19 22:58:58 -05:00
Dane Everitt
83c776fc82
Fix up most of the file manager 2017-01-19 16:58:57 -05:00
Dane Everitt
042c28ca43
Add Socket.io alert 2017-01-18 21:12:58 -05:00
Dane Everitt
88378ce983
Add allocations tab
Strips some core allocation features for now, will be added back with
more features once the theme is done.
2017-01-18 20:45:10 -05:00
Dane Everitt
758927db8e
Translations are hard 2017-01-18 19:48:12 -05:00
Dane Everitt
ff241abe81
Minor tweaks to new API token page. 2017-01-18 19:41:46 -05:00
Jakob Schrettenbrunner
148e9d1fd5 use adminPermissions[] correctly in api key creation form 2017-01-19 01:24:33 +01:00
Jakob Schrettenbrunner
e81af3afee add csrf token to api key creation form 2017-01-19 01:07:28 +01:00
Jakob Schrettenbrunner
76cef7bf1d add redesigned base.api.new view
add translations
2017-01-19 01:06:26 +01:00
Dane Everitt
d3d1b88135
Add 404 and 403 error pages 2017-01-17 20:28:49 -05:00
Jakob Schrettenbrunner
e075b9061e replace {{ trans() }} with @lang() 2017-01-18 02:01:26 +01:00
Dane Everitt
542b919bd1
Add translations for database overview 2017-01-17 19:46:42 -05:00
Dane Everitt
f6600f447f
Add Startup Params view
Translations might be the end of us.
2017-01-17 19:30:27 -05:00
Jakob
31b4589eab Contribution to feature/new-theme (#254)
* add translation to navigation

* redesign base.api.index view
add translations

* remove license derp

* translate never in base.api.index view

* simplify user drop down for now
add translations
2017-01-17 18:21:05 -05:00
Dane Everitt
515e543c7f
Add SFTP and Database management pages to new theme. 2017-01-15 20:28:54 -05:00
Dane Everitt
c7f3bb5112
New theme assigned to server console page. 2017-01-15 18:52:22 -05:00
Dane Everitt
2fc852c6a4
Push 'Account' and 'Security' pages as well as 'My Servers' 2017-01-15 14:09:57 -05:00
Dane Everitt
d4adedd4a0
Use template layout for authentication 2017-01-14 23:17:31 -05:00
Dane Everitt
457ed28b0b
Initial change of theme.
Only themed pages currently are login and reset password pages.
2017-01-14 21:32:33 -05:00
Dane Everitt
3df694b618 Update theme support 2016-02-05 23:27:43 -05:00
DDynamic
192498e51a Internal Themes 2016-02-04 18:19:31 -06:00