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
747 Commits 12 Branches 45 Tags 104 MiB
abb7b8af08
Commit Graph

242 Commits

Author SHA1 Message Date
Silversthorn
cd617ad5f3 Users Access to Servers from Roles Working 
Broke Users Servers Link
 2021-03-13 23:12:42 +01:00
computergeek125
c65b4a267e Staff, patreon, and translations all proceedurally generate now 2021-03-13 11:07:04 -06:00
Phillip Tarrant
653a4d6bc7 Merge branch 'admin-controls' into 'dev' 
Player controls

See merge request crafty-controller/crafty-commander!26
 2021-03-07 21:30:19 +00:00
Phillip Tarrant
85403c61af Merge branch 'dev' into 'websocket' 
# Conflicts:
#   app/classes/shared/models.py
#   app/classes/shared/tasks.py
 2021-03-07 21:29:57 +00:00
luukas
932f3586eb Change wait message for when a server is importing 2021-03-05 11:10:13 +02:00
luukas
8eb89dc131 Delete file_edit.html as it is not needed 2021-03-05 11:07:00 +02:00
luukas
031cf8cf96 Change copyright from 2020 to 2021 2021-03-05 11:05:03 +02:00
luukas
1be41b8534 Player controls 2021-03-05 10:58:38 +02:00
luukas
9c62099f32 Add authentication to WS, notify user when an activity log gets logged, and more 2021-03-01 02:54:20 +02:00
luukas
a965af5491 Remove unnecessary websocket.html 2021-02-27 14:17:37 +02:00
luukas
7be57ecfc9 Oops, forgot one thing 2021-02-27 14:07:16 +02:00
luukas
7691dc566e Finish WebSockets 2021-02-27 14:05:04 +02:00
luukas
2595e6950d Host stats are now realtime(d) by websockets 2021-02-26 17:39:35 +02:00
luukas
c6555b53e4 Change comment type from HTML to JS 2021-02-26 10:59:25 +02:00
Phillip Tarrant
92bcefa8cc Merge branch 'clone_servers' into 'dev' 
Create clone servers button/action

See merge request crafty-controller/crafty-commander!23
 2021-02-21 17:17:34 +00:00
Phillip Tarrant
96dbaf3583 Merge branch 'file_manager_polishing' into 'dev' 
File manager polishing

See merge request crafty-controller/crafty-commander!22
 2021-02-21 17:14:43 +00:00
Phillip Tarrant
abcb097cdb Merge branch 'remove-old-logs' into 'dev' 
"remove old logs" feature

See merge request crafty-controller/crafty-commander!21
 2021-02-21 17:14:03 +00:00
LukasDoesDev
ed0208ab0e Create clone servers button/action 
Can't copy while running
 2021-01-28 20:46:13 +02:00
LukasDoesDev
1bf3b381ac Add icons to file tree 2021-01-23 00:50:56 +02:00
LukasDoesDev
521eac3a83 Change "Ace" button to "Default" 2021-01-23 00:18:48 +02:00
LukasDoesDev
bf200480ce Add buttons for choosing the keyboard handler thing (Ace, Vim, Emacs, Sublime) 2021-01-23 00:12:52 +02:00
LukasDoesDev
6b2ef2c451 Remove unnecessary logs, update logs to have more information, add resizing to file editor 2021-01-20 23:10:25 +02:00
LukasDoesDev
bcaac8b9eb I think that the "remove old logs" feature is done 2021-01-20 17:20:42 +02:00
Phillip Tarrant
307d14ab77 Merge branch 'macgeek_role_manager' into 'dev' 
Basic role manager

See merge request crafty-controller/crafty-commander!18
 2021-01-19 12:29:26 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
d6c894c3d9 Creation of Command model, moved controler to shared in prep for plugins 2020-08-31 13:46:25 -04:00
Phillip Tarrant
c7e28e5b77 fixed server id not being correct for stop/restart on dashboard 2020-08-31 11:29:32 -04: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
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
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
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
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