Commit Graph

2872 Commits

Author SHA1 Message Date
Silversthorn
39bb17cb54 Fixing merge with dev 2024-08-03 23:18:59 +02:00
Silversthorn
cc4ea2daa4 Merge branch 'dev' into refactor/rework-css 2024-08-03 22:44:06 +02:00
Silversthorn
6157ed60b8 trying to rework server players 2024-08-03 21:39:17 +02:00
amcmanu3
245f473693 Remove unused and problematic "dropdown-menu" ident from css 2024-07-29 16:41:25 -04:00
Zedifus
ef7fc68a24 Merge branch 'dev' into lang/th_TH-updates 2024-07-29 21:24:43 +01:00
Analicia Abernathy
bcdc464edf Update th_TH.json 2024-07-29 14:47:53 -05:00
Analicia Abernathy
d0aeb019d8 adding missing translations from merge 772 2024-07-29 14:46:15 -05:00
Iain Powrie
568641dce3 Merge branch 'lang/fix_fr' into 'lang/fix-frFR-syntax'
Lang/fix fr

See merge request crafty-controller/crafty-4!778
2024-07-29 19:40:10 +00:00
Zedifus
83813e7566 Mark th_TH incomplete 2024-07-29 20:11:32 +01:00
Silversthorn
ae61c22d26 fixing server players 2024-07-28 20:09:59 +02:00
Silversthorn
a2ec048422 Fixing Schedule Edit 2024-07-28 20:04:08 +02:00
Silversthorn
274dfcad3b Fixing server metrics 2024-07-28 19:53:24 +02:00
Silversthorn
5b50db7f67 Fixed logs page 2024-07-28 19:44:44 +02:00
Silversthorn
facc05800b Fixing API Keys 2024-07-28 19:27:52 +02:00
Silversthorn
56c233bc22 Fixing Login page 2024-07-28 19:24:51 +02:00
Silversthorn
c65e054276 Fixing notify on themes impacted styles 2024-07-28 19:09:10 +02:00
Silversthorn
1748147d30 Line break on html pages is weird 2024-07-28 18:51:12 +02:00
Silversthorn
c2627acb6f Fixing no-scroll classes 2024-07-28 18:50:40 +02:00
Silversthorn
39ecb1e4c4 Fixing Radio buttons 2024-07-28 18:41:23 +02:00
Silversthorn
d96e169faa Merge branch 'dev' into refactor/rework-css 2024-07-28 15:11:29 +02:00
Ludo-code
af3c08d886 Update file fr_FR.json 2024-07-26 06:44:27 +00:00
Ludo-code
70ef395936 fix fr lang 2024-07-24 16:33:22 +00:00
Analicia Abernathy
76215556d2 translations for server creation changes 2024-07-23 21:38:18 -05: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
5b4bf46f61 Mark he_IL incomplete 2024-07-09 01:20:09 +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
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
amcmanu3
eefbc81538 Fix sonar 2024-07-08 19:23:46 -04: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