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 |
|
Zedifus
|
3081877c5f
|
Change trigger rules for CQ
This should fix the failed to load CQ Report issue on MRs
Also add links to tools used
|
2022-06-10 14:48:00 +01:00 |
|
Zedifus
|
087e28c1fc
|
Separate Linting from main ci yml
|
2022-06-10 14:45:48 +01:00 |
|
Zedifus
|
c34c204d95
|
Recover github files
Thought it'd be nice to keep them around and for reference.
|
2022-06-10 14:20:50 +01:00 |
|
xithical
|
385e991136
|
Merge branch 'dev' into 'master'
Fix user permissions/Fix occasional stack on login/Fix API Output Schema
See merge request crafty-controller/crafty-4!305
|
2022-06-09 22:33:10 +00:00 |
|
Andrew
|
cf06574fca
|
Merge branch 'hotfix/jsonschema-inconsistency' into 'dev'
Fix inconsistency on the `jsonschema` API endpoint
See merge request crafty-controller/crafty-4!306
|
2022-06-09 22:11:23 +00:00 |
|
luukas
|
f343db1a30
|
Fix inconsistency on the jsonschema API endpoint
|
2022-06-10 00:10:54 +03:00 |
|
Andrew
|
ce8733a079
|
Merge branch 'dev-FixingRedirectWithLoginPage' into 'dev'
Fixing Stack when redirected from Unauthorized page
See merge request crafty-controller/crafty-4!304
|
2022-06-09 19:34:33 +00:00 |
|
Silversthorn
|
538b78db47
|
Fixing Translations issues loaded in with js
|
2022-06-09 00:11:21 +02:00 |
|
Silversthorn
|
f23bdd14a2
|
Fixing an issue with single quotes and translations
|
2022-06-08 23:56:22 +02:00 |
|
Silversthorn
|
51b1097a96
|
Fixing Stack when redirected from Unauthorized page
|
2022-06-08 21:42:25 +02:00 |
|
Iain Powrie
|
40fc5298d2
|
Merge branch 'bug/user-permissions' into 'dev'
Fix user permissions issue
See merge request crafty-controller/crafty-4!303
|
2022-06-06 23:16:07 +00:00 |
|
Iain Powrie
|
7cddd9f740
|
Merge branch 'dev' into 'master'
Fix bug where Crafty crashes and backups fail if excluded dir doesn't exist
See merge request crafty-controller/crafty-4!302
|
2022-06-06 22:52:40 +00:00 |
|
amcmanu3
|
d7606f4cc6
|
Fix user permissions issue
|
2022-06-06 17:04:45 -04:00 |
|
Andrew
|
2696c8eb65
|
Merge branch 'bug/backup-exclusions' into 'dev'
Fix backup error if excluded dir doesn't exists.
See merge request crafty-controller/crafty-4!301
|
2022-06-06 15:33:45 +00:00 |
|
Andrew
|
8e23ba5bdb
|
Fix backup error if excluded dir doesn't exists.
|
2022-06-06 00:05:16 -04:00 |
|
Iain Powrie
|
9be5fc0d09
|
Merge branch 'dev' into 'master'
Fix version 3 importing and typos
See merge request crafty-controller/crafty-4!300
|
2022-06-05 20:19:53 +00:00 |
|
Zedifus
|
417a62884c
|
Tweak class import order
>Sorry I'm particular 😭
|
2022-06-05 21:17:23 +01:00 |
|
Iain Powrie
|
0921616285
|
Merge branch 'bug/fix-3-import' into 'dev'
Fix version3 imports
See merge request crafty-controller/crafty-4!299
|
2022-06-05 20:10:59 +00:00 |
|
amcmanu3
|
3c39d421fc
|
Appease the liner
|
2022-06-05 16:08:58 -04:00 |
|
Iain Powrie
|
598b504272
|
Merge branch 'bug/login-typo' into 'dev'
Fix typo in error message
See merge request crafty-controller/crafty-4!298
|
2022-06-05 20:05:53 +00:00 |
|
amcmanu3
|
e0fb4c6442
|
Fix version3 imports
|
2022-06-05 16:02:52 -04:00 |
|
Andrew
|
0df30d2f05
|
Fix typo in error message
|
2022-06-04 14:24:12 -04:00 |
|
Iain Powrie
|
6412a70f2c
|
Merge branch 'dev' into 'master'
Silversthorn MOTD bracket notation removal
See merge request crafty-controller/crafty-4!297
|
2022-06-04 01:36:37 +00:00 |
|
Iain Powrie
|
bdf459bad7
|
Merge branch 'dev-FixingBracketsMOTDjs' into 'dev'
Security fix removing brackets from motd js
See merge request crafty-controller/crafty-4!296
|
2022-06-04 01:23:36 +00:00 |
|
Silversthorn
|
757959e89d
|
Fixing the last one
|
2022-06-04 02:20:45 +02:00 |
|
Silversthorn
|
61806b6050
|
Correction of unused import
|
2022-06-04 02:13:11 +02:00 |
|
Silversthorn
|
2e5299e521
|
Improving MOTD
|
2022-06-04 02:13:00 +02:00 |
|
Andrew
|
2a4ae00ae2
|
Merge branch 'dev' into 'master'
Pass 2 sec advisory fixes
See merge request crafty-controller/crafty-4!295
|
2022-06-03 20:13:12 +00:00 |
|
Iain Powrie
|
ebf00a1900
|
Merge branch 'secops/pre-beta-security-fixes' into 'dev'
Pass 2 sec advisory fixes
See merge request crafty-controller/crafty-4!294
|
2022-06-03 20:10:17 +00:00 |
|