Commit Graph

233 Commits

Author SHA1 Message Date
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
b9d67459b2
Update to Laravel 5.5 (#814) 2017-12-17 13:07:38 -06:00
Dane Everitt
f9df463d32
Implement a better management interface for Settings (#809) 2017-12-14 21:05:26 -06:00
Dane Everitt
3e8514b966
Merge pull request #768 from Pterodactyl/feature/auth-controller-cleanup
Push updates to login page, mostly UI enhancements.
2017-11-18 18:00:01 -05:00
Dane Everitt
897338bfa7
Show socketio error messages 2017-11-18 16:50:08 -06:00
Dane Everitt
6f52f4a614
Push updates to login page, mostly UI enhancements. 2017-11-18 15:09:58 -06:00
Dane Everitt
c7c2c1a45e
Implement changes to 2FA system (#761) 2017-11-18 13:35:33 -05:00
Dane Everitt
4dfc7a0053
Cleanup pagination CSS and UI 2017-11-10 21:41:39 -06:00
Dane Everitt
ac2abd89e6
Fix bug listing allocations when making a new server.
closes #730
2017-11-05 14:12:53 -06: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
Dane Everitt
f98eb5904c
Merge branch 'develop' into feature/add-frontend-server-configuration 2017-10-18 22:37:23 -05:00
Dane Everitt
97dc0519d6
Add database management back to front-end and begin some refactoring
Here we go again boys...
2017-10-18 22:32:19 -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
2b80de03df
Fix sidebar dropdown not working 2017-10-17 22:23:37 -05:00
Dane Everitt
17642bffe7
More code updates 2017-10-07 17:21:41 -05:00
Dane Everitt
b1834307d5
Update demon routes to use /v1/ 2017-09-30 21:00:24 -05:00
Lance Pioch
09d958249d Add togglable 2FA user requirements (#635) 2017-09-25 15:58:16 -10:00
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