Commit Graph

4035 Commits

Author SHA1 Message Date
oasis
e1fb653aa8 Changed logo-long to crafty controller image. Removed commander image. 2021-02-09 12:25:05 -05: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
Phillip Tarrant
509c801436 Merge branch 'phils_alpha2_polish' into 'dev'
Phils alpha2 polish

See merge request crafty-controller/crafty-commander!20
2021-01-20 18:54:00 +00:00
LukasDoesDev
bcaac8b9eb I think that the "remove old logs" feature is done 2021-01-20 17:20:42 +02:00
Phillip
9fb80a5062 added float_to_string for server memory configs 2021-01-19 09:17:29 -05:00
Phillip
19e4a31bf7 fixed console.debug printing - added module auto-installer 2021-01-19 08:56:00 -05: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
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
31b311980c Merge branch 'issue_9' into 'dev'
removed datatables from vendors as it's outdated and going to use CDN

See merge request crafty-controller/crafty-commander!15
2020-12-13 18:46:41 +00: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
Phillip Tarrant
b66f22b12a Merge branch 'issue_7' into 'dev'
Issue 7

See merge request crafty-controller/crafty-commander!14
2020-12-13 17:22:43 +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
MCgamin1738
414cbf6fa3 Merge branch 'SEC_ERROR_REUSED_ISSUER_AND_SERIAL' into 'dev'
Fixing SEC_ERROR_REUSED_ISSUER_AND_SERIAL

See merge request crafty-controller/crafty-commander!11
2020-12-12 09:09:02 +00: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
aab743b901 Merge branch 'dbpath_hotfix' into 'dev'
adding creation of app/config/db directory to helper so if it's not there,it will be created

See merge request crafty-controller/crafty-commander!9
2020-12-11 15:17:29 +00:00