Commit Graph

1376 Commits

Author SHA1 Message Date
Andrew
18283cf2b3 Fix front end for removing world 2022-03-01 21:56:12 -05:00
Andrew
c3e23358a0 Merge branch 'remove-world' into 'dev'
Remove minecraft specific naming/stats

See merge request crafty-controller/crafty-commander!177
2022-03-02 02:47:55 +00: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
Andrew
f30fcbfdcb Merge branch 'raknet-ping-fix' into 'dev'
Expand except to be more general to catch windows connection forcibly closed error

See merge request crafty-controller/crafty-commander!176
2022-03-02 00:50:41 +00: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
bbe9321516 Merge branch 'bedrock-fixes' into 'dev'
Added translation for backup start/end messages. Finalize bedrock support....

See merge request crafty-controller/crafty-commander!175
2022-03-02 00:32:29 +00: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
Zedifus
53b2b2ed4b Revert my last commit correctly
Man these are so getting squashed
2022-03-01 20:20:17 +00:00
Zedifus
b5f6e3587f Merge branch 'devops/userns-rootless-container' of https://gitlab.com/crafty-controller/crafty-commander into devops/userns-rootless-container 2022-03-01 20:15:53 +00:00
Zedifus
326f5aa78d Revert my last commit 2022-03-01 20:14:53 +00: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
2e549cea60 Merge branch 'backup-fixes' into 'dev'
Rework of files handling and added exclusions selection for backups.

See merge request crafty-controller/crafty-commander!174
2022-03-01 01:02:30 +00:00
xithical
c4f706d415 Rework of files handling and added exclusions selection for backups. 2022-03-01 01:02:30 +00:00
Zedifus
98c0c403c9 Investigating a different approach of non root
These commits are 100% getting squashed.
Just got to test this on my production machine.
Definitely not sure if this is the right way of doing it experimenting.
2022-02-28 20:01:14 +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
1a0e8176e3 Merge branch 'xithical-fixes' into 'dev'
Add option to exclude files/folders from backups

See merge request crafty-controller/crafty-commander!173
2022-02-28 04:11:47 +00:00
Andrew
10bf19bdf1 QOL changes for markup 2022-02-27 23:02:07 -05:00
Andrew
f563ceb8ad Fix delete backup 2022-02-27 22:45:22 -05: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
fd22519ae1 Update english translation 2022-02-27 21:57:45 -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
097d5689fc Fix typo in server_backup.html 2022-02-27 16:41:08 -05:00
Andrew
4bcb91d1d5 Add mostly functional front-end for backup exclusions 2022-02-27 16:37:48 -05:00
Zedifus
44d36b84f2 Update pip in dep build 2022-02-27 21:25:44 +00: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
Zedifus
0bacad0245 Apply file perms from env in entrypoint 2022-02-27 20:55:31 +00:00
Andrew
db4c15eb91 Merge branch 'pretzel-sanitize' into 'dev'
Santize inputs to the best of our ability. Could not find full solutions for...

See merge request crafty-controller/crafty-commander!171
2022-02-27 19:43:03 +00: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
Andrew
652a4a28a3 Santize inputs to the best of our ability. Could not find full solutions for server_schedule_edit.hmtl 2022-02-27 14:36:33 -05:00
Zedifus
cef4fac823 Correct MC Serv Port range to 100 ports default
To match Dockerfile
2022-02-27 19:25:23 +00: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