Zedifus
2a512d7273
Fix files to conform with new ⚫ Black pylintrc
...
Mostly just breaking up strings and comments into new lines
Some strings dont require 'f' but keeping in for readability
with the rest of the concatinated string
2022-03-23 06:06:13 +00:00
Zedifus
e06fe8a52a
⬛ Black codebase
...
Apply black formatting to codebase
2022-03-23 02:50:12 +00:00
xithical
4177ca882c
Put encoding arg in its proper location for maximum linter appeasal
2022-03-20 12:19:11 -05:00
xithical
1279784cc7
Appease the linter again
2022-03-20 12:14:51 -05:00
xithical
bf6d0d0368
Appease the linter
2022-03-20 12:01:14 -05:00
xithical
cda7b59a12
Fix how memory args are passed in importing from 3
2022-03-18 23:06:04 -05:00
_iEpic
4af62cbaca
Added basic Import functions
2022-03-18 23:59:10 -04:00
xithical
4c14b58a2a
Add user importing from 3 - servers to be added
2022-03-18 21:55:39 -05:00
Iain Powrie
ccd0bc8e8f
Merge branch 'dev-BetterCertsGeneration' into 'dev'
...
Adding Subject Alt Names in certificate
See merge request crafty-controller/crafty-commander!209
2022-03-16 09:49:17 +00:00
Zedifus
a6e99347af
Format the cert gen helper
...
Use black to format this function and appease lint.
We should really use black on the full project
2022-03-15 18:47:49 +00:00
Silversthorn
83c692beb5
pylint happy !!
2022-03-15 19:17:20 +01:00
Silversthorn
2f89c3a93d
It was a comma !!!
2022-03-15 18:12:56 +00:00
Silversthorn
7e6d34de0f
2nd Try
2022-03-15 07:43:36 +00:00
Silversthorn
466d71db36
Try to be cool with pylint (resolving Major issue ?)
2022-03-15 07:32:08 +00:00
amcmanu3
0f27b2df91
Fix error where user could not create server
...
Fix error where user could not create support files
2022-03-14 17:39:19 -04:00
Silversthorn
62244637bb
Adding Subject Alt Names in certificate
2022-03-14 20:30:24 +01:00
Andrew
d4a1efba78
Appease the linter
2022-03-13 09:26:38 -04:00
Andrew
3a8174cc22
Add status bar for support log archive
2022-03-13 08:29:26 -04:00
Andrew
6e4435c86f
Add Full support for backup status
2022-03-13 06:36:44 -04:00
Andrew
33cad6afa8
Add percentage to backups page
...
Helper designed to be used for support logs as well.
2022-03-11 00:19:05 -05:00
Andrew
319e06cd10
Add backend percentage to backups
2022-03-09 23:45:49 -05:00
Zedifus
affcc14245
Fix circular imports
...
I'm a silly
2022-03-08 05:44:26 +00:00
Zedifus
b306d1f313
Tidy imports & dep auto-installer
2022-03-08 04:40:44 +00:00
Andrew
eda9f44b5f
Merge branch 'bug/backups-restore/download' into 'dev'
...
Bug/backups restore/download
See merge request crafty-controller/crafty-commander!197
2022-03-08 02:56:52 +00:00
amcmanu3
abdefc3e43
Ensure stats schedule is removed on server start
2022-03-07 21:48:06 -05:00
amcmanu3
9520858c22
Fix backup restore
2022-03-07 21:36:23 -05:00
Iain Powrie
9c99346bbe
3.5 Translations (Squashed)
...
Thank you translators <3 you're all amazing!
2022-03-08 01:22:30 +00:00
Silversthorn
506129729e
Update Translation
...
- Adding Translation for Credits Page
- Adding detection support for webpage
2022-03-05 12:01:36 +01:00
Andrew
ff3da27333
Merge branch 'bug/host-stats' into 'dev'
...
Fix task update polling
See merge request crafty-controller/crafty-commander!187
2022-03-05 01:56:19 +00:00
Andrew
1bf40ffda9
Fix task update polling
...
Fix task update polling after a change while linting broke it :/
2022-03-04 20:41:27 -05:00
Andrew
55852de3d9
Fix cursor showing as text highlight not hand
2022-03-04 17:58:18 -05:00
Silversthorn
843c16bbd7
Fixing icon bug
2022-03-04 21:09:13 +01:00
amcmanu3
d5c623b928
Merge branch 'dev' into dev-RefreshStats_Threading
2022-03-03 19:57:06 -05:00
amcmanu3
dfa9ab40ca
Appease the linter
2022-03-03 19:47:49 -05:00
amcmanu3
ab7889914f
Bug fixes to ensure player stats display correctly
...
Add sync indicator to dashboard
2022-03-03 19:41:30 -05:00
Andrew
d73316119b
Add server download status indicator
2022-03-04 00:36:36 +00:00
Silversthorn
cb1679806e
Seperate refresh statistics for each server
...
Fixing Broken Things
2022-03-03 23:13:40 +01:00
Silversthorn
d016e0a59a
Broke Things
2022-03-03 22:01:12 +01:00
Andrew
6bc5e5b51f
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2022-03-02 18:35:58 -05:00
Andrew
761653ac25
Increase realtime stats frequency
2022-03-02 18:35:53 -05:00
Iain Powrie
8da2bcae17
Merge branch 'devops/userns-rootless-container' into 'dev'
...
Convert container to run as non-root
See merge request crafty-controller/crafty-commander!172
2022-03-02 19:47:41 +00:00
Andrew
6cf778f068
appease the linter
2022-03-02 13:07:00 -05:00
Andrew
61ac97c02e
Add unexecuted clear. Add option to compress backups
2022-03-02 12:55:49 -05:00
Zedifus
69e85faa1a
Merge branch 'dev' into devops/userns-rootless-container
...
[RESOLVED CONFLICTS]
2022-03-02 16:58:48 +00:00
Andrew
e0b8fb35fe
Add option to compress backups
2022-03-02 11:34:26 -05:00
Zedifus
8f0ac0d025
Fix permissions setting on bedrock imports
...
This is not an issue on java as we dont need the execute perm on .jar's
Requires to be prefix'd octal intager for mask not decimal
2022-03-02 16:22:53 +00:00
Andrew
826d4d081f
Improve session.lock checking.
2022-03-02 09:48:03 -05:00
amcmanu3
e99f06ba9f
remove print statement
2022-03-01 19:57:02 -05:00
Andrew
00db762c51
Add check in server import so we don't stack if jar doesn't exist.
2022-03-01 19:29:08 -05:00
Andrew
c8c1f301c0
Fix server importing for bedrock that's not a zip
2022-03-01 18:31:38 -05:00
Andrew
5d6ada23a4
Fix visual file loading order. Fix zip imports where directories were not being copied
2022-03-01 16:54:06 -05:00
Andrew
d760fcb010
Appease the linter
2022-03-01 01:14:26 -05:00
Andrew
11278ebe5f
Added translation for backup start/end messages. Finalize bedrock support. Removed confusion so server stats won't be shown if server isn't running.
2022-03-01 00:33:09 -05:00
Andrew
3c48364998
BEDROCK SUPPORT. Ping works. Add notification for backups starting and completing.
2022-02-28 22:40:11 -05:00
xithical
c4f706d415
Rework of files handling and added exclusions selection for backups.
2022-03-01 01:02:30 +00:00
xithical
26014d0e86
Revert "Merge branch 'xithical-fixes' into 'dev'"
...
This reverts merge request !173
2022-02-28 04:40:33 +00:00
xithical
7f98e39503
Appease the linter
2022-02-27 21:25:00 -06:00
xithical
5758d64e96
Merge branch 'dev' into 'xithical-fixes'
...
# Conflicts:
# app/classes/web/ajax_handler.py
# app/frontend/templates/panel/server_backup.html
2022-02-28 03:04:23 +00:00
Andrew
3621672e81
appease the linter
2022-02-27 22:03:19 -05:00
Andrew
008b7f4ade
Run file tree serving thorugh ajax handler alone
2022-02-27 19:29:30 -05:00
Andrew
4bcb91d1d5
Add mostly functional front-end for backup exclusions
2022-02-27 16:37:48 -05:00
Andrew
e7d78cadd4
Initial frontend for backup omissions
2022-02-27 16:15:40 -05:00
xithical
4b484782c6
Fix excluded directories not being separatable
...
Excluded directories were being pulled from the database as not a string, so I just used the get_backup_config() method to pull exclusions as a string so I could split it
2022-02-27 13:38:16 -06:00
xithical
cf5bfe88c1
Better documentation for backup logic
2022-02-27 13:21:54 -06:00
xithical
eaca8acf72
Clean up backup server method for readability
2022-02-27 13:17:14 -06:00
xithical
7c5bb0984c
Add logic for removing excluded files/dirs from backups
...
Updated backup thread to copy all server files to a temporary directory, iterate through excluded directory list, remove excluded directories/files, then create the backup archive
2022-02-27 13:11:22 -06:00
Andrew
dfed1cbedc
Add check to make sure server file is downloaded before attempting to start
2022-02-27 12:22:52 -05:00
Andrew
6b5f4bcc21
Remove outdated exit code
2022-02-26 22:14:19 -05:00
Andrew
211214a38a
Work around for servers not shutting down on crafty shutdown
2022-02-26 22:09:59 -05:00
Andrew
1ab4ffd8f7
Add execution command for bedrock server jar
2022-02-26 12:42:01 -05:00
Andrew
59ea0a326d
Add a / for execution
2022-02-26 12:35:23 -05:00
Andrew
879197a3e9
Fix typo in server.py
2022-02-26 12:31:55 -05:00
Andrew
18e2ac8328
Change zip import execution string to the correct one
...
Fix front end for bedrock imports
Add server type to details
2022-02-26 12:29:07 -05:00
Andrew
c625781da8
Fix typo in main_controller
2022-02-26 12:14:41 -05:00
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
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
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
c263a4a22b
Fix /stop /restart issue. /restart does not actually restart the server right now
2022-02-11 01:16:45 -05:00
Andrew
569876e377
Remove useless print statement
2022-02-10 18:46:26 -05: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
c89609ae61
Inital bedrock support
2022-02-10 15:27:40 -05:00
Andrew
3995560ba2
Enable/disable crash detection on setting change in config
2022-01-30 21:04:08 -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
37ccc447c4
Fix backup config bug
2022-01-29 16:37:00 -05:00
Andrew
453da9cc24
Fix more things linting broke
2022-01-29 00:08:55 -05: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
a1d5f9c084
Fix for server reporting updating when it's not
2022-01-27 22:27:24 -05: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
b8c19a9c16
Merge branch 'dev' into 'pretzel-fixes'
...
# Conflicts:
# app/classes/shared/migration.py
2022-01-28 02:57:46 +00:00
Andrew
45ab07eb77
Revert migrations
2022-01-27 21:53:07 -05:00
