Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,036 Commits 12 Branches 45 Tags 104 MiB
60d3ee1aa8
Commit Graph

2707 Commits

Author SHA1 Message Date
Phillip Tarrant
c154f316b7 Merge branch 'lukas-development' into 'dev' 
File Manager

See merge request crafty-controller/crafty-commander!19
 2021-01-19 12:28:58 +00:00
LukasDoesDev
7e0f592330 Delete code that will crash and change a bit of logging in websocket_handler.py 2021-01-18 21:34:29 +02:00
LukasDoesDev
e9dc45eeda Add auth requirement to AJAX handlers 2021-01-18 17:02:38 +02:00
LukasDoesDev
e3a359bbc6 File Manager: DONE 2021-01-17 19:20:28 +02:00
LukasDoesDev
eb06f1b33b Now can edit files. Also fixed a bunch of bugs. 2021-01-15 21:59:58 +02:00
LukasDoesDev
75fb8fc920 (Maybe) fix potential code injection attack 2021-01-15 14:33:17 +02:00
LukasDoesDev
eba7bff050 Now can see a tree view of the directory the server is in. Will do file editing now. 2021-01-15 14:13:06 +02:00
LukasDoesDev
c08751c7f8 FILES: Got everything working except Tornado seems to escape my HTML output, works if you set the output to the DOM and run the script below it. 2021-01-15 00:55:14 +02:00
Phillip Tarrant
30b65d0d48 Merge branch 'macgeek_issue10' into 'dev' 
WSL Fix, issue 10

See merge request crafty-controller/crafty-commander!17
 2021-01-14 14:56:51 +00:00
Phillip Tarrant
0c5d11c780 Merge branch 'issue_8' into 'dev' 
Time improvements, Issue 8

See merge request crafty-controller/crafty-commander!16
 2021-01-14 14:56:15 +00:00
LukasDoesDev
9e66f46c2e 2 bug fixes 
1st: Footer had padding in credits.html, caused by missing closing div tag.
2nd: Java VM errors when memory is a float. Server wizard should convert from gigabytes to megabytes (Trello card)
 2021-01-13 16:48:04 +02:00
LukasDoesDev
6a253971e7 Add error when JavaScript isn't enabled 2021-01-11 21:51:38 +02:00
LukasDoesDev
2523e2e198 Fix error when server is offline, change "Not calculated yet" to "Error Calculating", remove unnecessary logging, make a loop, and fix durationToHumanizedString output number types having s's even though the number is 1 or -1. 2020-12-31 19:41:02 +02:00
computergeek125
8131cfd396 Added skeleton role manager 2020-12-27 11:00:26 -05:00
computergeek125
d91361efa5 Updated user manager to support server selection 2020-12-25 22:00:28 -05:00
computergeek125
8bba57d950 Added exception handler if the initial request fails 2020-12-25 15:40:55 -05:00
computergeek125
cf61c3c931 Skeleton user manager added 2020-12-24 17:55:15 -05:00
LukasDoesDev
8ce4491a01 Add ThatOneLukas to credits.html 2020-12-23 17:16:42 +02:00
computergeek125
7ddcdd4e0e Removed execute bit on a few files 2020-12-20 11:40:25 -05:00
computergeek125
1239822761 Fixed logic inversion that resolves #10 2020-12-19 08:44:04 -05:00
computergeek125
d30cbb8563 Merge branch 'macgeek_wslfix' into dev 2020-12-19 08:41:36 -05:00
computergeek125
8795a1eaf5 Fixed crash on CPU speed reading for certain systems 2020-12-19 08:39:31 -05:00
LukasDoesDev
8cd2d59230 Websockets.. Work in progress! 
websocket.html is just a blank page with the newest javascript helpers
threading working wonderfully! Except my own code.
websocket.html and thte bit from panel_handler.py can be deleted once this is done. It was just because the css and js kept loading for super long
 2020-12-17 15:39:29 +02:00
