Commit graph

259 commits

Author SHA1 Message Date
Lance Pioch
0c21d401e3 Combine Locations and Nodes on Create Server page (#641) 2017-09-21 13:03:29 -10:00
Jakob
763f7a996a login page particles now repulse everywhere 2017-09-17 21:20:33 +02:00
Dane Everitt
0e518be6ca
More color adjustments 2017-09-13 22:38:28 -05:00
Dane Everitt
7f76684453
More schedule changes 2017-09-13 21:46:43 -05:00
Dane Everitt
2ac90b50f2
Begin refactoring Tasks to be apart of the Scheduler system 2017-09-12 23:45:19 -05:00
Dane Everitt
6c6a3c9458 Merge pull request #615 from Pterodactyl/feature/customized-theme
Feature/customized theme
2017-09-10 18:14:15 -10:00
Dane Everitt
bab28dbc85
Initial implementation of new task mgmt system 👮 2017-09-09 23:55:21 -05:00
Jakob Schrettenbrunner
0438ad7a21 switch blue and refine some colors 2017-09-05 00:29:34 +02:00
Jakob Schrettenbrunner
8b978b9597 refine some adminlte colors 2017-09-05 00:03:03 +02:00
Jakob Schrettenbrunner
6ce3aa969f redesign login page 2017-09-04 23:53:46 +02:00
Jakob Schrettenbrunner
56dbe0e4bf update adminlte to 2.4-rc
change adminlte blue colors to material indigo 700
2017-09-04 23:53:29 +02:00
Dane Everitt
a91d84ecfe Merge pull request #608 from Pterodactyl/feature/PTDL-472
Merge code refactor into develop.
2017-08-27 14:57:13 -05:00
Dane Everitt
9d3dca87f2
Begin moving packs to new service mechanisms, refactor exceptions for services 2017-08-18 22:19:06 -05:00
Joost Kwakkel
c71032a707 Only left-clicking now activates the selection of an item 2017-08-05 00:04:15 +02:00
OrangeJuiced
b6e9423085 Add minified files for #544 (#558) 2017-07-22 07:13:49 -10:00
OrangeJuiced
e64eb4901e Add multiple file/directory deletion in the filemanager (#544)
* Add deletion of multiple selected files
* Adjust success/failure text to properly represent multiple files
* Actually update the minimized versions with the new code
* Use let instead of var and seperate items into seperate code tags
* Deleting the selected items now supports the new endpoint
* Replaced the select buttons with checkboxes
* Selections is now handled by find all the selected checkboxes
* Add a warning if no files/folders are selected when pressing delete
* Add a select all files/folders checkbox
* Move mass delete button into a mass actions dropdown
* Move style to css file
* Actually update the minimized files (again)
* Mass actions button is now disabled by default
* Clicking on a row selects the checkbox and enables the actions button
* Fix clicking anything else but the row or checkbox triggering selection
2017-07-20 13:10:01 -10:00
Dane Everitt
0c513f24d5
Move server creation over to new service/repository setup.
Moves tons of functions around, but the basic implementation is working again.

Some features are still missing, and the service never actually commits the server to the database right now.

This push is mostly just to get the code into Github and backed up.
2017-07-19 20:49:41 -05:00
Bent
4f2dd519c6 Fix terminal scrolling and terminalNotify
The original statement seems to be a bit too precise regarding the height. Any tiny lag or one pixel movement leads to the console not being scrolled to the bottom anymore. Same applies for manually scrolling down which does not hide the `terminalNotify` properly. 

A bit larger "buffer" fixes this.
2017-07-03 08:46:53 +02:00
Dane Everitt
1abcb99f78
Fix more of the console, add back support for arrow key command history 2017-06-30 20:41:16 -05:00
Dane Everitt
674559a066
Update socketio and do some cache busting for it 2017-06-28 21:53:14 -05:00
Dane Everitt
7463bea101
fix the console rendering 🚤 2017-06-28 21:39:30 -05:00
Dane Everitt
344099fbb7
Fix JS loading and CSS 2017-06-26 22:47:01 -05:00
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
bb2531618b
Update routes.js file 2017-06-18 21:54:57 -05:00
Jakob Schrettenbrunner
3877aba373 fix google recaptcha badge 2017-05-16 12:09:29 +02:00
Jack Jenkins
76027bc9c7 Limit login box width 2017-05-15 20:04:03 +01: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
4205213c3c
Make the notification icon cleaner 2017-05-02 17:47:36 -04:00
Dane Everitt
c9c0e845b1
Go nuclear on Safari's autocomplete. 2017-05-01 16:41:39 -04:00
Dane Everitt
801aae968c
Show git version if panel is installed with git 2017-04-27 22:28:01 -04:00
Dane Everitt
c8f1335a09
Fixup merge 2017-04-20 17:26:20 -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
eeeb4b7580
Update route javascript file. 2017-04-15 17:18:12 -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
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
482bf4804d
Catch potential undefined result. 2017-03-31 23:37:46 -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
75119611b9
Update API settings page to display checkboxes correctly. 2017-03-31 21:46:40 -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
Jakob Schrettenbrunner
887e48aeb3 console: only flush once, not with every message 2017-03-19 16:18:31 +01:00
Dane Everitt
377fe92f5b
Don't try to render 200 lines per second in the console... 💣
Corrects a math mistake on my end, and makes the console speed
configurable again. Now sends 50 messages per second.

Console will notify when being throttled, and refreshing the page will
clear the queue if necessary.
2017-03-19 11:13:17 -04:00
Dane Everitt
c484bb6b2f
Move and delete JS and such so that themes are cleaner 2017-03-18 19:03:25 -04:00
Jakob Schrettenbrunner
f410efa866 add favicons for everything 2017-03-18 21:57:12 +01:00
Dane Everitt
0c6e6f39fe
Fix multiple clients causing all consoles to refresh 2017-03-17 19:05:54 -04:00
Dane Everitt
d5352e2b1e
Adjust filemanager display 2017-03-17 16:20:27 -04:00
Dane Everitt
34d5e81b7a
Fix new server page display 2017-03-16 20:29:48 -04:00
Dane Everitt
50558db7c3
Add initial pack creation and overview pages 2017-03-14 21:18:36 -04: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
Dane Everitt
5c32a91200
JS code updates 2017-03-05 00:04:26 -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
Jakob Schrettenbrunner
b91e3d95f8 fix revealing module and jquery3 of 2fa-modal 2017-03-03 23:42:58 +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
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
911434d033 Only apache could manage to do something this ridiculous 2017-02-18 12:47:49 -05:00
Dane Everitt
99497adcb2
Show proper server status when viewing listing.
closes #308
2017-02-17 20:34:57 -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
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
c8ae776ab8
Fix settings redirection for server 2017-02-16 14:04:15 -05:00
Dane Everitt
516e2dc5ee
Add back API key deletion 2017-02-16 12:57:48 -05:00
Dane Everitt
19d352619e
More singularization and correct file names. 2017-02-12 16:03:17 -05:00
Dane Everitt
8ba479e51f
Singularize model names. 2017-02-12 16:02:23 -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
Jakob Schrettenbrunner
d9225e65df move phraseapp js into own file 2017-02-02 15:30:40 +01:00
Dane Everitt
a1a81ac980
Fix auth page not remembering users. 2017-02-01 22:28:50 -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
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
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
5f1bfcf980
Much cleaner code for updating user details front-end 2017-01-22 16:16:43 -05:00
Dane Everitt
fa0f32584e
Update laroute 2017-01-21 15:44:06 -05:00
Dane Everitt
0e23f87724
Add task management views 2017-01-21 15:40:46 -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
6149400ced
prevent accidentally leaving the page when uploading file 2017-01-19 22:22:11 -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
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
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
d223a224cd
Update socketio and file upload.
Should address #231
2017-01-14 13:43:40 -05:00
Dane Everitt
6bd9663f59
Merge branch 'develop' into feature/service-changes 2017-01-12 13:15:37 -05:00
Dane Everitt
2e33b9c4e4
Revert "Select the whole field when renaming a file."
This reverts commit b8b0e0bdf9.
2017-01-03 17:39:28 -05:00
Dane Everitt
b8b0e0bdf9
Select the whole field when renaming a file. 2017-01-03 17:37:43 -05:00
Dane Everitt
130aa6cc8a
Transpile ES6 to ES5 for filemanager. Closes #224 2017-01-03 17:32:23 -05:00
Dane Everitt
aa6e733ba5
Switch filemanager and EULA check to use pure Javascript methods
Removes the need for the javascript to be parsed by Blade template
engine by using a defined javascript variable with the values that are
necessary for checking everything and passing the correct values.

This does make it so that if a user does not have permission to do
something they could theoretically make the option show up in the
context menu, however when they click it, it will simply return an
error by the daemon.
2017-01-03 16:47:33 -05:00
Dane Everitt
fc38b09e1f
Merge branch 'develop' into feature/service-changes 2016-12-14 16:53:53 -05:00
Jakob Schrettenbrunner
d844c4135c update jquery.terminal to v0.11.23
set new scrollBottomOffset to 5 to hopefully resolve issues with chrome
2016-12-10 13:51:07 +01:00
Jakob Schrettenbrunner
c80c6714a1 add small notification to terminal if new invisible output is available 2016-12-10 00:17:23 +01:00
Jakob Schrettenbrunner
2a101c0ffd update to jquery terminal v0.11.22 2016-12-09 23:50:22 +01:00
Dane Everitt
c1fb0a665f Apply fixes from StyleCI 2016-12-07 22:46:38 +00:00
Dane Everitt
9eb14614c2
Merge branch 'develop' into feature/service-changes 2016-11-27 14:01:13 -05:00
Dane Everitt
e47bb6ef0f
Add multiplicators to certain inputs, closes #154
Allows for users to enter `10g` into a memory field and have it
converted to 10GB equivalent in MB.
2016-11-26 19:56:19 -05:00
Dane Everitt
a1bc6fa2d3
Push changes that support creations of service packs and basic listing 2016-11-15 20:20:32 -05:00
Dane Everitt
9ea88b5053
Fix checkboxes not displaying checkmarks, closes #162 2016-11-04 21:41:56 -04:00
Dane Everitt
0741ab6833
Revamped resource graphing, uses chart.js 2016-10-30 00:06:55 -04:00
Dane Everitt
51c07bf1f2
🎉 Add support for uploading files from file listing! 🎉
closes #22
2016-10-28 18:21:12 -04:00
Dane Everitt
045864aa96
Prevent accidental DoS of users if server sends a rapid feed of data to the console.
Configurable speed in environment file.
2016-10-23 21:31:29 -04:00
Dane Everitt
bef717b202
add typeahead support for owner email when adding new server
closes #144
pic: http://s3.pterodactyl.io/UpPSJ.png
2016-10-21 15:22:47 -04:00
Dane Everitt
53ec2c55ec
Add front-end support for adding and deleting API keys. 2016-10-20 18:20:58 -04:00
Dane Everitt
745c735b32
Add initial basic API changes
New route is `/api/me`
2016-10-14 20:22:23 -04:00
Dane Everitt
20db3f9058
Fixes bug in socket.io file upload using unix epoch 2016-10-14 14:55:20 -04:00
Dane Everitt
e5ffb15020
Add support for new file upload mechanics 2016-10-13 21:03:49 -04:00
Dane Everitt
1958af1635
Update Socket.io dependency to latest version 2016-10-07 16:47:49 -04:00
Dane Everitt
0fe0f750c4
node status in list, closes #124 2016-10-07 15:15:04 -04:00
Dane Everitt
a43ba2421d
Add fuelux fonts back 2016-10-06 19:59:11 -04:00
Dane Everitt
956e9279d3
fixed width icons 2016-10-06 19:48:51 -04:00
Dane Everitt
c36f7f85f1
Reduces file right-click menu size 2016-10-06 19:44:01 -04:00
Dane Everitt
9c7b753576
Complete code for new file manager 2016-10-04 21:38:22 -04:00
Dane Everitt
4bcab0519c
Update files to match js/css vendor changes 2016-10-03 13:18:48 -04:00
Dane Everitt
fb4d122a2a
More updates to file manager
Not doing individual commits for this, tons of changes for tons of
different aspects across multiple files.
2016-10-01 23:09:55 -04:00
Dane Everitt
fe9c573533
add ace editor files 2016-10-01 23:06:04 -04:00
Dane Everitt
3dbe89969e
Use existing CSS class 2016-10-01 14:33:51 -04:00
Dane Everitt
332da79b89
Move assets around into vendor dir 2016-09-30 20:35:27 -04:00
Dane Everitt
831399184f
clean up front-end port allocation handling 2016-09-30 18:21:02 -04:00
Dane Everitt
a9d0b4a4fe
Add support for setting IP aliases though panel 2016-09-29 21:34:20 -04:00
Dane Everitt
a787e99f88 Add a better console page 2016-09-16 15:48:17 -04:00
Dane Everitt
67d9f9f4ab Improve scheduled task layout and data handling 2016-03-18 16:23:10 -04:00
Dane Everitt
8190f08b75 Move to async lib for processing cpu data
Still doesn’t fix the page lag which seems to be due to the rendering
of the graphs.
2016-02-25 23:57:53 -05:00
Dane Everitt
82a43bbf15 update jquery 2016-02-25 23:57:23 -05:00
Dane Everitt
2f0883cfc7 add versions to header 2016-02-06 13:38:59 -05:00
Dane Everitt
aa54e657e1 Change graphing library for node view
Server view coming soon
2016-02-06 01:29:24 -05:00
Dane Everitt
c4007dcf57 Update to correct version of fontawesome 2016-02-05 23:47:58 -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
Dane Everitt
40c68a5391 Add title to copyright 2016-01-20 16:05:16 -05:00
Dane Everitt
026df6a36f Relicense project under MIT
Permission obtained from @DDynamic. Contributions from other users were
removed since we did not obtain permission from them for the re-license.

From this point forward all contributors must have a signed Contributor
License Agreement on file.
2016-01-20 15:56:40 -05:00
Dane Everitt
3e595ca856 Add API Management to admin CP 2016-01-16 19:56:48 -05:00
Dane Everitt
d9a48f17cf spacing fixes and add glyphicons 2016-01-16 17:08:02 -05:00
Dane Everitt
1d97b0be98 Add support for modification of server startup variables and command 2016-01-10 18:57:22 -05:00