Andrew
5adc48c524
Merge branch 'pretzel-bedrock' into 'pretzel-fixes'
...
# Conflicts:
# app/frontend/templates/server/bedrock_wizard.html
# app/frontend/templates/server/wizard.html
2022-02-10 20:57:31 +00:00
Andrew
b025899aee
Inital bedrock support
2022-02-10 15:54:00 -05:00
Andrew
260c3b0059
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2022-02-10 15:27:51 -05:00
Andrew
c89609ae61
Inital bedrock support
2022-02-10 15:27:40 -05:00
Andrew
a084b95426
Merge branch 'dev' into 'pretzel-fixes'
...
Merge Dev to pretzel
See merge request crafty-controller/crafty-commander!165
2022-02-10 19:32:59 +00:00
Iain Powrie
d3b601b29c
Merge branch 'lukas-easier-navigation' into 'dev'
...
Added better navigation.
See merge request crafty-controller/crafty-commander!162
2022-02-10 13:42:21 +00:00
Iain Powrie
f3f7f52001
Merge branch 'tweak/point-to-wiki' into 'dev'
...
Update wiki link to wiki
See merge request crafty-controller/crafty-commander!164
2022-02-10 06:53:25 +00:00
Zedifus
78224a9a55
Update wiki link to wiki
...
It's back from holiday
2022-02-10 06:49:35 +00:00
Iain Powrie
420c82c4f8
Merge branch 'feature/hosted-credits' into 'dev'
...
Ingest data from PatGen Bucket
See merge request crafty-controller/crafty-commander!163
2022-02-10 06:26:16 +00:00
Zedifus
9a8be824de
Establish default credits file
...
If remote is unavailable
2022-02-10 06:15:09 +00:00
Zedifus
1596c720cb
Add ability to load credits from remote
2022-02-10 06:13:52 +00:00
luukas
c25bc72315
Added better navigation.
...
* Double chevrons on the top right to expand/collapse the sidebar
* Save sidebar preference on extra large (>= 1200px) viewports
* Auto collapse sidebar on large (>= 992px) viewports
* (Old behavior) Medium (>= 768px) and smaller viewports are mobile
Check app/frontend/templates/main_menu.html line 45 onwards for more
2022-02-10 00:26:16 +02:00
xithical
3dbbc69753
Merge branch 'bugfix/credits-parsing-fix' into 'dev'
...
Credits page formatting tweaks
See merge request crafty-controller/crafty-commander!160
2022-02-09 04:30:10 +00:00
Zedifus
6cce6b93ad
Update to latest credits
2022-02-09 00:20:56 +00:00
Andrew
e2930232cd
Fix spacing with values in websocket stats update
2022-02-08 01:57:19 -05:00
Andrew
ce2e53a962
Remove (UTC Time) from server start in details. Server start time is localtime.
2022-02-08 01:08:58 -05:00
Andrew
5a290da11d
Fix typo in edit_user
2022-02-07 23:36:32 -05:00
Lukas
6a766331bf
Merge branch 'lukas-editorconfig' into 'dev'
...
EditorConfig file!!
See merge request crafty-controller/crafty-commander!161
2022-02-08 00:13:28 +00:00
luukas
c56453dabf
EditorConfig file!!
2022-02-08 02:07:40 +02:00
Zedifus
624f755fd4
Better format of titles for Support & Retired
2022-02-06 05:37:19 +00:00
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