LukasDoesDev
359a2e1c42 Now server started shows browser time, not server time. 2020-12-16 01:17:41 +02:00
LukasDoesDev
4c9f947aa1 Rework #8 2020-12-14 23:52:46 +02:00
LukasDoesDev
c13c1ab365 #8 2020-12-14 17:59:59 +02:00
Phillip Tarrant
fb763335d1 removed datatables from vendors as it's outdated and going to use CDN 
added activity logs page
added db_helper method to return rows from db as a dict object.
this is work for issue 9
 2020-12-13 13:42:49 -05:00
Phillip Tarrant
fc51cd088c expanding gitignore to include app/config 2020-12-13 12:27:37 -05:00
Phillip Tarrant
d97712b174 Merge branch 'issue_6' into 'dev' 
Fix Issue 6

See merge request crafty-controller/crafty-commander!12
 2020-12-13 17:24:17 +00:00
MCgamin1738
58b63cb9a4 Add Permissions Check To Import From Zip 2020-12-12 19:35:41 +00:00
MCgamin1738
f59328e4f1 Adding Support For Importing Servers From Zip Files 2020-12-12 17:54:10 +00:00
LukasDoesDev
eb1b28473f See issue #6 2020-12-12 18:44:40 +02:00
LukasDoesDev
0ac3f15b8b Start working on the file explorer UI. W.I.P. 🚧 2020-12-12 01:59:52 +02:00
LukasDoesDev
99b04dbca1 Login looks a tiny bit better :) 2020-12-12 01:57:39 +02:00
MCgamin1738
7acb044bd8 Fixing SEC_ERROR_REUSED_ISSUER_AND_SERIAL 2020-12-11 19:08:09 +00:00
Phillip Tarrant
1542f2559a adding creation of app/config/db directory to helper so if it's not there,it will be created 
bug introduced by commit 102f63c7
 2020-12-11 10:14:48 -05:00
Phillip Tarrant
5270bdcc3d Merge branch 'issue_4_server_cascade' into 'dev' 
patches for issue #4:

See merge request crafty-controller/crafty-commander!8
 2020-12-11 14:56:11 +00:00
Phillip Tarrant
6b686c5b47 patches for issue #4: 
biggest issue causing the cascade was building crash detection in check_running method
that method is called everywhere, so when called (sometimes 5 times at the same time) it tries to restart the server over and over
i created a new detect_crash method that will now look for crashes and removed all crash detection from check_running method
also added the remove_watcher_thread method to remove the old scheduled task watching the older server.
 2020-12-11 09:52:36 -05:00
MCgamin1738
102f63c771 Move session.lock, Database And config.json To Config Folder 2020-12-11 12:59:48 +00:00
Phillip Tarrant
688117ec87 merging master with dev 2020-12-11 07:47:31 -05:00
LukasDoesDev
167f31b293 Make the action buttons in the dash server list use the pointer cursor. 2020-12-10 22:38:44 +02:00
LukasDoesDev
3563deae6a Add spacing below CPU and Memory indicators in dashboard.html. 
https://imgur.com/a/D614Ftt
 2020-12-10 21:53:03 +02:00
LukasDoesDev
cc0c036f79 Change main scrollbar colors. (Only for Firefox) 
Example: https://imgur.com/a/pjJ0wuL
 2020-12-09 23:10:52 +02:00
