Commit Graph

1002 Commits

Author SHA1 Message Date
Zedifus
0c6bcaa097 Add if for is no img is provided for credit file
This fixes broken image symbol if no img provided in json
2022-02-06 05:34:45 +00:00
Andrew
a17b57cd30 Appease the linter 2022-01-31 20:58:38 -05:00
Andrew
d592dcd422 Initial commit for adding multiple server types 2022-01-31 20:50:25 -05:00
Andrew
3e822ea076 Create fallback for audit entires 2022-01-31 18:09:23 -05:00
Andrew
2e96c40d62 Make audit entries configurable 2022-01-31 17:58:02 -05:00
Andrew
3995560ba2 Enable/disable crash detection on setting change in config 2022-01-30 21:04:08 -05:00
Andrew
9164a89eed Merge branch 'pretzel-fixes' into 'dev'
Pretzel fixes

See merge request crafty-controller/crafty-commander!159
2022-01-30 20:36:36 +00:00
Andrew
ac19c86089 Appease the linter 2022-01-30 15:34:09 -05:00
Andrew
e69a3be381 Fix bug where stopping a server without crash detection would crash crafty...ironic, I know. 2022-01-30 15:28:48 -05:00
Andrew
7aebd8bd5b Merge branch 'pretzel-fixes' of https://gitlab.com/crafty-controller/crafty-commander into pretzel-fixes 2022-01-29 16:38:16 -05:00
Andrew
37ccc447c4 Fix backup config bug 2022-01-29 16:37:00 -05:00
Andrew
184a042e2a Delete audit logs when they exceed 300 entries 2022-01-29 01:37:28 -05:00
Andrew
7889ca3153 Delete audit logs when they exceed 100 entries 2022-01-29 01:36:37 -05:00
Andrew
8232a630ee Merge branch 'pretzel-fixes' into 'dev'
Fix more things linting broke

See merge request crafty-controller/crafty-commander!158
2022-01-29 05:24:54 +00:00
Andrew
453da9cc24 Fix more things linting broke 2022-01-29 00:08:55 -05:00
Andrew
fda3f21a5a Merge branch 'pretzel-fixes' into 'dev'
Fix bug where server_obj method was not defined

See merge request crafty-controller/crafty-commander!157
2022-01-29 00:16:51 +00:00
Andrew
8000acd74d Fix bug where server_obj method was not defined 2022-01-28 19:12:57 -05:00
Andrew
491c7104c1 Merge branch 'pretzel-fixes' into 'dev'
Pretzel fixes

See merge request crafty-controller/crafty-commander!156
2022-01-29 00:08:04 +00:00
Andrew
d1db65dc9c Fix typo when messages from players are written 2022-01-28 19:00:14 -05:00
Andrew
51a07a1f0d Fix for server reporting updating when it's not 2022-01-27 22:29:18 -05:00
Andrew
6f3ad12f33 Merge branch 'pretzel-fixes' into 'dev'
Fix for server reporting updating when it's not

See merge request crafty-controller/crafty-commander!155
2022-01-28 03:29:14 +00:00
Andrew
a1d5f9c084 Fix for server reporting updating when it's not 2022-01-27 22:27:24 -05:00
Andrew
29a9de6d4c Merge branch 'pretzel-fixes' into 'dev'
Fix revert. Somehow migrations file was destroyed

See merge request crafty-controller/crafty-commander!154
2022-01-28 03:15:34 +00:00
Andrew
350ffcba63 Lint ignore migrations 2022-01-27 22:13:01 -05:00
Andrew
4db034c39b Fix revert. Somehow migrations file was destroyed 2022-01-27 22:06:44 -05:00
Andrew
c8ff59082c Merge branch 'pretzel-fixes' into 'dev'
Revert migrations

