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
1,726 Commits 12 Branches 45 Tags 104 MiB
fff186e547
Commit Graph

1726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
amcmanu3
dd54a5f2c9 Mark update as complete when it fails 2022-06-03 16:04:12 -04:00
amcmanu3
aa44650a05 Fix windows file pathing 2022-06-03 15:53:29 -04:00
amcmanu3
ace79cad2f Remove useless print statements 2022-06-03 15:53:20 -04:00
amcmanu3
0200f1caec Remove useless console logs 2022-06-03 15:53:12 -04:00
amcmanu3
6eb3e541bf Fix player counts on dashboard 2022-06-03 15:21:57 -04:00
Zedifus
4cdd2bf776 Remove unused code 2022-06-03 19:50:58 +01:00
Zedifus
62bdf22618 Change for to forEach loop 
> Fixes ESLint rule ID security/detect-object-injection
 2022-06-03 19:49:51 +01:00
Zedifus
04ffe0eb65 Remove unused function 2022-06-03 18:41:05 +01:00
Zedifus
df86897108 Change for to forEach loop 
> Fixes ESLint rule ID security/detect-object-injection
 2022-06-03 18:33:21 +01:00
Iain Powrie
f3a44e08f2 Merge branch 'dev' into 'master' 
Pass 1 sec advisory fixes

See merge request crafty-controller/crafty-4!293
 2022-06-03 16:39:25 +00:00