Commit Graph

1464 Commits

Author SHA1 Message Date
Iain Powrie
a7d4dc53e9 Merge branch 'dev' into 'master'
Fix the encoding of language files

See merge request crafty-controller/crafty-commander!203
2022-03-08 06:46:50 +00:00
Iain Powrie
3918365393 Merge branch 'bugfix/lang-encoding' into 'dev'
Reencode `utf-8 with BOM` to utf-8

See merge request crafty-controller/crafty-commander!202
2022-03-08 06:36:30 +00:00
Zedifus
cee590a867 Reencode utf-8 with BOM to utf-8 2022-03-08 06:32:29 +00:00
Iain Powrie
db777a8413 Merge branch 'dev' into 'master'
Correct version on docs, whoops

See merge request crafty-controller/crafty-commander!201
2022-03-08 06:16:04 +00:00
Iain Powrie
514573f99c Correct version on docs, whoops 2022-03-08 06:12:21 +00:00
Iain Powrie
9db35445bc Merge branch 'dev' into 'master'
Alpha 3.5

See merge request crafty-controller/crafty-commander!150
2022-03-08 05:54:26 +00:00
Iain Powrie
8717c863bf Merge branch 'tweak/better-signal-logging' into 'dev'
Fix signal logging

See merge request crafty-controller/crafty-commander!200
2022-03-08 05:47:38 +00:00
Zedifus
affcc14245 Fix circular imports
I'm a silly
2022-03-08 05:44:26 +00:00
Zedifus
cb3379a316 Fix signal logging 2022-03-08 05:26:13 +00:00
Iain Powrie
4cc617fd0d Merge branch 'tweak/fix-imports' into 'dev'
Tidy imports & dep auto-installer

See merge request crafty-controller/crafty-commander!199
2022-03-08 04:50:21 +00:00
Zedifus
b306d1f313 Tidy imports & dep auto-installer 2022-03-08 04:40:44 +00:00
Andrew
b9f6aad33d Merge branch 'enhancement/security-machine' into 'dev'
Attempt to appease Iain and the security machine

See merge request crafty-controller/crafty-commander!198
2022-03-08 03:21:50 +00:00
amcmanu3
7629f9a3ff Attempt to appease Iain and the security machine 2022-03-07 22:12:56 -05:00
Andrew
eda9f44b5f Merge branch 'bug/backups-restore/download' into 'dev'
Bug/backups restore/download

See merge request crafty-controller/crafty-commander!197
2022-03-08 02:56:52 +00:00
amcmanu3
7302737005 Fix 'server_id' not defined bug in download file 2022-03-07 21:48:37 -05:00
amcmanu3
abdefc3e43 Ensure stats schedule is removed on server start 2022-03-07 21:48:06 -05:00
amcmanu3
244beed1e4 Fix restore message not showing up immediately 2022-03-07 21:46:42 -05:00
amcmanu3
9520858c22 Fix backup restore 2022-03-07 21:36:23 -05:00
Iain Powrie
66190cec48 Merge branch 'feature/3.5-translations' into 'dev'
3.5 Translations

See merge request crafty-controller/crafty-commander!191
2022-03-08 01:22:30 +00:00
Iain Powrie
9c99346bbe 3.5 Translations (Squashed)
Thank you translators <3 you're all amazing!
2022-03-08 01:22:30 +00:00
Andrew
344348fafc Merge branch 'sync-symbol' into 'dev'
Add sync symbol to status page

See merge request crafty-controller/crafty-commander!196
2022-03-08 01:08:28 +00:00
amcmanu3
f2cc0e89fb Add sync symbol to status page 2022-03-07 19:57:52 -05:00
Iain Powrie
aa89e0d6e1 Merge branch 'freddy0-unraid-docker-patch' into 'dev'
Adjustments for !172

See merge request crafty-controller/crafty-commander!194
2022-03-07 03:12:03 +00:00
Iain Powrie
8292033b8f Merge branch 'devops/non-root-container-qol' into 'dev'
QoL Improvements to non-root container

