Commit Graph

4243 Commits

Author SHA1 Message Date
Iain Powrie
a710c80bb2 Merge branch 'lang/lang-names' into 'dev'
Add language header translations

See merge request crafty-controller/crafty-4!773
2024-07-08 23:56:04 +00:00
Zedifus
6366463d12 Update lang sort ci util to exclude humanized_index 2024-07-09 00:52:01 +01:00
Zedifus
66359ff561 Update changelog !773 2024-07-09 00:45:18 +01:00
Zedifus
c2c95c047a Add lolcatz humanized listing 2024-07-09 00:44:57 +01:00
Zedifus
7859c33cbd Merge branch 'dev' into lang/lang-names 2024-07-09 00:40:20 +01:00
Iain Powrie
b9625ab113 Merge branch 'bugfix/key-delete' into 'dev'
Fix typing issue causing IDs to not be ==

See merge request crafty-controller/crafty-4!775
2024-07-08 23:38:04 +00:00
Zedifus
920f1bcada Update changelog !775 2024-07-09 00:25:38 +01:00
Zedifus
319ea9510c Merge branch 'dev' into bugfix/key-delete 2024-07-09 00:23:51 +01:00
amcmanu3
eefbc81538 Fix sonar 2024-07-08 19:23:46 -04:00
Iain Powrie
a6b582b328 Merge branch 'sec/bump-tornado' into 'dev'
Bump tornado & requests for sec advisories

See merge request crafty-controller/crafty-4!774
2024-07-08 23:22:01 +00:00
Iain Powrie
fd86533b47 Merge branch 'dev' into 'sec/bump-tornado'
# Conflicts:
#   CHANGELOG.md
2024-07-08 23:19:19 +00:00
Zedifus
0edd6005c6 Update changelog !774 2024-07-09 00:18:13 +01:00
amcmanu3
87c559ae66 Delete temp dir files every 12 hours 2024-07-08 19:16:23 -04:00
amcmanu3
b0a38d1249 Remove overall file hash checking for now as it interferes with large files 2024-07-08 16:27:06 -04:00
amcmanu3
539c07be9d Fix typing issue causing IDs to not be == 2024-07-08 10:53:38 -04:00
Analicia Abernathy
ec4045b754 password lenth validation translation 2024-07-07 18:59:15 -05:00
Iain Powrie
df62da858f Merge branch 'dev' into 'tweak/server-name'
# Conflicts:
#   CHANGELOG.md
2024-07-07 23:32:44 +00:00
amcmanu3
8cf855488c Include single file for humanized translations 2024-07-07 19:22:54 -04:00
amcmanu3
b2afe3d361 Merge branch 'dev' into bugfix/user-tz-login 2024-07-07 18:41:27 -04:00
amcmanu3
d6e00edf4a Merge branch 'refactor/backups' into refactor/upload-api 2024-06-25 13:48:35 -04:00
amcmanu3
86ecfc35b6 Fix general user backup path 2024-06-25 13:48:17 -04:00
amcmanu3
1ba0520c0e Fix dir exclusions 2024-06-25 13:33:52 -04:00
amcmanu3
4fafb5cae9 Merge branch 'refactor/backups' into refactor/upload-api 2024-06-25 12:42:51 -04:00
amcmanu3
7b1afec9cb Merge branch 'dev' into refactor/backups 2024-06-24 12:52:47 -04:00
amcmanu3
c504f3d83f Merge branch 'dev' into tweak/server-create-roles 2024-06-23 21:00:04 -04:00
amcmanu3
f269ff0f53 Appease sonar 2024-06-23 20:54:30 -04:00
amcmanu3
07e094d11e Fix sonar 2024-06-23 20:41:06 -04:00
amcmanu3
5a6229d282 Merge branch 'refactor/backups' into refactor/upload-api 2024-06-23 20:28:53 -04:00
amcmanu3
aaadd0cc88 Remove deprectaed width 2024-06-23 20:28:03 -04:00
amcmanu3
20ae8b3a0b Remove role tags 2024-06-23 20:26:24 -04:00
amcmanu3
8b00f9f282 Remove duplicate CSS entry 2024-06-23 20:21:23 -04:00
amcmanu3
54cc2faa45 Update input labeling 2024-06-23 20:17:34 -04:00
amcmanu3
0156988d23 Remove deprecated width from table 2024-06-23 19:17:46 -04:00
amcmanu3
af11737b48 Refactor repeated auth errors 2024-06-23 19:13:44 -04:00
amcmanu3
f8884ab93e Refactor api handler to use constant id error 2024-06-23 19:10:42 -04:00
amcmanu3
16eca86a10 Some sonar fixes 2024-06-23 19:05:55 -04:00
Iain Powrie
522223a36f Merge branch 'bugfix/docker-audit-log' into 'dev'
Ensure audit log exists

See merge request crafty-controller/crafty-4!771
2024-06-23 15:36:35 +00:00
Zedifus
2c311499ac Update changelog !771 2024-06-23 16:32:12 +01:00
Zedifus
8b80d7e853 Merge branch 'dev' into bugfix/docker-audit-log 2024-06-23 16:30:44 +01:00
Iain Powrie
5df46ecd1c Merge branch 'tweak/status-typo' into 'dev'
Remove text from status page and use symbols

See merge request crafty-controller/crafty-4!770
2024-06-23 15:29:54 +00:00
Zedifus
cb41b613bf Update changelog !770 2024-06-23 16:26:26 +01:00
Zedifus
2fa23b14d1 Merge branch 'dev' into tweak/status-typo 2024-06-23 16:25:15 +01:00
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