computergeek125
33e1f07fa6
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2021-04-04 09:53:10 -05:00
Andrew
49a9bd982c
Added temporary fix for index out of range execption thrown when adding a server.
2021-04-03 19:21:05 -04:00
computergeek125
976bf0ff48
should be SIGINT, not SIGTERM (CRAFTY-CONTROLLER-T-89)
2021-04-03 14:12:03 -05:00
computergeek125
d501260ef9
Updated error info per CRAFTY-CONTROLLER-T-57
2021-04-03 13:29:21 -05:00
computergeek125
f3b1d1e87d
cleaned up DB commands a bit to resolve the rest of CRAFTY-CONTROLLER-T-81
2021-04-03 13:18:43 -05:00
computergeek125
54b0578e79
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2021-04-03 12:39:25 -05:00
computergeek125
bd6eed118a
Resolves CRAFTY-CONTROLLER-T-81 - error when creating new user
...
Also cleans up the panel and server code to handle other states better
2021-04-03 12:36:01 -05:00
computergeek125
b80ba4f7ef
Merge branch 'translations' into 'dev'
...
One big monster truck merge request
See merge request crafty-controller/crafty-commander!29
2021-04-03 15:39:54 +00:00
luukas
0b3d20ffbe
One monster truck commit for
...
add translation API, add fi_FI and en_EN translations, add C and
.properties file support, check if file is binary before sending and
clean up ajax handler
2021-03-26 15:57:50 +02:00
luukas
85cb28b9ad
Fix bug where server wizard would not show
2021-03-22 10:08:58 +02:00
computergeek125
680cb1885e
Moved to semver
2021-03-22 00:05:45 -05:00
computergeek125
97558e5828
Whoops forgot to add the credits
2021-03-21 23:54:52 -05:00
computergeek125
5272756240
Merge logo swap
2021-03-21 23:50:38 -05:00
computergeek125
02a05b41c9
quickfix stats
2021-03-21 23:48:06 -05:00
computergeek125
fb08d77a80
General cleanup after merge, hopefully improved roles with backup
2021-03-21 23:44:22 -05:00
computergeek125
c5f8afebb2
whoops forgot to merge something
2021-03-21 23:35:17 -05:00
computergeek125
506c9bb3c3
Merge branch 'backups-and-stuff' into dev
2021-03-21 23:32:48 -05:00
computergeek125
da97597d52
Merge branch 'dev-Silversthorn' into dev
2021-03-21 23:24:49 -05:00
computergeek125
1d3880207f
Merge branch 'mcmanus-ping-port-patched' into dev
2021-03-21 23:23:27 -05:00
computergeek125
c690f9113e
Merge branch 'macgeek-noshell' into dev
2021-03-21 23:17:36 -05:00
computergeek125
81c60d6dac
One monster truck commit for rework and backups
2021-03-21 23:02:18 -05:00
computergeek125
12cc971c64
Whoops forgot to add the credits
2021-03-21 23:00:19 -05:00
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
computergeek125
b957d73acb
Fixed critical bug where servers were abandoned at exit
2021-03-13 09:24:17 -06:00
Andrew
287d45a1bc
Port/ip-get patched
...
Patched super user in panel_handler
2021-03-13 09:29:05 -05:00
Florian RVT
3f0d1871ff
User access to servers operating
2021-03-09 23:17:50 +01:00
Andrew
03d7cfae80
Port/ip-get patched
...
Patched super user in panel_handler
Working issue is the server doesn not reload settings from DB after value changes in table.
!!CAUTION LOTS OF PRINT STATEMENTS!!
2021-03-09 16:57:45 -05:00
Andrew
58f6949fad
Port/ip-get patched
...
Working issue is the socket will only work for 25565.
!!CAUTION LOTS OF PRINT STATEMENTS!!
2021-03-08 22:01:42 -05: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
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
