Commit Graph

3569 Commits

Author SHA1 Message Date
Zedifus
ba187374d4 Merge branch 'dev' into bugfix/no-file-error 2023-12-07 12:55:20 +00:00
Iain Powrie
a2fefcf23f Merge branch 'bugfix/superuser-password-edit' into 'dev'
Fix bug where su cannot edit general user password

See merge request crafty-controller/crafty-4!676
2023-12-07 12:44:33 +00:00
Zedifus
af3ca7aec4 Update changelog !676 2023-12-07 12:36:07 +00:00
Zedifus
7879baff75 Merge branch 'dev' into bugfix/superuser-password-edit 2023-12-07 12:34:56 +00:00
Iain Powrie
40bf180eb9 Merge branch 'lang/pl-pl-lang-update' into 'dev'
Update lang pl_PL with minor fixes

See merge request crafty-controller/crafty-4!675
2023-12-07 12:20:50 +00:00
Iain Powrie
25123bf9ec Merge branch 'sec/bump-cryptography' into 'dev'
Bump cryptography for CVE-2023-49083

See merge request crafty-controller/crafty-4!680
2023-12-07 12:11:01 +00:00
Zedifus
e37bd47806 Update changelog !680 2023-12-07 11:57:56 +00:00
Zedifus
cda2929052 Merge branch 'dev' into sec/bump-cryptography 2023-12-07 11:46:29 +00:00
Iain Powrie
bef16270fe Merge branch 'enhancement/crafty-loading' into 'dev'
Add Crafty loading screen. Refactor main.py

See merge request crafty-controller/crafty-4!668
2023-12-07 11:44:37 +00:00
Zedifus
b2035eef60 Fix sonar findings 2023-12-07 11:29:18 +00:00
Zedifus
9e54eafd50 Update changelog !668 2023-12-07 11:16:50 +00:00
amcmanu3
0d6cd5c42e Bump openSSL 2023-11-30 13:11:37 -05:00
amcmanu3
a91c3257f7 Bump cryptography for CVE-2023-49083 2023-11-30 13:04:18 -05:00
amcmanu3
09241bdc54 Appease the linter 2023-11-30 12:22:40 -05:00
amcmanu3
ca02c9d575 Add user-based translation to startup 2023-11-30 12:14:09 -05:00
amcmanu3
b60e6933dd Add broadcast to non-admin function 2023-11-30 12:12:16 -05:00
amcmanu3
fb41bc2443 Prevent stack for general user on boot 2023-11-30 01:05:00 -05:00
amcmanu3
90ed32738f Add translations 2023-11-30 00:55:26 -05:00
amcmanu3
999460f95e Del redundant statements (webserver not started)
appease the linter
2023-11-30 00:55:19 -05:00
amcmanu3
3840cc3863 Fix bug where no file error doesn't show up 2023-11-29 22:28:18 -05:00
amcmanu3
74c0e8b23a Fix bug where su cannot edit general user password 2023-11-29 21:30:29 -05:00
amcmanu3
9e98c97eb8 Merge branch 'dev' into enhancement/crafty-loading 2023-11-29 21:24:05 -05:00
amcmanu3
aa0eee68e3 Remove border line on loadup 2023-11-29 21:21:28 -05:00
amcmanu3
c13ebeaf51 Use constant variables for run mode and app path 2023-11-29 21:04:02 -05:00
amcmanu3
151f77589b Restructure main.py to be more comprehensive 2023-11-29 18:15:11 -05:00
Zedifus
7db259eb98 Update changelog !675 2023-11-25 21:26:34 +00:00
Zedifus
16f8df20ac Update lang pl_PL with minor fixes
Thanks Terrariadlc
2023-11-25 21:20:39 +00:00
Zedifus
8bad0fb0a9 Update changelog !674 2023-11-25 20:33:21 +00:00
Iain Powrie
67ed35a6b0 Merge branch 'JonathanAlKass-master-patch-25467' into 'dev'
removed ".decoder" from orjson in crafty-4/app/classes/web/routes/api/roles/index.py: line 113

See merge request crafty-controller/crafty-4!674
2023-11-25 20:20:38 +00:00
Iain Powrie
1cfe382e0e Merge branch 'bugfix/unban' into 'dev'
Fix Unban button failing to pardon users

See merge request crafty-controller/crafty-4!671
2023-11-25 20:09:36 +00:00
Zedifus
75aacda120 Update changelog !671 2023-11-25 20:01:20 +00:00
Zedifus
27135d2c93 Merge branch 'dev' into bugfix/unban 2023-11-25 20:00:11 +00:00
Iain Powrie
3a40a5af46 Merge branch 'refactor/remove-api-v1' into 'dev'
Remove API v1

See merge request crafty-controller/crafty-4!670
2023-11-25 19:56:28 +00:00
Zedifus
5882d2f10f Update changelog !670 2023-11-25 19:52:51 +00:00
Zedifus
f131ca62ff Merge branch 'dev' into refactor/remove-api-v1 2023-11-25 19:50:47 +00:00
Iain Powrie
8ddd40012c Merge branch 'critical/security' into 'dev'
Setup logging for panel authentication attempts, password requirement changes

See merge request crafty-controller/crafty-4!669
2023-11-25 19:43:15 +00:00
Zedifus
eded956053 Update changelog !669 2023-11-25 19:39:51 +00:00
Zedifus
a6aaebba88 Update changelog !669 2023-11-25 19:32:03 +00:00
Zedifus
911f373474 Merge branch 'dev' into critical/security 2023-11-25 19:29:46 +00:00
Iain Powrie
12b9b5976b Merge branch 'enhancement/server-details' into 'dev'
Retain tab when navigating back to server_details

See merge request crafty-controller/crafty-4!667
2023-11-25 19:22:18 +00:00
Zedifus
437bc1525c Update changelog !667 2023-11-25 19:17:52 +00:00
Zedifus
8f3dc4d6f2 Merge branch 'dev' into enhancement/server-details 2023-11-25 19:13:29 +00:00
Zedifus
198bca266e Update changelog !666 2023-11-25 19:10:33 +00:00
Iain Powrie
05b9812e55 Merge branch 'tweak/homogenize-logo' into 'dev'
Tweak/homogenize logo

See merge request crafty-controller/crafty-4!666
2023-11-25 19:06:52 +00:00
Iain Powrie
1921dfedb0 Merge branch 'bugfix/webhook-list' into 'dev'
Fix webhook "custom" option appearing

See merge request crafty-controller/crafty-4!664
2023-11-25 19:00:02 +00:00
Zedifus
ee4066c70c Update changelog !664 2023-11-25 18:55:49 +00:00
JonathanAlKass
62b095c38f removed ".decoder" from orjson in line 113 2023-11-21 06:30:45 +00:00
Wout Bouckaert
53b69fe0f6
Remove trailing space for pardon player command. 2023-11-11 12:21:59 -07:00
amcmanu3
98efec1417 Remove API v1 2023-11-05 15:48:43 -05:00
amcmanu3
7e18cc8d1b Schedule json dump to logfile every 5 minutes 2023-11-05 14:17:50 -05:00