LukasDoesDev
4c3c0eb16b Contribute page title changed. 2020-12-09 17:55:30 +02:00
Phillip Tarrant
6ea66c37f5 adding GUI / routing for users admin (eventually roles will be here as well) 2020-12-06 15:42:49 -05:00
Phillip Tarrant
192922159f version bump 2020-12-01 11:11:40 -05:00
Phillip Tarrant
10bd7a74c9 fixed issue where server settings don't get reloaded when changing server config without restarting crafty. Now server settings get repulled from DB after writing new settings on config change 2020-10-07 09:19:47 -04:00
Phillip Tarrant
9e6ba7ba03 Merge branch 'master' into dev 2020-09-24 12:02:02 -04:00
Pita Bread
0cd60cc9f0 Update credits.html with new and improved grammer! 2020-09-24 01:37:18 +00:00
Phillip Tarrant
d792a2dae6 edited ultrablacks bio 2020-09-23 15:58:15 -04:00
Phillip Tarrant
43ad169aa9 removing print from update 2020-09-23 08:49:19 -04:00
Phillip Tarrant
6951d7cc8a fixed IP not updating, fixed usernames being case sensitive in update query 2020-09-22 23:26:23 -04:00
Phillip Tarrant
635bef867b adding todo: for version data 2020-09-22 21:43:22 -04:00
Phillip Tarrant
7f090b928f changed notify icon - added code to grab remote json from craftycontrol.com for announcements and such - icon turns red if update available 2020-09-22 21:42:41 -04:00
Phillip Tarrant
09a74ef188 polishing menu, removing a few things, modified the admin profile some 2020-09-22 18:23:14 -04:00
Phillip Tarrant
8e2010af75 added version to bottom of pages 2020-09-22 16:17:17 -04:00
Phillip Tarrant
2eeee9d6c4 fixed bug where tables/default settings were firing each restart 2020-09-22 15:00:05 -04:00
Phillip Tarrant
c896a12b17 Added server_ip to DB, also removed 
max_stats_count as it's not needed
 2020-09-22 12:11:16 -04:00
Phillip Tarrant
7657b77785 adding virtual console ajax to actually send the command 2020-09-21 22:01:16 -04:00
Andrew
6a2b983108 Added term-nav-item class and applied padding. Fixes spacing on nav-item classes on Dashboard 2020-09-17 21:09:19 -04:00
Phillip Tarrant
f670280f6d Fixing mobile user dropdown 2020-09-17 18:49:08 -04:00
Andrew McManus
d9bf82c56f Added independent line for .nav-item. Added padding to nav-item class to fix mobile scaling issue on terminal navigation (This does not appear to break anything else). 2020-09-17 22:20:08 +00:00
Andrew McManus
27ff5427dc Reverting changes 2020-09-17 22:18:14 +00:00
Andrew McManus
5d93683168 Added padding to help fix list layout on mobile. 2020-09-17 21:57:51 +00:00
Andrew McManus
acff9d5cfe Added class "nav-item" to Stop Refresh list item 2020-09-17 21:55:00 +00:00
Phillip Tarrant
90ca5c151f import server code done 2020-09-14 16:01:38 -04:00
Phillip Tarrant
f96649613f did some refactoring on loading of servers, fixed bug where server object would be forgotten when new server added 2020-09-14 14:05:17 -04:00
Phillip Tarrant
fbc8e7fc2a fixed broken return / redirect after downloading jar and adding server 2020-09-10 12:03:18 -04:00
Phillip Tarrant
66d7c6f10a Refactored the server add outside of serverjars.py (since it's going away). Also made it more flexible since we are doing more than just jars now 2020-09-10 11:01:57 -04:00
kevdagoat
e6bf64a41f working statistics api route 2020-09-06 12:58:17 +08:00
kevdagoat
1f184d3e94 fix future fustration :) 2020-09-06 12:37:56 +08:00
kevdagoat
8c36ddad84 add api base handler 2020-09-06 12:13:42 +08:00
Phillip Tarrant
d7fabb3da8 fixed crash detection / auto start checkboxes - found huge issue with crash detection. putting on bug list for later 2020-09-04 14:05:42 -04:00
Phillip Tarrant
568e1e8f41 finished server config page v1 - wanna add more later, but that's for alter 2020-09-04 12:35:06 -04:00
Phillip Tarrant
77021a5c0b starting server config tab 2020-09-04 00:02:03 -04:00
Phillip Tarrant
9ded6a1a4b added max_log_lines to config.json, added server_logs subpage, split server details top part to it's own include 2020-09-03 22:49:20 -04:00
Phillip Tarrant
adf8d3f51a many new things, 
regexit sub function created
virtual console now has colors
fixed error with login function auditing None instead of 0
other things I can't remember atm
 2020-09-01 21:30:39 -04:00
Phillip Tarrant
ab1772397d added version string to page footer 
created/working on server details subpages.
added "may take a few seconds" to cmd
error page is now available to panel
created server_id_exists function
more error checking around database returns from db_helper
starting styling / backend for virtual terminal
 2020-09-01 13:29:39 -04:00
