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
18283cf2b3
Fix front end for removing world
2022-03-01 21:56:12 -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
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
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
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
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
