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
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
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
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
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
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
a54a4780b3
fix typo in front end
2022-02-23 23:43:50 -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
Iain Powrie
d3b601b29c
Merge branch 'lukas-easier-navigation' into 'dev'
...
Added better navigation.
See merge request crafty-controller/crafty-commander!162
2022-02-10 13:42:21 +00:00
Zedifus
78224a9a55
Update wiki link to wiki
...
It's back from holiday
2022-02-10 06:49:35 +00:00
Zedifus
9a8be824de
Establish default credits file
...
If remote is unavailable
2022-02-10 06:15:09 +00:00
Zedifus
1596c720cb
Add ability to load credits from remote
2022-02-10 06:13:52 +00:00
luukas
c25bc72315
Added better navigation.
...
* Double chevrons on the top right to expand/collapse the sidebar
* Save sidebar preference on extra large (>= 1200px) viewports
* Auto collapse sidebar on large (>= 992px) viewports
* (Old behavior) Medium (>= 768px) and smaller viewports are mobile
Check app/frontend/templates/main_menu.html line 45 onwards for more
2022-02-10 00:26:16 +02:00
Zedifus
6cce6b93ad
Update to latest credits
2022-02-09 00:20:56 +00:00
Andrew
e2930232cd
Fix spacing with values in websocket stats update
2022-02-08 01:57:19 -05:00
Andrew
ce2e53a962
Remove (UTC Time) from server start in details. Server start time is localtime.
2022-02-08 01:08:58 -05:00
Andrew
5a290da11d
Fix typo in edit_user
2022-02-07 23:36:32 -05:00
Zedifus
624f755fd4
Better format of titles for Support & Retired
2022-02-06 05:37:19 +00:00
Zedifus
0c6bcaa097
Add if for is no img is provided for credit file
...
This fixes broken image symbol if no img provided in json
2022-02-06 05:34:45 +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
42062004a2
Add extras for crash detection
2022-01-27 21:16:19 -05:00
Andrew
005ac1216e
Add crash detection
2022-01-27 20:43:23 -05:00
Andrew
4a2a1ab451
Remove motd dynamic update as it breaks json loading
2022-01-27 18:19:11 -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
dc838d097f
Add translations for panel config/users config/api keys/ role config
2022-01-20 00:05:14 -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
