Commit Graph

2001 Commits

Author SHA1 Message Date
Zedifus
77269f5c8f Fix black formatting issues 2024-08-06 22:14:25 +01:00
Iain Powrie
3dc1d90cf4 Merge branch 'dev' into 'feature/steamcmd'
# Conflicts:
#   Dockerfile
#   app/classes/models/servers.py
#   app/classes/shared/helpers.py
#   app/classes/shared/main_controller.py
#   app/classes/shared/server.py
#   main.py
2024-08-06 21:00:22 +00:00
amcmanu3
7c16737fab Appease sonar return nothing instead of false 2024-08-06 14:59:10 -04:00
amcmanu3
9f7f588e85 Tweak default backup configs to account for bad clone in 4.2.x 2024-07-30 14:30:30 -04:00
amcmanu3
ff9abe4359 Fix directory moves on backup migration 2024-07-29 18:02:00 -04:00
Andrew
0ed296adc6 Merge branch 'dev' into tweak/server-create-roles 2024-07-21 11:17:16 -04: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
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
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
Zedifus
735cdb238a Merge branch 'dev' into bugfix/user-tz-login 2024-07-09 01:53:01 +01:00
amcmanu3
0519a36fe1 Fix sonar issue 2024-07-08 20:39:21 -04: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
Zedifus
7859c33cbd Merge branch 'dev' into lang/lang-names 2024-07-09 00:40:20 +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
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
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
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
Zedifus
d05b986fa9 Merge branch 'dev' into tweak/support-logs-threads 2024-06-23 16:01:51 +01:00
amcmanu3
e33cf5451c Add language header translations 2024-06-22 18:44:02 -04:00
amcmanu3
bd73e1892a Don't allow list modifier in role name 2024-06-21 14:00:06 -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
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
6e7b250292 Merge branch 'refactor/backups' of gitlab.com:crafty-controller/crafty-4 into refactor/backups 2024-06-14 14:17:00 -05:00