Commit Graph

4209 Commits

Author SHA1 Message Date
Zedifus
b36740e0f7 Update changelog !762 2024-07-09 03:29:06 +01:00
amcmanu3
1ac63fae0d Merge branch 'refactor/backups' into refactor/upload-api 2024-07-08 22:06:49 -04:00
amcmanu3
a3e210c0d3 Check for traversal on backup delete 2024-07-08 22:06:29 -04:00
amcmanu3
d9b9f00e9a Merge branch 'refactor/backups' into refactor/upload-api 2024-07-08 21:57:59 -04:00
amcmanu3
9186d9b02c Include backup_id in delete call 2024-07-08 21:51:27 -04:00
Zedifus
90e11ef73e Update changelog !711 2024-07-09 02:33:02 +01:00
Zedifus
c9b2b49e5f Merge branch 'dev' into refactor/backups 2024-07-09 02:31:30 +01:00
Iain Powrie
b4f721cd8c Merge branch 'tweak/server-name' into 'dev'
Do not allow slashes in server names

See merge request crafty-controller/crafty-4!767
2024-07-09 01:28:32 +00:00
Iain Powrie
974571ea7a Merge branch 'tweak/cpu-attribute-error' into 'dev'
Workaround cpu_freq call catching on obscure cpu architectures

See merge request crafty-controller/crafty-4!776
2024-07-09 01:21:29 +00:00
Zedifus
31abf80ffc Update changelog !776 2024-07-09 02:18:12 +01:00
Iain Powrie
b0afc80b73 Merge branch 'Username404-59-dev-patch-44249' into 'tweak/cpu-attribute-error'
Fix cpu_freq call catching on obscure systems

See merge request crafty-controller/crafty-4!754
2024-07-09 01:12:11 +00:00
Zedifus
65396b7f27 Merge branch 'dev' into tweak/server-name 2024-07-09 02:07:00 +01:00
Iain Powrie
1c7ffcdda7 Merge branch 'bugfix/user-tz-login' into 'dev'
Use UTC for tokens_valid_from in user config

See merge request crafty-controller/crafty-4!765
2024-07-09 01:00:46 +00:00
Zedifus
ba2d3c92a6 Update changelog !765 2024-07-09 01:55:01 +01:00
Zedifus
735cdb238a Merge branch 'dev' into bugfix/user-tz-login 2024-07-09 01:53:01 +01:00
Iain Powrie
4346f58ff3 Merge branch 'bugfix/user-creation' into 'dev'
User Creation Fixes

See merge request crafty-controller/crafty-4!763
2024-07-09 00:48:25 +00:00
amcmanu3
0519a36fe1 Fix sonar issue 2024-07-08 20:39:21 -04:00
Zedifus
5b4bf46f61 Mark he_IL incomplete 2024-07-09 01:20:09 +01:00
Zedifus
b63081b03c Update changelog !763 2024-07-09 01:13:43 +01:00
Zedifus
594f030545 Merge branch 'dev' into bugfix/user-creation 2024-07-09 01:07:19 +01:00
amcmanu3
f26606a0cd Except filenotfound 2024-07-08 20:05:42 -04:00
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
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