Commit Graph

3062 Commits

Author SHA1 Message Date
Zedifus
3673134048 Update changelog !596
Missed from MR
2023-06-18 15:44:02 +01:00
Zedifus
dfe8cd5cd8 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2023-06-18 15:36:57 +01:00
Zedifus
c303ca4012 Update overgeneral-exceptions
Fixes deprecation warning:

pylint: Command line or configuration file:1: UserWarning: Specifying exception names in the overgeneral-exceptions option without module name is deprecated and support for it will be removed in pylint 3.0. Use fully qualified name (maybe 'builtins.BaseException' ?) instead.
2023-06-18 15:36:49 +01:00
Iain Powrie
5d109f2fa0 Merge branch 'lang/es-pl' into 'dev'
Update es_ES & pl_PL lang

See merge request crafty-controller/crafty-4!597
2023-06-18 14:26:04 +00:00
Iain Powrie
fda691ecac Merge branch 'tweak/bump-crypto-openssl' into 'dev'
Bump cryptography & pyOpenSSL

See merge request crafty-controller/crafty-4!596
2023-06-18 13:56:58 +00:00
Zedifus
cf01524fda Update changelog !597 2023-06-18 14:46:51 +01:00
Zedifus
dc33253a7f Update pl_PL lang
Thanks to discord user `terrariadlc`
2023-06-18 14:37:33 +01:00
Zedifus
cfee0a538b Update es_ES lang
Thanks to discord user `.lucyy_`, Welcome back!
2023-06-18 14:35:32 +01:00
Iain Powrie
d6198dba11 Merge branch 'tweak/serverjars-bedrock' into 'dev'
Remove bedrock servers in serverjars options

See merge request crafty-controller/crafty-4!595
2023-06-18 13:21:07 +00:00
Zedifus
498b939335 Update changelog !595 2023-06-18 14:10:12 +01:00
Zedifus
1fd4a50828 Merge branch 'dev' into tweak/serverjars-bedrock 2023-06-18 14:04:10 +01:00
Zedifus
36e15bd898 Bump cryptography & pyOpenSSL
Resolves: https://github.com/advisories/GHSA-5cpq-8wj7-hf2v
2023-06-18 13:46:26 +01:00
Iain Powrie
ec7eede62b Merge branch 'refactor/players-management' into 'dev'
Optimize player management page

See merge request crafty-controller/crafty-4!593
2023-06-18 12:12:46 +00:00
Zedifus
3755c19411 Update changelog !593 2023-06-18 12:58:48 +01:00
amcmanu3
f52635cab6 Fix format on serverjars warning 2023-06-14 19:19:10 -04:00
amcmanu3
73d2788aa0 Refactor all items using in_path for windows comp 2023-06-14 18:57:15 -04:00
Andrew
fd95abdf42 Remove bedrock servers in serverjars options 2023-06-06 20:44:59 -04:00
amcmanu3
be5183260e Fix banned players formatting 2023-05-30 14:06:41 -04:00
amcmanu3
9cb3b6829d Fix formatting / enable dynamic loading 2023-05-30 00:02:11 -04:00
amcmanu3
88fe3146da Remove seconds from date/time 2023-05-30 00:01:54 -04:00
amcmanu3
a04771df34 Use a cache for players instead of reading file 2023-05-29 19:34:40 -04:00
Iain Powrie
91a81095b4 Merge branch 'bugfix/task-command' into 'dev'
command_server on new custom task

See merge request crafty-controller/crafty-4!592
2023-05-29 21:06:04 +00:00
Zedifus
4155d07cc8 Update changelog !592 2023-05-29 22:01:03 +01:00
Zedifus
56d6b3b3cd Merge branch 'dev' into bugfix/task-command 2023-05-29 21:47:35 +01:00
Iain Powrie
30d7c649ce Merge branch 'critical/CVE-2023-28370' into 'dev'
Critical/cve 2023 28370

See merge request crafty-controller/crafty-4!591
2023-05-29 20:44:36 +00:00
Zedifus
e9126f3375 Update changelog !591 2023-05-29 21:37:37 +01:00
Zedifus
2ea4012438 Merge branch 'dev' into critical/CVE-2023-28370 2023-05-29 21:36:17 +01:00
Iain Powrie
69eff7ffe8 Merge branch 'bugfix/zip-upload' into 'dev'
Fix upload root files being hidden

See merge request crafty-controller/crafty-4!590
2023-05-29 20:34:16 +00:00
Zedifus
4484283a8f Update changelog !590 2023-05-29 21:31:10 +01:00
Zedifus
b8192900c2 Merge branch 'dev' into bugfix/zip-upload 2023-05-29 21:29:36 +01:00
Iain Powrie
e3efb2c47f Merge branch 'tweak/player-cache' into 'dev'
Send empty json for no banned/cached players

See merge request crafty-controller/crafty-4!589
2023-05-29 20:26:09 +00:00
Zedifus
79a4b86496 Update changelog !589 2023-05-29 21:17:46 +01:00
Andrew
4243c0fa94 remove scrollbars 2023-05-27 14:01:46 -04:00
Andrew
8aeea1bd49 Fix schedule custom commands 2023-05-27 13:57:26 -04:00
amcmanu3
fb1a0d9041 Bump Tornado to 6.3.2 2023-05-26 18:00:33 -04:00
Andrew
a6d30d7242 Fix upload root files being hidden 2023-05-25 00:23:15 -04:00
Andrew
898744c39e Remove old server commands
Fix spelling
2023-05-23 19:56:41 -04:00
Andrew
178aba63dd Send empty json for no banned/cached players 2023-05-23 18:21:04 -04:00
Zedifus
993ba24b6b Prepare 4.1.2 release base 2023-05-23 03:09:47 +01:00
Iain Powrie
7207ac5339 Merge branch 'dev' into 'master'
v4.1.1

See merge request crafty-controller/crafty-4!588
2023-05-23 01:52:35 +00:00
Zedifus
e7498fdacc Close changelog 4.1.1 2023-05-23 02:42:03 +01:00
Iain Powrie
657d6fce00 Merge branch 'tweak/server-jars-credit' into 'dev'
Improve creation page errors / Server Jars Credit

See merge request crafty-controller/crafty-4!587
2023-05-23 01:16:04 +00:00
Zedifus
10ab029cd1 Update changelog !587 2023-05-23 02:09:21 +01:00
amcmanu3
fe2724d350 Set bedrock availablity to true always for now :) 2023-05-22 21:03:29 -04:00
amcmanu3
438564fe0a Merge branch 'dev' into tweak/server-jars-credit 2023-05-22 21:02:36 -04:00
Iain Powrie
dfef879ef4 Merge branch 'bugfix/task-scheduling' into 'dev'
Add command to default actions

See merge request crafty-controller/crafty-4!586
2023-05-23 00:20:23 +00:00
Zedifus
e013dcc97e Update changelog !586 2023-05-23 01:16:53 +01:00
Zedifus
da697be719 Merge branch 'dev' into bugfix/task-scheduling 2023-05-23 01:15:32 +01:00
Iain Powrie
ad37aa319c Merge branch 'tweak/improve-display' into 'dev'
Tweak/improve display

See merge request crafty-controller/crafty-4!547
2023-05-23 00:11:56 +00:00
Zedifus
8141e13f0d Update changelog !547 2023-05-23 01:09:02 +01:00