Commit Graph

182 Commits

Author SHA1 Message Date
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
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
luukas
93857f90db JWT login and multi API keys! 2022-01-15 02:23:50 +02:00
Andrew
8723a44402 better cron validation 2022-01-14 12:59:33 -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
4d636cce1b add working zip import selection functionality 2022-01-09 22:49:03 -05:00
Andrew
369ac7ad15 initial changes for zip imports selection 2022-01-09 18:04:54 -05:00
Andrew
7dd24b6b15 Improved File Loading, Fixed Port checking 2022-01-08 23:03:45 +00:00
Andrew
9ae0991f4b Make system user not super user 2021-12-20 20:24:27 -05:00
Andrew
58d1ffea54 Fix error with scheduled tasks by system
Create a system user
2021-12-20 20:17:28 -05:00
Andrew
6c262d20d7 Attempt fix for unzipping server dir 2021-12-18 19:31:21 -05:00
Andrew
bc164fef67 Add timeout to telnet. 2021-12-10 04:52:37 +00:00
Andrew
8999a9a5c3 Fix bug where terminal will not exit 2021-12-09 18:35:00 -05:00
Andrew
0d34fcdea3 Add traveral check before deleting pre-existing backup dir 2021-11-29 19:13:21 -05:00
amcmanu3
b49077991e Fix backup dir rename issue on windows. 2021-11-29 19:09:43 -05:00
Andrew
a19ba7dbb6 Backup Restore/Root Disable 2021-11-29 21:22:46 +00:00
Andrew
0cd8f6b3a7 Fix bug where no fields were required while editing servers 2021-11-27 20:09:13 -05:00
Andrew
97ddc1b964 Merge branch 'pretzel-patches' into 'dev'
# Conflicts:
#   app/classes/shared/server.py
2021-11-23 22:12:06 +00:00
Andrew
eb39577cc7 Fix index out of range if user tries to import server without server.properties file.
Fix port not changing for crafty db - only server.properties on server creation.
2021-11-22 22:26:06 -05:00
Silversthorn
f20d41242d Adding Helpers for Path
Correcting a MVC update missing function
2021-11-21 11:52:29 +01:00
Silversthorn
6f9d722a92 Fixing MOTD display 2021-11-19 21:59:23 +01:00
Iain Powrie
1c9ffb2abc Merge branch 'dev' into 'subprocess'
# Conflicts:
#   app/classes/shared/helpers.py
#   app/classes/shared/server.py
#   app/classes/web/ajax_handler.py
2021-11-06 15:26:37 +00:00
Silversthorn
05ced7610e Correction of undefined db_helper following merge 2021-09-25 23:05:49 +02:00
Silversthorn
e381ebe239 Merge branch 'dev' into dev-Silversthorn-MVC 2021-09-25 22:58:01 +02:00
Silversthorn
186dcdc616 Merge branch 'dev-Silversthorn' into dev-Silversthorn-MVC 2021-09-21 21:12:56 +02:00
Silversthorn
70ca82a086 Rework architecture for better MVC 2021-09-09 00:01:10 +02:00