Commit graph

69 commits

Author SHA1 Message Date
Dane Everitt
56640253b9
Merge branch 'release/v0.7.14' into feature/react 2019-06-22 12:28:44 -07:00
Dane Everitt
06ff76e2e9
Fix security vulnerability in file manager allowing XSS attack 2019-06-21 21:04:42 -07:00
Martin Gafert
cd7ec731dc Change Console Chart yAxes to start at 0 and calculate maximum depending on server config (#1535)
* Change Console Chart to start yAxes at 0

* Add calculation for Console Chart yAxes maximum if data is recieved

* Fix problem with calculating memory maximum
2019-05-02 12:25:03 -04:00
Dane Everitt
e87c5f6657
Implement basic support for connecting to wings console via websocket rather than socketio 2019-05-01 20:12:20 -07:00
SpiderDead
ca47c68fa3
Typo
There was a typo in the console error. reqired to required
2018-11-05 15:41:55 +01:00
Andrew DeLisa
262ef78fae Allow deletion of multiple allocations at once (#1322) 2018-09-18 21:43:18 -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
Lance Pioch
b7eed67f2f Warn users about uploading folders not working and resolve #599 (#1181) 2018-05-31 20:36:00 -07:00
Dane Everitt
545e44df4e
Update file manager code 2018-05-26 11:41:46 -07:00
Lance Pioch
c6c37e1b88 occurred 2018-05-13 11:12:25 -04:00
Dane Everitt
3a5d21f455
Filemanager cleanup 2018-03-08 21:30:07 -06:00
Dane Everitt
4964d294f6
Throw 504 where necessary 2018-03-06 22:17:01 -06:00
Dane Everitt
e7e50bc45d
Add a few new internal configs to the node config 2018-02-18 20:39:43 -06:00
Dane Everitt
800e2df6b2
Merge branch 'develop' into feature/api-v1
# Conflicts:
#	app/Contracts/Repository/RepositoryInterface.php
#	app/Repositories/Eloquent/EloquentRepository.php
#	app/Services/Nodes/NodeUpdateService.php
#	tests/Unit/Services/Nodes/NodeUpdateServiceTest.php
2018-01-10 20:55:22 -06:00
Dane Everitt
036bea2b94
Update schedule process to allow toggling/triggering via UI 2018-01-08 21:43:10 -06:00
Dane Everitt
8a38a8af4a
Update file manager to account for new API error responses 2017-12-31 10:39:07 -06:00
Dane Everitt
6b2d7b6488
If folder does not exist, reload the file manager index 2017-12-31 10:30:19 -06:00
Dane Everitt
f9df463d32
Implement a better management interface for Settings (#809) 2017-12-14 21:05:26 -06:00
Dane Everitt
897338bfa7
Show socketio error messages 2017-11-18 16:50:08 -06:00
Dane Everitt
c7c2c1a45e
Implement changes to 2FA system (#761) 2017-11-18 13:35:33 -05:00
Dane Everitt
ea71deb8a1
Merge pull request #716 from Pterodactyl/feature/code-cleanup
Cleanup code, add more unit tests, prepare for beta
2017-11-03 21:42:03 -04:00
Kağan Üstüngel
f5feb28ec1 Fix for js console causing browser to become unresponsive (#715) 2017-11-02 18:57:54 -04:00
Adam Blunt
65a36d35b7 Fix console not loading sometimes (#710) 2017-10-31 19:17:08 -04:00
Jason aka Input
b5ff41e74c Fix highlighting problem in the console. (#709) 2017-10-31 19:16:12 -04:00
Dane Everitt
e0d03513e4
Cleanup frontend controllers and middleware 2017-10-27 21:42:53 -05:00
Jakob
75c905a985 Feature/fix terminal notification (#681)
* show terminal notification on top
* show notification only when not scrolled down and new output available
* terminal: move scrolled down check outside of push loop
2017-10-18 00:24:14 -04:00
Dane Everitt
b1834307d5
Update demon routes to use /v1/ 2017-09-30 21:00:24 -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
bab28dbc85
Initial implementation of new task mgmt system 👮 2017-09-09 23:55:21 -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
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
7463bea101
fix the console rendering 🚤 2017-06-28 21:39:30 -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
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
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
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
b165f04b78
Fix up file display in sidebar as well as socket.io warnings, closes #357 2017-03-30 16:20:51 -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
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
5c32a91200
JS code updates 2017-03-05 00:04:26 -05:00
Jakob Schrettenbrunner
b91e3d95f8 fix revealing module and jquery3 of 2fa-modal 2017-03-03 23:42:58 +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