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,627 Commits 12 Branches 45 Tags 104 MiB
6215932311
Commit Graph

2627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zedifus
47a9210750 Merge branch 'dev' into bug/backup-config-persistance 2022-10-05 22:36:59 +01:00
Iain Powrie
f500735e32 Merge branch 'bug/port-constraint' into 'dev' 
Add port constraint for all server creation & api

See merge request crafty-controller/crafty-4!479
 2022-10-05 21:21:07 +00:00
Zedifus
2d24682ee4 Update changelog !479 2022-10-05 22:13:55 +01:00
Zedifus
c1374b5c7f Merge branch 'dev' into bug/port-constraint 2022-10-05 22:12:14 +01:00
Iain Powrie
7a81652395 Merge branch 'bug/schedule-disable' into 'dev' 
Fix scheduled task disable

See merge request crafty-controller/crafty-4!478
 2022-10-05 21:09:05 +00:00
Zedifus
da37c28712 Update changelog !478 2022-10-05 22:05:13 +01:00
Zedifus
522adb765c Appease lint 
Major - R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it
 2022-10-05 22:02:17 +01:00
Silversthorn
002d89934e I hope this time it's ok, the sidebar works as intended 2022-10-04 23:58:31 +02:00
Silversthorn
27d33f79c6 update changelog 2022-10-04 23:17:27 +02:00
Silversthorn
425cb3869b Fixing scrolling sidebar even when collapsed 2022-10-04 23:10:03 +02:00
Silversthorn
d87a2c4c17 Revert "Fix scrolling of sidebar" 
This reverts commit 99693324dc.
 2022-10-04 23:03:42 +02:00
amcmanu3
c58e4e3ebf Clean up backup configs when deleting servers 2022-10-04 16:37:53 -04:00
amcmanu3
ad41960338 Appease the linter 2022-10-04 16:23:29 -04:00
Andrew
b8e0e2b0fb Add catch for those that have existing bad ports 2022-10-04 16:14:22 -04:00
amcmanu3
3681f52856 Fix scheduled task disable 2022-10-04 16:07:08 -04:00
Andrew
2e212cc788 Add port constraint for all server creation & api 2022-10-04 15:55:52 -04:00
Andrew
f558388a0f Update themes to include all colors 2022-10-04 13:31:37 -04:00
Iain Powrie
2706ffddbe Merge branch 'bug/zip-import-conditional' into 'dev' 
Fix conditional issue with zip imports/uploads

See merge request crafty-controller/crafty-4!476
 2022-10-03 21:34:07 +00:00
Zedifus
43a582fc8c Update changelog !476 2022-10-03 22:28:30 +01:00
Zedifus
4d74a1e3c0 Merge branch 'dev' into bug/zip-import-conditional 2022-10-03 22:26:22 +01:00
Iain Powrie
f497135066 Merge branch 'dev-fixed-sidebar' into 'dev' 
Fixed Sidebar

See merge request crafty-controller/crafty-4!475
 2022-10-03 21:17:27 +00:00
amcmanu3
03320c375a Fix conditional issue with zip imports/uploads 2022-10-03 15:38:45 -04:00
Silversthorn
1f6042be07 update changelog 2022-10-03 18:54:30 +02:00
Silversthorn
99693324dc Fix scrolling of sidebar 2022-10-03 18:48:49 +02:00