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
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
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
0ac3f15b8b
Start working on the file explorer UI. W.I.P. 🚧
2020-12-12 01:59:52 +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
6ea66c37f5
adding GUI / routing for users admin (eventually roles will be here as well)
2020-12-06 15:42:49 -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
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
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
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
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
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
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