Andrew
0775e28e56
Fix error thrown when no icon is available
2022-03-04 17:30:17 -05:00
Silversthorn
843c16bbd7
Fixing icon bug
2022-03-04 21:09:13 +01:00
Andrew
a76833b409
Optimize looping for server list nav
2022-03-04 12:42:12 -05:00
amcmanu3
db06eca12e
ensure icon key exists to prevent stack
2022-03-03 23:59:17 -05:00
amcmanu3
0a08324963
Fix server reordering
2022-03-03 22:25:30 -05:00
amcmanu3
bbd4335d79
Merge branch 'dev' of gitlab.com:crafty-controller/crafty-commander into dev
2022-03-03 22:22:08 -05:00
amcmanu3
4a32744211
Fix indent causing server ordering to not work
2022-03-03 22:22:05 -05: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
15610210b9
Fix bug in schedule creation where if interval was days an execption would be thrown for a missing key
2022-03-02 10:49:03 -05:00
Andrew
7707940743
Appease the linter
2022-03-02 10:36:24 -05:00
Andrew
8e874ca997
Add option to disable language files through config.json
2022-03-02 10:30:40 -05:00
Andrew
826d4d081f
Improve session.lock checking.
2022-03-02 09:48:03 -05:00
Andrew
23641f4033
Fix for keyerror when mc server can't be polled early enough
2022-03-01 22:45:44 -05:00
Andrew
c8267bee80
Catch key error players for stats - silently log it. Fix for human readable file size
2022-03-01 22:30:53 -05:00
Andrew
983022c5bb
make file size calc more efficient
2022-03-01 22:14:50 -05:00
Andrew
322134506b
Remove minecraft specific naming/stats
2022-03-01 21:43:36 -05:00
amcmanu3
e99f06ba9f
remove print statement
2022-03-01 19:57:02 -05:00
amcmanu3
de3ec1fa3b
Expand except to be more general to catch windows connection forcibly closed error
2022-03-01 19:47:29 -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
19f8775b32
Fix traceback when importing regular server
2022-03-01 18:49:16 -05:00
Andrew
c8c1f301c0
Fix server importing for bedrock that's not a zip
2022-03-01 18:31:38 -05:00
Andrew
e1340d61ff
Appease the linter
2022-03-01 17:10:04 -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
10d3afab58
Fix bug where int mc ping was not defined for bedrock servers
2022-03-01 13:52:57 -05:00
Andrew
11bf44b35e
Add user feedback for wrong unzip path
2022-03-01 13:27:41 -05:00
Andrew
22d519b4df
Remove print statements
2022-03-01 12:59:08 -05:00
Andrew
bbddbbf646
Patch issue where guid was a string trying to be made into bytes
2022-03-01 12:58:39 -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
fbe9a7659d
Few updates to MC bedrock ping
2022-02-28 22:57:16 -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
70ba8cceec
Add fully working backups
2022-02-27 21:49:26 -05:00
Andrew
2bf2902754
Working backup exclusions
2022-02-27 21:40:05 -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
23a5c228cd
Merge branch 'xithical-fixes' of https://gitlab.com/crafty-controller/crafty-commander into xithical-fixes
2022-02-27 16:15:46 -05:00
Andrew
e7d78cadd4
Initial frontend for backup omissions
2022-02-27 16:15:40 -05:00
xithical
6d7ddf8494
Add controllers for backup exclusion logic
2022-02-27 15:08:03 -06: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
xithical
29800eee3c
Add methods for excluded backup directories
...
Adds get, add, and delete methods for excluded backup directories
2022-02-27 12:35:48 -06:00
Lukas
67c76f1d1c
Merge branch 'lukas-noinjection' into 'dev'
...
Reduced the amount of injection in JavaScript.
See merge request crafty-controller/crafty-commander!170
2022-02-27 18:17:06 +00:00
luukas
154b99792f
Fix code quality :)
2022-02-27 19:45:32 +02:00
luukas
92c2af926a
Reduced the amount of injection in JavaScript.
...
* Moved file endpoints to file_handler.py
* Added a global `serverId` for some pages
* Fixed fi_FI translations
* Some other stuff I don't remember
2022-02-27 19:26:54 +02: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
71769d9d23
Appease the linter
2022-02-26 21:11:33 -05:00
Andrew
5fa04d5ccc
Refactor tasks.html to schedules.html to match naming scheme
2022-02-26 20:23:20 -05:00
Andrew
09335fc3d9
Add ability to reorder servers based on user
2022-02-26 18:00:54 -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
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
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
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
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
Zedifus
1596c720cb
Add ability to load credits from remote
2022-02-10 06:13:52 +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
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
453da9cc24
Fix more things linting broke
2022-01-29 00:08:55 -05:00
Andrew
8000acd74d
Fix bug where server_obj method was not defined
2022-01-28 19:12:57 -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
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
005ac1216e
Add crash detection
2022-01-27 20:43:23 -05:00
Andrew
85eef71b9e
Add max player/total player to stats keeping on dashboard
2022-01-27 18:16:27 -05: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
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
9b03163c6b
Add try catch around troublesome logging statement
2022-01-25 21:11:06 -05: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
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
Andrew
feaecf9016
Fix critical bug in fatal text formatting causing terminal to not work
2022-01-21 21:39:02 -05:00
Andrew
0812d9ca02
Add fatal to logging
2022-01-21 21:36:19 -05:00
Andrew
e35a2b3753
Add refresh send for buttons to update after server start/stop. Refresh is only sent to clients with server access
2022-01-21 20:43:44 -05:00
Silversthorn
bae08d05d9
Merge branch 'dev' into dev_websocket_server_status
2022-01-21 23:54:59 +01:00
Silversthorn
92a65ad7f1
Adding Websocket for server details
...
Adding Starting status on languages files
Removing all useless refresh things
2022-01-21 23:50:04 +01:00
Andrew
33984c9629
Fix for perms error thrown when posting api key from regular user
2022-01-20 14:14:03 -05:00
Andrew
b4bf125a0d
Notifications are only visible to valid server users
2022-01-20 13:37:45 -05:00
Andrew
2f3110b107
fix server deleting function due to type error after JWT merge.
2022-01-19 18:28:08 -05:00
Andrew
285a4ff9b4
fix error with logging so we can try to find out what's going on with windows servers not starting
2022-01-19 17:23:04 -05:00
Andrew
7f45b0544a
new windows fix for space escaping
2022-01-19 17:08:29 -05:00
Andrew
4fe174d6d2
additonal fix to windows path bug
2022-01-19 16:47:51 -05:00
Silversthorn
b385d1add3
Add Update Dashboard by websocket
2022-01-19 22:45:52 +01:00
Andrew
dff7c4890b
push changes to fix loading server pages as regular user. Creating new api keys as a regular user does not work - get a white traceback.
2022-01-19 16:22:22 -05:00
Silversthorn
97cad998e8
Using Wabsocket for refreshing Status Page
2022-01-19 21:34:59 +01:00
Silversthorn
0412480216
Fixing Server Command for Windows
2022-01-19 21:33:24 +01:00
Andrew
6f860e967c
final changes for windows path issues
2022-01-19 15:14:56 -05:00
Andrew
e7f51ce65a
refine APScheduler cron triggers
2022-01-19 14:43:34 -05:00
Andrew
cebb25b5e9
add try execpt around task scheduling. Fix edit task bug. Fix permission issue after JWT merge
2022-01-19 13:07:26 -05:00
Andrew
f37e1e04a4
Fix gravatar not loading after being removed from cookie. Improve gravatar loading so it changes without relogging
2022-01-18 16:44:36 -05:00
Andrew
2d169e8f97
Add terminal catches for server stop command and restart command in crafty's terminal
2022-01-18 15:42:26 -05:00
Andrew
b368246614
If you want to start a server...or stop it... or send any command you should patch your install with this commit
2022-01-18 15:00:00 -05:00
Andrew
5087813900
add catch for restart command. Fix windows bug.
2022-01-18 14:43:22 -05:00
Andrew
2f1b56121a
fix windows path bug
2022-01-18 13:59:53 -05:00
Andrew
a49c5c0e92
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2022-01-18 13:16:12 -05:00
Andrew
bda81b8e20
Add delay on logs download start for on screen messages
2022-01-18 13:16:09 -05:00
Lukas
09bd01a634
Merge branch 'dev' into 'lukas-jwts'
...
# Conflicts:
# app/classes/web/panel_handler.py
# app/frontend/templates/notify.html
# app/translations/en_EN.json
# requirements.txt
2022-01-16 10:54:55 +00:00
luukas
351c386c17
Fix a websocket handler bug
2022-01-15 17:38:29 +02:00
luukas
a20f7c4acf
Fix translation stuff
...
* Make fallback stuff work
* Use helper.get_setting('language') instead of hardcoded 'en_US'
* Fix status and public pages lang variables
* Fix and add some translations for fi_FI
2022-01-15 17:38:08 +02:00
Andrew
fefa6248b4
Remove time from cron dbs
2022-01-15 02:01:51 -05:00
Andrew
27bdce74e8
Fix windows execution paths
2022-01-15 01:47:31 -05:00
Andrew
a54fe49d84
Windows should work now
2022-01-15 01:37:44 -05:00
Andrew
ef19cecc27
hopeful fix for windows path bug
2022-01-15 01:30:33 -05:00
Andrew
e6000577b3
Tryin something for windows
2022-01-15 01:21:04 -05:00
Andrew
0d8ff36fe4
fix windows path escaping
2022-01-15 00:58:17 -05:00
Andrew
0d3fc43931
Remove schedules from DB when deleting a server.
...
Add better messaging for support log prep.
Add english translation for notify.
Chnage dep to 4.0 for tzlocal
2022-01-14 23:53:44 -05:00
Andrew
43a315874e
Fix player data bug
2022-01-14 20:05:50 -05:00
Andrew
ccc41b7419
fix bug where crash detection was still using schedule
2022-01-14 19:52:51 -05:00
luukas
93857f90db
JWT login and multi API keys!
2022-01-15 02:23:50 +02:00
Andrew
2689a579a7
fix bug where transveral would be true every delete file due to typo
2022-01-14 16:06:02 -05:00
Andrew
c736c2eec1
Fix for tzdata
2022-01-14 14:59:06 -05:00
Andrew
8723a44402
better cron validation
2022-01-14 12:59:33 -05:00
Andrew
210b831a47
remove schedule import from servers
2022-01-14 12:57:23 -05:00
Andrew
ef4a31d1e8
Attempt fix for delayed start issues - was finally able to reproduce
...
Port feature from 3.4 added by Trevor (@uplusion23) for terminal history.
Add datatable to mobile version of tasks.
2022-01-14 02:35:26 -05:00
Andrew
64b62f0f4f
fix critical bug to support relative path for crafty logs. Crafty's root path is set by main.py and saved in controller.
2022-01-13 23:01:18 -05:00
Andrew
1ee8342355
Delay notification for preparing support logs
2022-01-13 20:47:36 -05:00
Andrew
8424fc3149
Put support logs into a thread.
2022-01-13 20:42:53 -05:00
Andrew
4a78f3c4bd
update support logs to only download server logs for user permissions. Fix bug where updating user roles would update for all user roles with changes.
2022-01-13 16:44:57 -05:00
Andrew
3a3ee52f5c
add logging for file downloads
2022-01-13 00:56:32 -05:00
Andrew
362f16fec4
Fix sorting on schedules
...
Fix deleting scheduled tasks that are disabled.
2022-01-13 00:30:35 -05:00
Andrew
9f798ff291
Add popover for tasks mobile
...
Add support logs download feature
2022-01-12 21:12:28 -05:00
Andrew
70ae81ecc9
setup logging for schedules in schedule.log
2022-01-12 17:29:45 -05:00
Andrew
a4071a3962
Add logging when loading schedules
2022-01-12 16:09:38 -05:00
Andrew
e310d0e48b
changing interval start times to midnight. not when the schedule was created. I think this will be more what people are expecting.
2022-01-12 11:33:08 -05:00
Andrew
7981f90a77
Fix bug where backups would not run due to extraneous character in server init
2022-01-12 01:24:03 -05:00
Andrew
3acc89c0eb
Remove depreciated scheduler from tasks
2022-01-11 21:56:37 -05:00
Andrew
5fc2f06274
Fix bug with re-enabling a task
2022-01-11 19:30:00 -05:00
Andrew
e63966e7e6
fixing enabled bug in tasks for editing tasks
2022-01-11 19:20:26 -05:00
Andrew
b6a10d828e
fix enable bug in tasks
2022-01-11 19:17:20 -05:00
Andrew
47b48c3ee4
Fix translations in schedules
2022-01-11 18:51:07 -05:00
Andrew
e2f4a33380
Fix bug where servers would not auto start.
2022-01-11 18:30:06 -05:00
Andrew
85bcac7af4
Merge branch 'dew-schedule' into 'dev'
...
First major Schedules Commit to Dev
See merge request crafty-controller/crafty-commander!129
2022-01-11 22:49:09 +00:00
Andrew
8edec0357a
remove scheduler import
2022-01-11 17:47:37 -05:00
Andrew
b9cf5fdbf9
Fix so bad cron characters will not destroy DB.
2022-01-11 17:41:46 -05:00
Andrew
51fcb2adc3
Add working schedules.
...
Add ability to edit schedules.
Add new pages for task creation/edit.
2022-01-11 17:24:05 -05:00
Andrew
5e7d0d64bd
Cron tasks working.
...
Starting to rearrange front end for better UX
2022-01-11 12:17:57 -05:00
Andrew
c220c6d3d3
Remove schedule logic from backups.
2022-01-11 01:45:54 -05:00
Andrew
134a6431b8
Fix waiting start issue
2022-01-11 01:38:14 -05:00
Andrew
4f55ffed0f
Add single execution to scheduled tasks.
2022-01-11 01:29:27 -05:00
Andrew
14ae7c9a46
Add working schedules.
...
Do not use advanced cron scheduling yet.
Ability to add/delete scheduled jobs.
2022-01-11 00:26:33 -05:00
Andrew
139b506554
Inital APScheduler code for integration with our SQLite DB in progress. Adding commands works with start/stop/restart
2022-01-10 20:11:52 -05:00
Andrew
73c6c1b871
Fix port reminder
...
Add Server time zone to details
2022-01-10 14:58:38 -05:00
Andrew
39ccb83008
Fix bug where backkups could not be restore. Directly caused by the changes made in server zip import
2022-01-10 00:10:03 -05:00
Andrew
70cc90549d
Minor fixes to user deletion.
...
Allow users with user permissions to delete users...wow. How many times can I say user?
2022-01-09 23:34:11 -05:00
Andrew
db6a886e0f
Fix minor bugs in super user activation. Add 'are you sure' to delete user
2022-01-09 23:16:11 -05:00
Andrew
4d636cce1b
add working zip import selection functionality
2022-01-09 22:49:03 -05:00
Andrew
deeff1717b
adding tempdir back
2022-01-09 22:27:43 -05:00
Andrew
b815cf38a8
Zip import semi broken.
...
Need to figure out why temp dir is not being passed correctly
Need to make sure tempdir gets deleted.
2022-01-09 22:21:28 -05:00
Andrew
369ac7ad15
initial changes for zip imports selection
2022-01-09 18:04:54 -05:00
Andrew
3e90210f3b
Remove port checker for a port reminder on first run
...
Add DB column to track a server's first run
Send port reminder for crafty on fresh install.
Remove http server message from startup/logs - don't want to promote that it's running.
2022-01-09 13:14:59 -05:00
Andrew
a1c67009c4
Remove crafty_managed.txt from showing up in files listing in crafty. managed.txt will still show up in dir.
2022-01-09 02:07:18 -05:00
Andrew
74b416b93f
Fix rename value showing up as null
2022-01-09 00:09:18 -05:00
Andrew
7dd24b6b15
Improved File Loading, Fixed Port checking
2022-01-08 23:03:45 +00:00
Andrew
5d6cbf6a4f
add port checking stuff
2021-12-21 17:39:24 -05:00
Andrew
c9908a3e0f
Add sorting to filelist
2021-12-21 17:36:49 -05:00
Andrew
460472fe9d
Fix weird caching thing causing slow folder opening on files
2021-12-21 17:33:59 -05:00
Andrew
3e2d2c89ee
hotfix for failed scandir
2021-12-21 16:11:48 -05:00
Andrew
3ed304c378
Add fix for port checker. We'll see if this works this time.
2021-12-21 15:58:48 -05:00
Andrew
07d7c7ae60
Remove extraneous print statements.
2021-12-21 15:52:48 -05:00
Andrew
8a2f938dc9
Fix user error when trying to edit own language
...
Fix bug where users could not be created because of a bad logical check for system uesr.
2021-12-21 15:39:33 -05:00
Andrew
2afecf8fab
Add improved file functions.
...
Add sort in filenames
2021-12-21 15:04:32 -05:00
Andrew
71d3e03875
Add final fix for system user
2021-12-20 23:04:07 -05:00
Andrew
b4f247bb95
Add final fixes for system user and automated backups
2021-12-20 22:34:20 -05:00
Andrew
9ae0991f4b
Make system user not super user
2021-12-20 20:24:27 -05:00
Andrew
67eee3374c
Merge branch 'dev' into 'pretzel-branch'
...
Dev
See merge request crafty-controller/crafty-commander!117
2021-12-21 01:18:36 +00:00
Andrew
58d1ffea54
Fix error with scheduled tasks by system
...
Create a system user
2021-12-20 20:17:28 -05:00
Andrew
6c262d20d7
Attempt fix for unzipping server dir
2021-12-18 19:31:21 -05:00
Quentin B
f018267b62
Made server polls asynchronus, fix for serverjars
2021-12-16 21:07:36 -05:00
xithical
cf1403a0ee
Added better handling for non UTF-8 characters in output
2021-12-13 20:44:22 -06:00
Andrew
c59b13bfde
Fix port issue
2021-12-09 23:58:35 -05:00
Andrew
bc164fef67
Add timeout to telnet.
2021-12-10 04:52:37 +00:00
Andrew
8999a9a5c3
Fix bug where terminal will not exit
2021-12-09 18:35:00 -05:00
Andrew
635f671fd9
Move internet check to start after server has started.
2021-12-09 17:58:36 -05:00
Andrew
49893ea5a6
Merge branch 'pretzels-fixes' into 'dev'
...
Pretzels fixes
See merge request crafty-controller/crafty-commander!110
2021-12-09 22:39:40 +00:00
Andrew
fd62da8137
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2021-12-09 11:33:27 -05:00
Quentin
12153b1207
Merge branch 'fix/exit-code-tweak' into 'dev'
...
removed old exit handling logic
See merge request crafty-controller/crafty-commander!109
2021-12-06 05:50:48 +00:00
Quentin B
b2dc1521d6
removed old exit handling logic
2021-12-05 23:01:44 -05:00
Andrew
ebe65e081f
Minor change to aestetic for tasks
2021-11-30 15:50:40 -05:00
Andrew
0845efc3b8
Add initial frontend to schedules
2021-11-30 15:46:30 -05:00
Andrew
33ab2583da
Fix security issues
2021-11-30 14:37:45 -05:00
Andrew
b996f7e7e7
One added file for schedules. Fix large bug where any user could access subpages when they did not have a role to give them access.
2021-11-30 12:29:53 -05:00
Andrew
0d34fcdea3
Add traveral check before deleting pre-existing backup dir
2021-11-29 19:13:21 -05:00
amcmanu3
b49077991e
Fix backup dir rename issue on windows.
2021-11-29 19:09:43 -05:00
Andrew
f2a55da58d
Fix windows root issues.
2021-11-29 17:18:06 -05:00
Andrew
1625883a7b
sending changes to windows
2021-11-29 17:12:25 -05:00
Andrew
79284a9094
Add potential fix for windows admin lockout
2021-11-29 16:56:17 -05:00
Andrew
a19ba7dbb6
Backup Restore/Root Disable
2021-11-29 21:22:46 +00:00
Andrew
78834c1ed0
Fix bug where general user can change working directory and potentially destroy a system.
...
Initial commit for path traversal for server config only.
2021-11-27 21:52:49 -05:00
Andrew
0cd8f6b3a7
Fix bug where no fields were required while editing servers
2021-11-27 20:09:13 -05:00
Andrew
4c6b459b43
Remove useless if in backups.i
2021-11-27 19:28:53 -05:00
Andrew
bfe6cabd9e
Fix bug where a false EULA on delay start would cause the user to never be able to start the server.
2021-11-27 18:43:14 -05:00
Andrew
c7d3b3aa1c
Fix update notifications.
2021-11-27 18:32:53 -05:00
Andrew
12c4c9ec45
Fix bug where all server terminals would show updating.
2021-11-27 17:46:37 -05:00
Andrew
1bf47b5c54
Rework server start to look for user_id and not user_lang. Gives acces to more user info.
...
Fixes websocket broadcast to only send broadcast to user who sent original request.
2021-11-27 17:10:43 -05:00
Andrew
db4812c8ea
Add feature where if server executable is changed in config it also changes the execution string to match.
2021-11-27 14:29:28 -05:00
Andrew
e21a019de4
Add better logging to falling back to default language on server start.
2021-11-27 12:53:29 -05:00
Andrew
64c4df343a
Fix autostart error with missing param.
...
Takes default lang for errors on auto start since there is no user language to choose from for an auto start error.
2021-11-27 12:01:55 -05:00
Andrew
f569d3b4f0
Fix user lang for Lukas on panel_handler.py
2021-11-23 17:29:34 -05:00
Andrew
c811c568a5
Fix Merge issues
2021-11-23 17:16:33 -05:00
Andrew
97ddc1b964
Merge branch 'pretzel-patches' into 'dev'
...
# Conflicts:
# app/classes/shared/server.py
2021-11-23 22:12:06 +00:00
Andrew
dc83dc8fc8
Add EULA confirm message on server startup if EULA is not found.
2021-11-23 16:11:23 -05:00
Andrew
0e942311fb
Add error message on login that does not direct to new page.
...
Remove failed to create dir error on startup when crafty cannot create dir since it exists after first startup.
Error logging is still enabled for every error except FileExists for this case.
2021-11-23 13:22:15 -05:00
Andrew
eb39577cc7
Fix index out of range if user tries to import server without server.properties file.
...
Fix port not changing for crafty db - only server.properties on server creation.
2021-11-22 22:26:06 -05:00
Silversthorn
ea48bd5562
Merge branch 'dev' into dev-PathHelpers
2021-11-21 11:56:07 +01:00
Silversthorn
f20d41242d
Adding Helpers for Path
...
Correcting a MVC update missing function
2021-11-21 11:52:29 +01:00
Andrew
315cd6909c
Fixes update bug where 2 parameters were given when update only expected one.
...
Adds "Access to All servers" for exec_super_user.
Will need to add translation support for accessto all servers message.
2021-11-20 12:25:14 -05:00
Silversthorn
77deb6c126
Cleaner Path for Backups
2021-11-20 15:34:58 +01:00
Silversthorn
5164000c9a
Fixing Path Errors for Backup files (Windows)
2021-11-20 14:44:20 +01:00
Andrew
b7039573a4
Maybe I fixed backups?
...
Another attempt at allowing windows users to think about what they did by choosing windows to run a server on while also deleting backups
2021-11-19 22:17:24 -05:00
Andrew
67444a2d4f
More reverts from the windows issue.
2021-11-19 22:02:59 -05:00
Andrew
79190e15f5
Revert last push
2021-11-19 21:56:09 -05:00
Andrew
bd3da474f5
Another attempt to fix backup delete issue.
...
This is hacky and can probably be done better.
2021-11-19 21:47:03 -05:00
Andrew
146873eb10
Attempt to fix windows backup delete issue. Zedifus will test.
2021-11-19 21:28:46 -05:00
Andrew
cef282ca91
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2021-11-19 21:10:33 -05:00
Andrew
4d31ee399a
Puts a temporary fix on deleting backups. Will be fixed in alpha 4
2021-11-19 21:09:09 -05:00
computergeek125
62cac66e8e
revert readall change since it didn't work
2021-11-19 19:06:35 -06:00
computergeek125
5230a7ddc3
fix I/O thread read, fixed thread ident/pid
2021-11-19 18:31:33 -06:00
computergeek125
45e074ac4a
Resolved thread leak, fixed non-Minecraft java terminate, renamed
...
threads
2021-11-19 18:14:32 -06:00
Silversthorn
6f9d722a92
Fixing MOTD display
2021-11-19 21:59:23 +01:00
Iain Powrie
c40ce93ca5
Merge branch 'tweak/update-credits-json' into 'dev'
...
Update Credits
See merge request crafty-controller/crafty-commander!87
2021-11-19 16:58:12 +00:00
Andrew
df398718f1
Fixes bug for backup loops on shutil.
2021-11-19 01:07:53 -05:00
Andrew
65a9c54f72
Fixes DB corruption when saving backup config.
2021-11-18 23:44:29 -05:00
Zedifus
6eb4f313f9
Add last updated timestamp to patrons
2021-11-18 21:08:19 +00:00
Zedifus
6744fe5409
Correct patreon to patron
...
Patreon is the platform, supporters are patrons
2021-11-18 20:01:30 +00:00
Andrew
aeb6b774f4
Fixes tryexceptpass for helpers and panel handler.
2021-11-17 17:23:14 -05:00
Andrew
327122348d
Adds checkbox option for adding roles at server creation.
...
Fixes bug on Panel Config page where duplicate servers would be listed.
Changes the way "roles" are served to the page. Dictionary instead of model object.
2021-11-17 13:08:41 -05:00
Andrew
917bd5e32d
Working single role selection on server creation.
2021-11-17 01:17:36 -05:00
computergeek125
64ec33ff52
Resolved subprocess issues with windows
...
- Repaired introduced bug where backslashes in the far path weren't
handled properly
- Resolved latent subprocess issue where stdout would fail to send
websocket notifications when a a windows \r\n was emitted
2021-11-14 18:17:23 -06:00
computergeek125
9720929e33
Resolved missing stdout when java process exits quickly
2021-11-06 12:06:26 -05:00
computergeek125
82f4661044
Fixed db_helper issue
2021-11-06 11:27:15 -05:00
Iain Powrie
1c9ffb2abc
Merge branch 'dev' into 'subprocess'
...
# Conflicts:
# app/classes/shared/helpers.py
# app/classes/shared/server.py
# app/classes/web/ajax_handler.py
2021-11-06 15:26:37 +00:00
Andrew
a93860ebd8
Fixes bug in player counts
2021-10-20 22:31:36 -04:00
Andrew
87b6bd7758
Enhances language on login page
2021-10-18 17:27:19 -04:00
Andrew
b4707703af
Fixes translation error on status page.
2021-10-18 17:26:03 -04:00
Andrew
fdf9b3fcb9
Fixes bug where all servers would be included in offline/online count even if the user did not have access to those servers.
2021-10-18 17:11:43 -04:00
Silversthorn
895e6106a7
Fixing utf-8 encodinf traduction files
2021-10-09 12:51:41 +02:00
Silversthorn
eee528f329
Fixing Allowed Server on Config Page
2021-10-09 11:30:21 +02:00
Silversthorn
6984fe7abc
Corrections on server creation
2021-10-09 10:59:54 +02:00
Silversthorn
2f36cdd249
Correction for crafty permissions
2021-10-09 10:45:40 +02:00
Silversthorn
a074cb7e1d
Correction for roles on server creation
...
Fix for superuser to be able to create a server
Don't create a role if the creator is a superuser
2021-10-09 10:32:52 +02:00