Commit Graph

3540 Commits

Author SHA1 Message Date
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
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
amcmanu3
ca0546a5f4 Add auth log for sessions 2023-11-05 13:46:21 -05:00
amcmanu3
bfbb130db9 Add logs to API 2023-11-05 13:33:30 -05:00
amcmanu3
e9105ffbe4 Log authentication attempts 2023-11-05 13:26:27 -05:00
amcmanu3
0dc075d147 Setup auth_tracker file 2023-11-05 13:25:52 -05:00
amcmanu3
5546118517 Remove password max length 2023-11-05 13:25:39 -05:00
amcmanu3
a5f4a68c49 Add badge to server detail pages 2023-11-05 12:06:57 -05:00
amcmanu3
ecb40ee2ec Retain tab when navigating back to server_details 2023-11-05 11:09:57 -05:00
Tinyblargon
c08795114e Recreate icons from crafty-logo-square.svg 2023-11-02 13:07:20 +00:00
Tinyblargon
99d5871827 Create svg icon from logo_long.svg 2023-11-02 13:03:36 +00:00
Andrew
d51e7e3c7d Fix webhook "custom" option appearing 2023-11-01 10:34:19 -04:00
Zedifus
ec4bcda31e Prepare 4.2.2 release base 2023-11-01 02:52:42 +00:00
Iain Powrie
46043520ba Merge branch 'dev' into 'master'
v4.2.1

See merge request crafty-controller/crafty-4!663
2023-11-01 02:48:02 +00:00
Zedifus
0a233381d6 Close changelog 4.2.1 2023-11-01 02:39:27 +00:00
Iain Powrie
fc4e4a31a0 Merge branch 'bugfix/websocket-warning' into 'dev'
Fix duplicate function naming on dashboard

See merge request crafty-controller/crafty-4!662
2023-11-01 02:29:45 +00:00
Zedifus
e5f82b8d28 Update changelog !662 2023-11-01 02:23:26 +00:00
Zedifus
9c0db7af3f Merge branch 'dev' into bugfix/websocket-warning 2023-11-01 02:20:23 +00:00
Iain Powrie
3cd19b113b Merge branch 'bugfix/user-delete' into 'dev'
Fix users not being able to be deleted.

See merge request crafty-controller/crafty-4!661
2023-11-01 01:12:39 +00:00
Zedifus
33060348cd Update changelog !661 2023-11-01 01:07:30 +00:00
Zedifus
ee067af0f4 Merge branch 'dev' into bugfix/user-delete 2023-11-01 01:04:22 +00:00
Iain Powrie
833cbaf702 Merge branch 'bugfix/notification-reset' into 'dev'
Fix notifications not showing up/being reset

See merge request crafty-controller/crafty-4!660
2023-11-01 00:52:19 +00:00
Zedifus
ec137db124 Update changelog !660 2023-11-01 00:04:30 +00:00
amcmanu3
85225cbdce Fix duplicate function naming on dashboard 2023-10-31 13:26:28 -04:00
amcmanu3
bdb3e94f41 Fix userId reference const declaration 2023-10-30 12:13:14 -04:00
amcmanu3
645542b459 Move from 418 (i am a teapot) to 424 missing dep 2023-10-29 18:49:31 -04:00
amcmanu3
76e8b01335 Fix notifications not showing up/being reset 2023-10-29 18:37:30 -04:00