Commit Graph

1665 Commits

Author SHA1 Message Date
Freddy 0
a94e3f8a36 borked icon location 2022-06-13 19:22:53 +00:00
amcmanu3
0ffe6801d8 Fix user email bug on import3 2022-06-13 12:47:42 -04:00
Iain Powrie
de4e65448c Merge branch 'freddy-0-dev-patch-39341' into 'dev'
Docker image regristy fixed

See merge request crafty-controller/crafty-4!329
2022-06-13 16:43:25 +00:00
Freddy 0
0ed5bb416f no one notice this 2022-06-13 16:21:21 +00:00
Iain Powrie
f97f16fbe5 Merge branch 'freddy-0-Unraid-Beta' into 'dev'
final changes 4 unraid beta

See merge request crafty-controller/crafty-4!327
2022-06-13 16:11:10 +00:00
Freddy 0
f7436f8a74 final changes 4 unraid beta 2022-06-13 16:05:28 +00:00
Iain Powrie
6c42e17e94 Merge branch 'gitlab/templates' into 'dev'
Add Templates

See merge request crafty-controller/crafty-4!325
2022-06-13 12:56:06 +00:00
Iain Powrie
307e97deda Fix minor format 2022-06-13 12:53:13 +00:00
Zedifus
91d7eceb27 Add Templates 2022-06-13 13:44:32 +01:00
Andrew
6436604150 Merge branch 'bug/startup-text' into 'dev'
Define the prompt after the init is complete

See merge request crafty-controller/crafty-4!323
2022-06-13 01:39:16 +00:00
amcmanu3
f1f5f820b7 Add print for ordering purposes 2022-06-12 20:13:05 -04:00
amcmanu3
ef02b5a450 Change ordering 2022-06-12 20:11:56 -04:00
amcmanu3
1655818afc Define the prompt after the init is complete 2022-06-12 20:09:46 -04:00
Iain Powrie
0dc513297c Merge branch 'tweak/first-log-survey' into 'dev'
Tweak/first log survey

See merge request crafty-controller/crafty-4!321
2022-06-12 21:27:31 +00:00
Andrew
25a1c67c26 Fix black formatting 2022-06-12 17:17:58 -04:00
Andrew
474597d16c Add survery to admin first log 2022-06-12 17:03:42 -04:00
Andrew
9ba7dac723 Merge remote-tracking branch 'origin/master' into dev 2022-06-12 13:24:43 -04:00
Andrew
57fad43b58 Merge branch 'master' into dev 2022-06-12 13:24:13 -04:00
Iain Powrie
fe2c1e1e20 Merge branch 'bug/wss-error' into 'master'
Delay wss error message for slower systems

See merge request crafty-controller/crafty-4!319
2022-06-12 17:20:26 +00:00
Andrew
5e0483bb2b Merge branch 'dev-ImprovingServerInstanceUpdate' into 'dev'
It might do the refresh after a server update

See merge request crafty-controller/crafty-4!317
2022-06-12 17:17:58 +00:00
Silversthorn
e0d0965931 Fixing Pylint for good 2022-06-12 18:39:05 +02:00
Silversthorn
a9cdd33c77 Fixing Pylint Errors 2022-06-12 18:30:39 +02:00
Silversthorn
007218111f Should work now :) 2022-06-12 17:13:39 +02:00
Andrew
52d53aafe4 Delay wss error message for slower systems 2022-06-12 10:47:12 -04:00
Silversthorn
430f9f9fcf It might do the refresh after a server update 2022-06-12 08:37:24 +02:00
Iain Powrie
336da21ac8 Merge branch 'dev' into 'master'
06/11/2022 Pre-Release Bug Fixes

See merge request crafty-controller/crafty-4!316
2022-06-11 22:02:24 +00:00
Andrew
51697039cd Merge branch 'bug/server-stats-refresh' into 'dev'
Make call to controller and not stale object

See merge request crafty-controller/crafty-4!315
2022-06-11 21:51:35 +00:00
amcmanu3
ddcd3dc5c3 Appease the linter 2022-06-11 17:46:36 -04:00
amcmanu3
e99cacfc53 Make call to controller and not stale object 2022-06-11 17:34:31 -04:00
Iain Powrie
564b4c34d6 Merge branch 'tweak/contribute' into 'dev'
Update contribution page

See merge request crafty-controller/crafty-4!314
2022-06-11 21:03:04 +00:00
amcmanu3
d5be8d1531 Update contribution page 2022-06-11 16:36:07 -04:00
Iain Powrie
d5b331efda Merge branch 'dev' into 'master'
Change import check from falsy to truthy

See merge request crafty-controller/crafty-4!313
2022-06-11 00:48:50 +00:00
Zedifus
0ed4347254 Change import check from falsy to truthy
I should have really tested this 😅
This should be the last hotpush
2022-06-11 01:43:02 +01:00
Iain Powrie
f7144c93e7 Merge branch 'dev' into 'master'
Fix incorrect import dir path

See merge request crafty-controller/crafty-4!312
2022-06-11 00:06:40 +00:00
Iain Powrie
e34f91396b Fix incorrect import dir path
I'm a diddy
2022-06-10 23:56:50 +00:00
Iain Powrie
bf7bdb17a5 Merge branch 'dev' into 'master'
Pre Release Fixes- 11/06/22

See merge request crafty-controller/crafty-4!311
2022-06-10 23:42:11 +00:00
Iain Powrie
7f068ae0f5 Merge branch 'tweak/wrapper-optimisation' into 'dev'
Wrapper optimisation

See merge request crafty-controller/crafty-4!310
2022-06-10 23:30:33 +00:00
Iain Powrie
47da0ab1aa Wrapper optimisation 2022-06-10 23:30:33 +00:00
Iain Powrie
4f650546eb Merge branch 'bug/pretzel-kill-stack' into 'dev'
Fix error when stats job does not exist on kill

See merge request crafty-controller/crafty-4!309
2022-06-10 23:26:39 +00:00
Andrew
c924663ab3 Fix stack on server stop 2022-06-10 19:04:34 -04:00
Andrew
41cf247c5a Appease black 2022-06-10 18:31:48 -04:00
Andrew
4a15a2331e Fix error when stats job does not exist on kill 2022-06-10 18:29:47 -04:00
Iain Powrie
6914d2abb2 Merge branch 'dev' into 'master'
Pipeline improvements

See merge request crafty-controller/crafty-4!308
2022-06-10 17:27:34 +00:00
Iain Powrie
92eeefb4e8 Merge branch 'devops/code-quality-improvements' into 'dev'
Separate monolithic ci yaml into ci dir and fix code climate

See merge request crafty-controller/crafty-4!307
2022-06-10 15:16:39 +00:00
Zedifus
6c1b83d14d Reorder CI 2022-06-10 15:56:03 +01:00
Zedifus
15ace49660 Remove tags from test stage tasks
Just changed testers runner assignment
2022-06-10 15:55:17 +01:00
Zedifus
be757a24cc Silence yamllint on line length 2022-06-10 15:46:21 +01:00
Zedifus
d61c6a3cc8 Fix import paths
Doesn't require `./`
2022-06-10 15:44:08 +01:00
Zedifus
f5d7109c6c Separate Build from main ci yml 2022-06-10 15:23:17 +01:00
Zedifus
b459534a84 Add (---) hyphens 2022-06-10 14:57:56 +01:00