Phillip Tarrant
33036eed92
Merge branch 'websocket' into 'dev'
...
WebSockets
See merge request crafty-controller/crafty-commander!25
2021-03-07 21:30:07 +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
computergeek125
a0448f5408
Theoretically this fixes tasks scheduler
2021-03-06 14:48:02 -06:00
luukas
458456a716
try fix merge conflict
2021-03-05 11:35:05 +02:00
luukas
06a5f4713e
fix merge conflict in tasks.py
2021-03-05 11:30:18 +02: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
37597f920f
Make sure clients are authenticated before sending messages.
...
As the system is asynchronous some messages could (?) slip through before the socket is closed when auth fails.
2021-03-01 19:33:15 +02:00
luukas
a25ad9295d
Fix typo that errors out when importing a server
2021-03-01 19:18:56 +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
58dec42078
Merge branch 'dewey-updated-logos' into 'master'
...
Changed logo-long to crafty controller image. Removed commander image.
See merge request crafty-controller/crafty-commander!24
2021-02-21 17:18:22 +00: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
computergeek125
d2c81eafe0
These are not the typos you're looking for
2021-02-13 06:02:27 +00:00
computergeek125
90465410f8
Forgot to start the process. You saw nothing
2021-02-13 06:00:28 +00:00
computergeek125
7b03dd3da4
forward-port the noshell branch from 3.x
2021-02-13 05:47:30 +00:00
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
