Commit Graph

2418 Commits

Author SHA1 Message Date
Andrew
b95d71bfbc Appease the linter 2022-11-19 14:45:24 -05:00
Andrew
e42af36103 Make sure import status persists through install 2022-11-19 14:41:15 -05:00
Andrew
ad4603aafb Add automated forge server creation installs 2022-11-19 13:45:18 -05:00
Zedifus
cd93b468b3 Prepare 4.0.17 release base
Also remove badges from README, as gitlab already handles this in a different section
2022-10-23 21:24:10 +01:00
Zedifus
8c4c8ba995 Repair prod docker build pipe cache reference
Aswell as another attempt at pushing multiple tags
2022-10-23 20:24:38 +01:00
Zedifus
c3c8bc178c Repair prod docker build pipe 2022-10-23 19:54:25 +01:00
Iain Powrie
352c6eec61 Merge branch 'dev' into 'master'
v4.0.16

See merge request crafty-controller/crafty-4!492
2022-10-23 18:32:05 +00:00
Zedifus
1cbfb6eb10 Update changelog with commit a6aa0f8
Also change console colour for path display
2022-10-23 19:02:24 +01:00
Zedifus
a6aa0f8679 Fix pyinstaller pathing 2022-10-23 18:48:23 +01:00
Iain Powrie
2293257f89 Merge branch 'bug/win-root-path' into 'dev'
Change the way we declare root by pyinstaller docs

See merge request crafty-controller/crafty-4!491
2022-10-22 19:59:44 +00:00
Zedifus
a85c44989d Update changelog !491 2022-10-22 20:56:49 +01:00
Zedifus
52a1988d3b Merge branch 'dev' into bug/win-root-path 2022-10-22 20:54:13 +01:00
Iain Powrie
695f9dc0a8 Merge branch 'feature/log-filter' into 'dev'
Add log filtering

See merge request crafty-controller/crafty-4!484
2022-10-22 19:50:37 +00:00
Zedifus
b8900ab0ea Update changelog !484 2022-10-22 20:47:47 +01:00
Zedifus
5a2dc555f8 Merge branch 'dev' into feature/log-filter 2022-10-22 20:45:24 +01:00
Iain Powrie
bd4a1858c9 Merge branch 'bug/backup-refresh' into 'dev'
Fix "cannot render after finish" from backup_now

See merge request crafty-controller/crafty-4!489
2022-10-22 19:44:03 +00:00
Zedifus
1a5728ccf1 Update changelog !489 2022-10-22 20:40:15 +01:00
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