See merge request crafty-controller/crafty-commander!195
2022-03-07 02:53:06 +00:00
Zedifus
38bce5af60 Update docs to match new Docker setup 2022-03-07 01:58:00 +00:00
Zedifus
57bdeac2c2 Use sudo to drop perms to non-root 2022-03-07 01:51:25 +00:00
Freddy 0
e6df68564e Adjustments for !172 2022-03-06 18:33:48 +00:00
Iain Powrie
cc52fdeb83 Merge branch 'dev-BetterCreditTranslation' into 'dev'
Fixing Credit PAge

See merge request crafty-controller/crafty-commander!189
2022-03-05 17:53:52 +00:00
Silversthorn
6effc85d82 Removing trad for patreon supporter 2022-03-05 18:46:52 +01:00
Silversthorn
671a8ce369 Fixing Display on Smartphone Translators 2022-03-05 14:22:35 +01:00
Silversthorn
1297eb3fbb Format File 2022-03-05 14:10:23 +01:00
Silversthorn
29f8fb391e Fixing Diplay for Credits
Adding Profile Pic for empty ones
2022-03-05 13:59:19 +01:00
Silversthorn
506129729e Update Translation
- Adding Translation for Credits Page
 - Adding detection support for webpage
2022-03-05 12:01:36 +01:00
Andrew
ff3da27333 Merge branch 'bug/host-stats' into 'dev'
Fix task update polling

See merge request crafty-controller/crafty-commander!187
2022-03-05 01:56:19 +00:00
Andrew
1bf40ffda9 Fix task update polling
Fix task update polling after a change while linting broke it :/
2022-03-04 20:41:27 -05:00
Andrew
d36a06667e Merge branch 'bug/files-cursor' into 'dev'
Fix cursor showing as text highlight not hand

See merge request crafty-controller/crafty-commander!186
2022-03-04 23:53:36 +00:00
Iain Powrie
7f8960aed3 Merge branch 'staff/credits-update-leo' into 'dev'
Staff/credits update leo

See merge request crafty-controller/crafty-commander!184
2022-03-04 23:53:14 +00:00
Zedifus
5e4eaab54f Correct leo's credit file 2022-03-04 23:40:58 +00:00
Zedifus
a3656536b5 Remove '*' Prefix from joke languages
Co-authored-by: Andrew McManus <amcmanus@arcadiatech.org>
2022-03-04 23:38:36 +00:00
Andrew
55852de3d9 Fix cursor showing as text highlight not hand 2022-03-04 17:58:18 -05:00
Andrew
cd33383cd2 Merge branch 'dev-FixingIconCrash' into 'dev'
Dev fixing icon crash

See merge request crafty-controller/crafty-commander!185
2022-03-04 22:45:14 +00:00
Andrew
e1f1b81838 Merge branch 'dev-FixingIconCrash' of https://gitlab.com/crafty-controller/crafty-commander into dev-FixingIconCrash 2022-03-04 17:30:48 -05:00
Andrew
0775e28e56 Fix error thrown when no icon is available 2022-03-04 17:30:17 -05:00
Silversthorn
319361bd3a Fixing Icon error on GET 2022-03-04 21:30:45 +00:00
Silversthorn
9699bedf39 Update French Translation 2022-03-04 21:34:55 +01:00
Silversthorn
843c16bbd7 Fixing icon bug 2022-03-04 21:09:13 +01:00
Andrew
a76833b409 Optimize looping for server list nav 2022-03-04 12:42:12 -05:00
amcmanu3
db06eca12e ensure icon key exists to prevent stack 2022-03-03 23:59:17 -05:00
amcmanu3
0a08324963 Fix server reordering 2022-03-03 22:25:30 -05:00
amcmanu3
bbd4335d79 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-commander into dev 2022-03-03 22:22:08 -05:00