See merge request crafty-controller/crafty-commander!153
2022-01-28 03:03:19 +00:00
Andrew
810ae4a198 Merge branch 'pretzel-fixes' of https://gitlab.com/crafty-controller/crafty-commander into pretzel-fixes 2022-01-27 22:01:15 -05:00
Andrew
32ea620ede Appease the linter in main 2022-01-27 22:01:08 -05:00
Andrew
b8c19a9c16 Merge branch 'dev' into 'pretzel-fixes'
# Conflicts:
#   app/classes/shared/migration.py
2022-01-28 02:57:46 +00:00
Andrew
ec5a175395 Add migration file to pylint ignore for now 2022-01-27 21:56:39 -05:00
Andrew
45ab07eb77 Revert migrations 2022-01-27 21:53:07 -05:00
Andrew
8a5a7cb13f Merge branch 'pretzel-fixes' into 'dev'
Pretzel fixes

See merge request crafty-controller/crafty-commander!151
2022-01-28 02:25:59 +00:00
Andrew
42062004a2 Add extras for crash detection 2022-01-27 21:16:19 -05:00
Andrew
005ac1216e Add crash detection 2022-01-27 20:43:23 -05:00
Andrew
4a2a1ab451 Remove motd dynamic update as it breaks json loading 2022-01-27 18:19:11 -05:00
Andrew
85eef71b9e Add max player/total player to stats keeping on dashboard 2022-01-27 18:16:27 -05:00
Andrew
5dba7725ff Merge branch 'master' into 'dev'
# Conflicts:
#   Dockerfile
2022-01-26 20:03:10 +00:00
Iain Powrie
d884cac5d7 Merge branch 'bugfix/open-method-typeerror-win' into 'dev'
Fix duplicate encoding argument on windows migration read

See merge request crafty-controller/crafty-commander!149
2022-01-26 02:47:06 +00:00
Andrew
2f5bc873ea Merge branch 'stats-fix' into 'dev'
Fix bug with motd crashing stats

See merge request crafty-controller/crafty-commander!148
2022-01-26 02:46:22 +00:00
Zedifus
39edd9c850 Fix Duplicate encoding argument
on windows migration read
2022-01-26 02:42:37 +00:00
Andrew
32852c00b9 Fix bug with motd crashing stats 2022-01-25 21:40:34 -05:00
Andrew
35334f010b Merge branch 'lint-fixes' into 'dev'
Lint fixes

See merge request crafty-controller/crafty-commander!147
2022-01-26 02:16:07 +00:00
Andrew
9b03163c6b Add try catch around troublesome logging statement 2022-01-25 21:11:06 -05:00
Andrew
eeaceb61fc Add fix for ensure logging to main 2022-01-25 21:00:40 -05:00
Iain Powrie
9d979bb0d2 Merge branch 'linting-corrections' into 'dev'
Create pylintrc, code review pipeline & correct codebase errors 

Fix uploads,
Only send server stats to user page when they have access to servers

See merge request crafty-controller/crafty-commander!145
2022-01-26 01:45:31 +00:00
Iain Powrie
e0ce1d118c Create pylintrc, code review pipeline & correct codebase errors
Fix uploads,
Only send server stats to user page when they have access to servers
2022-01-26 01:45:30 +00:00
Iain Powrie
882126d1f3 Merge branch 'bugfix/bleach-version-bump' into 'dev'
Add popover for tasks mobile

See merge request crafty-controller/crafty-commander!146
2022-01-22 20:12:45 +00:00
Iain Powrie
0b1da08f20 Bump bleach to 4.1
Resolves import error (See MR)
2022-01-22 20:11:08 +00:00
xithical
5adfc613d8 Merge branch 'dev' of http://gitlab.com/crafty-controller/crafty-commander into dev 2022-01-21 23:09:04 -06:00
xithical
09aab2a250 Add path to server backup log notification
Adds the server path that is being passed to `shutil` to the log entry for backups to more easily identify cases where backups loops are occurring
2022-01-21 23:06:37 -06:00