Commit Graph

1045 Commits

Author SHA1 Message Date
Andrew
f3d5f4f454 Fix Bedrock for linux 2022-02-26 12:12:02 -05:00
Andrew
733b5c9a2c Add the right env variable for bedrock on linux 2022-02-26 11:59:19 -05:00
Andrew
92f9bceaf9 Revert to original popen scheme 2022-02-26 11:51:28 -05:00
Andrew
b6b8a1c14a Add env parameter to popen 2022-02-26 11:29:36 -05:00
Andrew
e3669a2483 Add check for non-windows running bedrock to set env variable 2022-02-26 11:25:08 -05:00
Andrew
48b9963a27 Add check so chain-reaction schedule cannot be assigned to itself. 2022-02-25 21:18:15 -05:00
Andrew
96d52376f3 Fix bug where new schedules could not be created 2022-02-25 20:50:07 -05:00
Andrew
58c9321c8f fix bug where schedules would not be able to be created. 2022-02-25 20:43:33 -05:00
Andrew
45ae49e84e Add features to child tasks 2022-02-25 19:53:38 -05:00
Andrew
31cb2793fd Fix a couple bugs with chain reactions 2022-02-24 00:19:54 -05:00
Andrew
8b981f3f27 appease the linter 2022-02-23 23:47:10 -05:00
Andrew
a54a4780b3 fix typo in front end 2022-02-23 23:43:50 -05:00
Andrew
af16834419 Working chain reactions 2022-02-23 22:59:16 -05:00
Andrew
c1020ff3d1 Working chain reaction tasks 2022-02-23 22:58:48 -05:00
Andrew
a908a3a7ac Remove un-needed print statement 2022-02-22 18:03:47 -05:00
Andrew
9f360eed38 Merge branch 'pretzel-fixes' of https://gitlab.com/crafty-controller/crafty-commander into pretzel-fixes 2022-02-11 01:17:08 -05:00
Andrew
c263a4a22b Fix /stop /restart issue. /restart does not actually restart the server right now 2022-02-11 01:16:45 -05:00
amcmanu3
311d3e7411 Inital changes for bedrock stats recording 2022-02-10 20:28:40 -05:00
Andrew
569876e377 Remove useless print statement 2022-02-10 18:46:26 -05:00
Andrew
d62dee2da5 Merge branch 'pretzel-bedrock' into 'pretzel-fixes'
Pretzel bedrock

See merge request crafty-controller/crafty-commander!168
2022-02-10 23:32:14 +00:00
Andrew
b55af70d11 Appease the linter 2022-02-10 18:29:43 -05:00
Andrew
540584990e Inital bedrock support 2022-02-10 18:20:36 -05:00
Andrew
f96a6b6d66 Merge branch 'pretzel-fixes' into 'pretzel-bedrock'
Pretzel fixes

See merge request crafty-controller/crafty-commander!167
2022-02-10 21:00:58 +00:00
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