bobsfriend12
e76ba70d88
get rid of cache
2023-07-29 16:05:27 -05:00
bobsfriend12
86960b7c9f
fix lint issues
2023-07-29 16:01:29 -05:00
bobsfriend12
cd3bb23808
get rid of offline
2023-07-05 15:41:17 -05:00
bobsfriend12
7f8feb8591
get rid of errors in console log
2023-07-05 15:34:35 -05:00
Iain Powrie
2a1fb3bde8
Merge branch 'bugfix/public-status-config' into 'dev'
...
Fix text for public status page
See merge request crafty-controller/crafty-4!602
2023-07-01 12:28:53 +00:00
Zedifus
8af726cd79
Update changelog !602
2023-07-01 13:22:19 +01:00
Zedifus
4c66752924
Merge branch 'dev' into bugfix/public-status-config
2023-07-01 13:20:48 +01:00
Iain Powrie
01a4f2ea74
Update changelog !604
2023-06-24 15:39:38 +00:00
Iain Powrie
749b3e60ca
Merge branch 'bugfix/add-tzdata-to-docker-image' into 'dev'
...
Include tzdata in Docker image
See merge request crafty-controller/crafty-4!604
2023-06-24 15:13:32 +00:00
Peter Szabo
a5668ff7da
apt-get install tzdata in Dockerfile
2023-06-24 15:46:06 +02:00
amcmanu3
e5e5d529ae
Fix text for public status page
2023-06-19 20:28:36 -04:00
Zedifus
653397883d
Update missing items from dockerignore
...
Including new sonarsource properties file
2023-06-18 21:22:43 +01:00
Zedifus
e5f65a5a6e
Bump SQ proj version for dev
2023-06-18 20:59:18 +01:00
Zedifus
0d66b90ca6
Configure sonarcloud
2023-06-18 20:46:18 +01:00
Zedifus
cd389f1202
Add SonarCloud CQ
2023-06-18 20:29:23 +01:00
Zedifus
5de11aec9a
Prepare 4.1.3 release base
2023-06-18 19:07:19 +01:00
Zedifus
f95632e06f
Close changelog 4.1.2
2023-06-18 18:32:09 +01:00
Iain Powrie
cbbf3a5c55
Merge branch 'tweak/bump-requests-245' into 'dev'
...
Bump requests to 2.31
See merge request crafty-controller/crafty-4!600
2023-06-18 17:08:16 +00:00
Zedifus
d008cc616b
Update changelog !599
...
Missing from MR
2023-06-18 17:56:07 +01:00
Iain Powrie
d02f9d0b87
Merge branch 'bugfix/management' into 'dev'
...
Add autofield to appease linter
See merge request crafty-controller/crafty-4!599
2023-06-18 16:42:34 +00:00
Zedifus
4227b114b3
Update changelog !600
2023-06-18 17:14:01 +01:00
Zedifus
b1b048cb85
Bump requests to 2.31
...
Resolves `CVE-2023-32681`
Issue #245
2023-06-18 17:08:50 +01:00
Andrew
6f506eecbd
Add autofield to appease linter
2023-06-18 11:09:00 -04:00
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
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
