Commit Graph

4314 Commits

Author SHA1 Message Date
Zedifus
a3ee37a8ff Bump requests to 2.32.0 for CVE-2024-35195 2024-06-23 16:18:25 +01:00
Zedifus
4ea9c75c41 Bump tornado to 6.4.1 for GHSA-753j-mpmx-qq6g & GHSA-w235-7p84-xx57 2024-06-23 16:17:55 +01:00
Iain Powrie
75f149849a Merge branch 'tweak/support-logs-threads' into 'dev'
Add a thread dump to support logs

See merge request crafty-controller/crafty-4!769
2024-06-23 15:08:51 +00:00
Zedifus
6ed23f09dd Update changelog !769 2024-06-23 16:03:07 +01:00
Zedifus
d05b986fa9 Merge branch 'dev' into tweak/support-logs-threads 2024-06-23 16:01:51 +01:00
Iain Powrie
c8d5bfb960 Merge branch 'bugfix/api-permissions' into 'dev'
Fix bug where full access gives minimal access

See merge request crafty-controller/crafty-4!768
2024-06-23 14:58:46 +00:00
Zedifus
b17347bd99 Update changelog !768 2024-06-23 15:49:29 +01:00
Zedifus
9331ad179e Merge branch 'dev' into bugfix/api-permissions 2024-06-23 15:48:05 +01:00
Zedifus
e0f2659135 Update changelog !767 2024-06-23 15:42:11 +01:00
Zedifus
40b7b2f2a1 Merge branch 'dev' into tweak/server-name 2024-06-23 15:40:42 +01:00
Iain Powrie
2253f1e812 Merge branch 'tweak/nav-label' into 'dev'
Remove navigation label from sidebar

See merge request crafty-controller/crafty-4!766
2024-06-23 14:36:02 +00:00
Zedifus
2438906be2 Update changelog !766 2024-06-23 15:32:00 +01:00
Zedifus
1a9ee2cbc1 Merge branch 'dev' into tweak/nav-label 2024-06-23 15:30:28 +01:00
Iain Powrie
2e9b7525be Merge branch 'bugfix/zip-server-creation' into 'dev'
Fix Zip Root Dir Selection

See merge request crafty-controller/crafty-4!764
2024-06-23 14:26:49 +00:00
Zedifus
ff56d8fe04 Update changelog !764 2024-06-23 15:23:19 +01:00
Zedifus
636ade7a9e Merge branch 'dev' into bugfix/zip-server-creation 2024-06-23 15:22:07 +01:00
Iain Powrie
b7830ec00b Merge branch 'tweak/default-creds' into 'dev'
Add info note to default creds file

See merge request crafty-controller/crafty-4!760
2024-06-23 14:15:12 +00:00
Zedifus
12d516a48d Update changelog !760 2024-06-23 14:55:33 +01:00
Zedifus
da97268cb3 Merge branch 'dev' into tweak/default-creds 2024-06-23 14:53:58 +01:00
Iain Powrie
5b02021478 Merge branch 'lang/additional-lang-for-4.4.0' into 'dev'
Lang/additional lang for 4.4.0

See merge request crafty-controller/crafty-4!761
2024-06-23 13:51:01 +00:00
Zedifus
af5c7aab10 Update changelog !761 2024-06-23 14:30:40 +01:00
amcmanu3
e33cf5451c Add language header translations 2024-06-22 18:44:02 -04:00
amcmanu3
ab267cfcc7 Remove outdated function 2024-06-21 14:28:03 -04:00
amcmanu3
bd73e1892a Don't allow list modifier in role name 2024-06-21 14:00:06 -04:00
amcmanu3
76c64b8ac4 Change server creation to include searchable roles 2024-06-21 13:25:07 -04:00
amcmanu3
b904430069 Ensure audit log exists 2024-06-20 17:29:35 -04:00
amcmanu3
43bd2d0444 Remove formatting 2024-06-19 13:54:32 -04:00
amcmanu3
481691aec5 Remove text from status page and use symbols 2024-06-19 13:48:48 -04:00
amcmanu3
95437c3e64 Remove function from troubleshooting 2024-06-19 13:31:36 -04:00
amcmanu3
6bbb3bf399 Fix box close after upload complete 2024-06-19 13:28:39 -04:00
Andrew
c4b183466e Close upload box if no files 2024-06-17 13:31:34 -04:00
Andrew
4a0dfddde5 Merge branch 'refactor/backups' into refactor/upload-api 2024-06-17 09:45:57 -04:00
Andrew
f808f32444 Fix backup downloads 2024-06-16 16:02:26 -04:00
Andrew
ad734c526c Fix query statement for updates 2024-06-15 16:09:01 -04:00
Andrew
0b0b63d650 Fix migrations errors on initial run 2024-06-15 14:32:18 -04:00
Andrew
4cc2d81044 Merge branch 'dev' into refactor/backups 2024-06-15 12:11:16 -04:00
Silversthorn
144ce0374c Rework CSS Part 1 2024-06-15 14:30:56 +02:00
amcmanu3
59d835bd9d Merge branch 'refactor/backups' into refactor/upload-api 2024-06-14 19:31:48 -04:00
amcmanu3
3030712587 Refactor restore to persist backups 2024-06-14 19:31:26 -04:00
amcmanu3
e5d18e5f2c Add type hints. Return backup ID on creation 2024-06-14 19:30:43 -04:00
amcmanu3
60bf9a7914 Merge branch 'refactor/backups' into refactor/upload-api 2024-06-14 18:30:05 -04:00
amcmanu3
f0afcfbc23 Fix check for directory existing 2024-06-14 18:29:36 -04:00
amcmanu3
6cf093031c Merge branch 'refactor/backups' into refactor/upload-api 2024-06-14 18:18:15 -04:00
amcmanu3
3c4b513a44 Use json.loads in the update function 2024-06-14 18:17:50 -04:00
Analicia Abernathy
ff8b5e0c03 Merge branch 'refactor/backups' of gitlab.com:crafty-controller/crafty-4 into refactor/backups 2024-06-14 14:17:11 -05:00
Analicia Abernathy
6e7b250292 Merge branch 'refactor/backups' of gitlab.com:crafty-controller/crafty-4 into refactor/backups 2024-06-14 14:17:00 -05:00
Analicia Abernathy
ff7a392119 translations for backup changes 2024-06-14 14:15:50 -05:00
amcmanu3
f5874d701a Add password error to not display password in plain text 2024-06-13 17:09:00 -04:00
amcmanu3
038a280ae1 Merge branch 'refactor/backups' into refactor/upload-api 2024-06-13 16:17:49 -04:00
amcmanu3
d4503f1887 Use backup_location variable 2024-06-13 16:06:04 -04:00