Phillip Tarrant
c5bf170a33 added audit logging, and commands logging, command handler and other stuff 2020-08-31 16:16:45 -04:00
Phillip Tarrant
d1906751e5 Moved server to shared in prep for plugins 2020-08-31 13:53:46 -04:00
Phillip Tarrant
d6c894c3d9 Creation of Command model, moved controler to shared in prep for plugins 2020-08-31 13:46:25 -04:00
Phillip Tarrant
79532ffc6b fixing merge conflict 2020-08-31 11:30:41 -04:00
Phillip Tarrant
c7e28e5b77 fixed server id not being correct for stop/restart on dashboard 2020-08-31 11:29:32 -04:00
kevdagoat
3d5f6828c0 fix setup wizard bug 2020-08-30 16:41:12 +08:00
Phillip Tarrant
f0618b073b finished credits and contribute section - with setting to disable contribute link 2020-08-28 14:38:42 -04:00
Phillip Tarrant
c829d495de Worked on dashboard - made a blank page template - started credits page 2020-08-27 23:21:55 -04:00
Phillip Tarrant
9b43ef47fe adding colors to dashboard based on cpu/mem load 2020-08-27 20:01:41 -04:00
Phillip Tarrant
8ddbfbf173 Added mobile help message for dashboard left/right slid 2020-08-27 19:55:55 -04:00
Phillip Tarrant
cbb4ac72cc added command prompt, changed main loop to our do_exit in cmd 2020-08-27 18:53:04 -04:00
Phillip Tarrant
14f05f6946 fixed server_port bug in server builder 2020-08-27 18:36:18 -04:00
Phillip Tarrant
119a606b93 adding refresh to dashboard 2020-08-27 18:35:08 -04:00
Phillip Tarrant
d2d403e144 complete rewrite of stats pulling, fixed default.json, changed the config file and handling 2020-08-27 18:30:56 -04:00
Phillip Tarrant
59ebe1202c adding requirements and default.json.example - also did some css fu 2020-08-26 10:25:20 -04:00
Phillip Tarrant
637407cc78 adding memory percent 2020-08-25 09:29:11 -04:00
Phillip Tarrant
7d91c9b636 fixed delay in stats recording on load 2020-08-24 19:16:33 -04:00
Phillip Tarrant
d0720958f9 Error handling if server was deleted without crafty knowing 
start/stop server functions complete
expanding out online/max/motd etc in db for easier parsing
fixed issue of servers loosing their name from 3.2
finished restart button
added fontawesome 5
 2020-08-24 19:11:17 -04:00
Phillip Tarrant
a958b6dea0 populating dashboard with real data 2020-08-24 13:08:17 -04:00
Phillip Tarrant
a0fcda018c Fixed errand print statement 
Re-init all servers when adding a server
server builder tested well. Next is importing a server
 2020-08-23 22:17:36 -04:00
Phillip Tarrant
6ec2f1c6ac part 1 of the server builder complete 2020-08-23 18:43:28 -04:00
Phillip Tarrant
a6c1a885d6 finished redirect woes, adding server handler, made 404 and default pages pretty 2020-08-19 13:54:10 -04:00
Phillip Tarrant
81d5ff05e8 fixed endless redirect issue on non-existant paths 2020-08-19 13:21:19 -04:00
Phillip Tarrant
de98e5727c Implimenting default.json search for user/pass creation 2020-08-18 21:50:24 -04:00
Phillip Tarrant
203441045f Added crafty specific stuff to config.ini 2020-08-18 21:04:43 -04:00
Phillip Tarrant
ad541347af scheduler, version change, database work, controller init servers, etc etc 2020-08-16 22:47:53 -04:00
Phillip Tarrant
25affba2e6 got login working 2020-08-13 10:38:36 -04:00
Phillip Tarrant
85a69954ea building out databases and config files 2020-08-12 21:33:36 -04:00
Phillip Tarrant
2f12f95ab2 first huge commit 2020-08-11 20:36:09 -04:00