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
