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
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
Zedifus
31bf32c847
Merge branch 'dev' into devops/userns-rootless-container
2022-02-27 18:48:27 +00:00
Zedifus
0de6948b4c
Rework rebased Dockerfile for an attempt at userns
2022-02-27 18:38:30 +00: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
Zedifus
a488802847
Add required userns env variables
...
And missing TZ var
2022-02-27 18:35:24 +00:00
Zedifus
a0e6822bf3
Remove unrequired files from image
2022-02-27 18:33:48 +00: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
775c4d5c9f
Fix this one little stupid bug
2022-02-27 20:14:14 +02:00
luukas
154b99792f
Fix code quality :)
2022-02-27 19:45:32 +02:00
Andrew
8fb52c40b6
Merge branch 'pretzel-file-check' into 'dev'
...
Add check to make sure server file is downloaded before attempting to start
See merge request crafty-controller/crafty-commander!169
2022-02-27 17:29:57 +00: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
xithical
54d8ee4b7d
Add migration for excluded backup directories
...
Changes the column 'directories' in the backups table to 'excluded_dirs' so that we're only storing a list of excluded directories
2022-02-27 10:32:26 -06:00
Andrew
2265adbf82
Merge branch 'pretzel-fixes' into 'dev'
...
Bedrock support/chain reaction tasks / server re-ordering
See merge request crafty-controller/crafty-commander!166
2022-02-27 12:46:40 +00: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
8826ba2c91
Merge branch 'pretzel-fixes' of https://gitlab.com/crafty-controller/crafty-commander into pretzel-fixes
2022-02-26 21:11:42 -05:00
Andrew
71769d9d23
Appease the linter
2022-02-26 21:11:33 -05:00
Zedifus
59ddff16e3
Merge branch 'pretzel-fixes' of https://gitlab.com/crafty-controller/crafty-commander into pretzel-fixes
2022-02-27 01:58:07 +00:00
Zedifus
c409efbe28
Add server imports mount
...
To get foreign zips/servers into crafty...
(Better than I'm going to import servers into servers)
2022-02-27 01:57:54 +00:00
Zedifus
d8a875f5d0
Rebase from Alpine back to ubuntu
...
This makes me really sad but is necessary for bedrock support.
Bedrock is compiled for a different libc than alpine has. #sadifus
2022-02-27 01:54:07 +00:00
Andrew
3b0fbc7e36
English translation for edit scheudles
2022-02-26 20:40:17 -05:00
Andrew
5fa04d5ccc
Refactor tasks.html to schedules.html to match naming scheme
2022-02-26 20:23:20 -05:00
Andrew
f82241c96e
Add check so you cannot drag and drop anchor tag in dashboard row
2022-02-26 20:02:10 -05:00
Andrew
76b243d695
Remove codeblock that would cause js to vomit
2022-02-26 18:24:03 -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
