Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,167 Commits 12 Branches 45 Tags 104 MiB
09f363fcda
Commit Graph

867 Commits

Author SHA1 Message Date
Zedifus
cee590a867 Reencode utf-8 with BOM to utf-8 2022-03-08 06:32:29 +00:00
Zedifus
affcc14245 Fix circular imports 
I'm a silly
 2022-03-08 05:44:26 +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
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
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
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
amcmanu3
4a32744211 Fix indent causing server ordering to not work 2022-03-03 22:22:05 -05:00
amcmanu3
d5c623b928 Merge branch 'dev' into dev-RefreshStats_Threading 2022-03-03 19:57:06 -05:00
amcmanu3
dfa9ab40ca Appease the linter 2022-03-03 19:47:49 -05:00
amcmanu3
ab7889914f Bug fixes to ensure player stats display correctly 
Add sync indicator to dashboard
 2022-03-03 19:41:30 -05:00
Andrew
d73316119b Add server download status indicator 2022-03-04 00:36:36 +00:00
Silversthorn
52297829df Putting Jar versions from most recent to oldest 2022-03-03 23:20:55 +01:00
Silversthorn
cb1679806e Seperate refresh statistics for each server 
Fixing Broken Things
 2022-03-03 23:13:40 +01:00
Silversthorn
d016e0a59a Broke Things 2022-03-03 22:01:12 +01:00
Andrew
6bc5e5b51f Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev 2022-03-02 18:35:58 -05:00
Andrew
761653ac25 Increase realtime stats frequency 2022-03-02 18:35:53 -05:00
Iain Powrie
8da2bcae17 Merge branch 'devops/userns-rootless-container' into 'dev' 
Convert container to run as non-root

See merge request crafty-controller/crafty-commander!172
 2022-03-02 19:47:41 +00:00
Andrew
6cf778f068 appease the linter 2022-03-02 13:07:00 -05:00
Andrew
61ac97c02e Add unexecuted clear. Add option to compress backups 2022-03-02 12:55:49 -05:00
Zedifus
69e85faa1a Merge branch 'dev' into devops/userns-rootless-container 
[RESOLVED CONFLICTS]
 2022-03-02 16:58:48 +00:00
Andrew
e0b8fb35fe Add option to compress backups 2022-03-02 11:34:26 -05:00