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
2,551 Commits 12 Branches 45 Tags 104 MiB
cf9ad77879
Commit Graph

2551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zedifus
ba968cfd71 Merge branch 'dev' into bug/backup-refresh 2022-10-22 20:39:05 +01:00
Iain Powrie
eaa1896350 Merge branch 'tweak/stats-clients' into 'dev' 
Only send realtime stats when clients connected

See merge request crafty-controller/crafty-4!488
 2022-10-22 19:30:45 +00:00
Zedifus
b3d28b149e Update changelog !488 2022-10-22 20:26:34 +01:00
Zedifus
1f842574c4 Merge branch 'dev' into tweak/stats-clients 2022-10-22 20:26:18 +01:00
Iain Powrie
4cdbb99166 Merge branch 'feature/update-url-autoset' into 'dev' 
Automatically set update url for server creation

See merge request crafty-controller/crafty-4!487
 2022-10-22 19:21:01 +00:00
Zedifus
4923a18359 Update changelog !487 2022-10-22 20:17:03 +01:00
Zedifus
eb617bb292 Merge branch 'dev' into feature/update-url-autoset 2022-10-22 20:14:41 +01:00
Andrew
ea11863e35 Change the way we declare root by pyinstaller docs 2022-10-22 15:12:02 -04:00
Iain Powrie
6f9a68d2cf Merge branch 'dev-FixStatsFilesDeletion' into 'dev' 
Fix server_stats db file when deleting server

See merge request crafty-controller/crafty-4!486
 2022-10-22 19:09:27 +00:00
Zedifus
bffe1807a8 Update changelog !486 2022-10-22 20:06:08 +01:00
Zedifus
1f2ff2345d Rename functions for readability 2022-10-22 19:43:59 +01:00
Zedifus
2599658321 Fix word list display on page load 
Whoopsie
 2022-10-22 19:37:16 +01:00
Zedifus
cb6e034f30 Guard against duplicate filters 
This protects against adding multiple filters of the same thing
 2022-10-22 19:28:13 +01:00
Zedifus
f3e41861d2 Remove guard on whitspace 
We can just trim instead
 2022-10-22 19:24:06 +01:00
Zedifus
a2a8b6449f Tidy comments and declaration order 
Declare functions before the function that uses it
 2022-10-22 19:04:57 +01:00
Zedifus
eaf5ae3664 Tidy turbo long lines for scroll-less readability 2022-10-22 18:50:48 +01:00
Zedifus
fd906d56e8 Clear input field after we've grabbed the value 
Reduce repetition of code
 2022-10-22 18:18:00 +01:00
Zedifus
1217f93c05 Hoist sanatise declaration 
Function should be declared before trhe functions that use it, not after
 2022-10-22 18:11:54 +01:00
Zedifus
6437f4fbd5 Break up if/else into guard clauses 2022-10-22 18:08:35 +01:00
amcmanu3
34cda5a081 Fix backups refresh causing issues on firefox 2022-10-21 16:48:51 -04:00
Andrew
23b3e642a0 Only collect server stats when clients 2022-10-20 15:33:51 -04:00
Andrew
c2f5daf8e9 Remove feature for modded servers 2022-10-20 15:05:58 -04:00
Andrew
2d5d263852 Automatically set update url for server creation 2022-10-20 14:58:43 -04:00
Andrew
4707489310 More regex 2022-10-20 14:12:51 -04:00
Andrew
241a33542b Fix JS breaking symbols 2022-10-20 13:52:16 -04:00
Andrew
e576a69d39 Merge branch 'feature/log-filter' of gitlab.com:crafty-controller/crafty-4 into feature/log-filter 2022-10-20 10:04:45 -07:00
Andrew
cbe7ad9a39 Change variable naming to make more sense 2022-10-20 10:01:20 -07:00
Iain Powrie
b21d0d82f2 Apply 5 suggestion(s) to 1 file(s) 2022-10-18 04:22:06 +00:00
Silversthorn
a0454ad3f1 Fix server_stats db file when deleting server 2022-10-15 10:13:17 +02:00
Andrew
3b813a6849 Fix splice error 2022-10-13 00:01:53 -04:00
Andrew
ec746d2131 Fix duplicate word bug 
Fix delete bug
 2022-10-12 23:55:25 -04:00
Andrew
3f4d232910 Add log filtering 
known bug: when adding more than 4 items to js array
 2022-10-12 23:29:20 -04:00
Iain Powrie
a96753d3a7 Merge branch 'devops/strip-sem-meta' into 'dev' 
Strip semver meta

See merge request crafty-controller/crafty-4!483
 2022-10-08 21:35:40 +00:00
Zedifus
ea0cf228a0 Tweak image tags for prod image push 2022-10-08 20:13:48 +01:00
Zedifus
d0dabc5888 Merge branch 'dev' into devops/strip-sem-meta 2022-10-08 19:43:40 +01:00
Zedifus
77d9a8d26d Retain tagged versions of crafty images 2022-10-08 19:29:34 +01:00
Zedifus
cbd84f5b1a Update README v4.0.16 2022-10-08 19:00:41 +01:00
Zedifus
0721c0d7d4 Strip meta from sem version 2022-10-08 18:34:38 +01:00
Iain Powrie
5c40ce5195 Merge branch 'bug/stats-timeout' into 'dev' 
Add timeout to socket for servers with incorrect port selection

See merge request crafty-controller/crafty-4!482
 2022-10-08 17:26:17 +00:00
Zedifus
409cad3c03 Update changelog !482 2022-10-08 18:22:32 +01:00
Zedifus
68be3aac16 Merge branch 'dev' into bug/stats-timeout 2022-10-08 18:20:00 +01:00
Iain Powrie
971506c193 Merge branch 'tweak/themes' into 'dev' 
Update themes to include all colors

See merge request crafty-controller/crafty-4!477
 2022-10-08 17:18:25 +00:00
Zedifus
360c9f0ef1 Update changelog !477 2022-10-08 18:13:55 +01:00
Zedifus
fbb6dad524 Merge branch 'dev' into tweak/themes 2022-10-08 18:12:37 +01:00
amcmanu3
3ac77d05c7 Add timeout to socket 2022-10-07 19:42:28 -04:00
Andrew
f18b2bbc2f Merge branch 'dev-fixed-sidebar-V2' into 'dev' 
Fix scrolling of sidebar v2

See merge request crafty-controller/crafty-4!481
 2022-10-07 16:51:54 +00:00
Zedifus
21d119d58e Merge branch 'dev' into dev-fixed-sidebar-V2 2022-10-06 18:48:57 +01:00
Silversthorn
905be275ed Add Collapse Memory for sidebar on LargeBreakpoint 2022-10-06 07:52:24 +02:00
Iain Powrie
2f59288a62 Merge branch 'bug/backup-config-persistance' into 'dev' 
Clean up backup configs when deleting servers

See merge request crafty-controller/crafty-4!480
 2022-10-05 21:45:14 +00:00
Zedifus
7df2ef51c1 Update changelog !480 2022-10-05 22:38:36 +01:00