Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,464 Commits 12 Branches 45 Tags 104 MiB
4205c0a8f0
Commit Graph

432 Commits

Author SHA1 Message Date
amcmanu3
db06eca12e ensure icon key exists to prevent stack 2022-03-03 23:59:17 -05:00
amcmanu3
0a08324963 Fix server reordering 2022-03-03 22:25:30 -05:00
amcmanu3
bbd4335d79 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-commander into dev 2022-03-03 22:22:08 -05:00
amcmanu3
4a32744211 Fix indent causing server ordering to not work 2022-03-03 22:22:05 -05:00
amcmanu3
d5c623b928 Merge branch 'dev' into dev-RefreshStats_Threading 2022-03-03 19:57:06 -05:00
amcmanu3
dfa9ab40ca Appease the linter 2022-03-03 19:47:49 -05:00
amcmanu3
ab7889914f Bug fixes to ensure player stats display correctly 
Add sync indicator to dashboard
 2022-03-03 19:41:30 -05:00
Andrew
d73316119b Add server download status indicator 2022-03-04 00:36:36 +00:00
Silversthorn
cb1679806e Seperate refresh statistics for each server 
Fixing Broken Things
 2022-03-03 23:13:40 +01:00
Silversthorn
d016e0a59a Broke Things 2022-03-03 22:01:12 +01:00
Andrew
61ac97c02e Add unexecuted clear. Add option to compress backups 2022-03-02 12:55:49 -05:00
Andrew
e0b8fb35fe Add option to compress backups 2022-03-02 11:34:26 -05: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
8e874ca997 Add option to disable language files through config.json 2022-03-02 10:30:40 -05:00
Andrew
19f8775b32 Fix traceback when importing regular server 2022-03-01 18:49:16 -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
11bf44b35e Add user feedback for wrong unzip path 2022-03-01 13:27:41 -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
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
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
e7d78cadd4 Initial frontend for backup omissions 2022-02-27 16:15:40 -05: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
5fa04d5ccc Refactor tasks.html to schedules.html to match naming scheme 2022-02-26 20:23:20 -05:00
Andrew
09335fc3d9 Add ability to reorder servers based on user 2022-02-26 18:00:54 -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
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
af16834419 Working chain reactions 2022-02-23 22:59:16 -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
Zedifus
1596c720cb Add ability to load credits from remote 2022-02-10 06:13:52 +00: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
37ccc447c4 Fix backup config bug 2022-01-29 16:37:00 -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
005ac1216e Add crash detection 2022-01-27 20:43:23 -05: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
Andrew
33984c9629 Fix for perms error thrown when posting api key from regular user 2022-01-20 14:14:03 -05:00
Andrew
2f3110b107 fix server deleting function due to type error after JWT merge. 2022-01-19 18:28:08 -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
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
Andrew
6f860e967c final changes for windows path issues 2022-01-19 15:14:56 -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
Andrew
f37e1e04a4 Fix gravatar not loading after being removed from cookie. Improve gravatar loading so it changes without relogging 2022-01-18 16:44:36 -05:00
Andrew
2d169e8f97 Add terminal catches for server stop command and restart command in crafty's terminal 2022-01-18 15:42:26 -05:00
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
luukas
351c386c17 Fix a websocket handler bug 2022-01-15 17:38:29 +02:00
luukas
a20f7c4acf Fix translation stuff 
* Make fallback stuff work
* Use helper.get_setting('language') instead of hardcoded 'en_US'
* Fix status and public pages lang variables
* Fix and add some translations for fi_FI
 2022-01-15 17:38:08 +02:00
Andrew
fefa6248b4 Remove time from cron dbs 2022-01-15 02:01:51 -05:00
Andrew
0d3fc43931 Remove schedules from DB when deleting a server. 
Add better messaging for support log prep.
Add english translation for notify.
Chnage dep to 4.0 for tzlocal
 2022-01-14 23:53:44 -05:00
Andrew
43a315874e Fix player data bug 2022-01-14 20:05:50 -05:00
luukas
93857f90db JWT login and multi API keys! 2022-01-15 02:23:50 +02:00
Andrew
2689a579a7 fix bug where transveral would be true every delete file due to typo 2022-01-14 16:06:02 -05:00
Andrew
8723a44402 better cron validation 2022-01-14 12:59:33 -05:00
Andrew
210b831a47 remove schedule import from servers 2022-01-14 12:57:23 -05:00
Andrew
8424fc3149 Put support logs into a thread. 2022-01-13 20:42:53 -05:00
Andrew
4a78f3c4bd update support logs to only download server logs for user permissions. Fix bug where updating user roles would update for all user roles with changes. 2022-01-13 16:44:57 -05:00
Andrew
3a3ee52f5c add logging for file downloads 2022-01-13 00:56:32 -05:00
Andrew
9f798ff291 Add popover for tasks mobile 
Add support logs download feature
 2022-01-12 21:12:28 -05:00
Andrew
e310d0e48b changing interval start times to midnight. not when the schedule was created. I think this will be more what people are expecting. 2022-01-12 11:33:08 -05:00
Andrew
e63966e7e6 fixing enabled bug in tasks for editing tasks 2022-01-11 19:20:26 -05:00
Andrew
b6a10d828e fix enable bug in tasks 2022-01-11 19:17:20 -05:00
Andrew
47b48c3ee4 Fix translations in schedules 2022-01-11 18:51:07 -05:00
Andrew
b9cf5fdbf9 Fix so bad cron characters will not destroy DB. 2022-01-11 17:41:46 -05:00
Andrew
51fcb2adc3 Add working schedules. 
Add ability to edit schedules.
Add new pages for task creation/edit.
 2022-01-11 17:24:05 -05:00
Andrew
5e7d0d64bd Cron tasks working. 
Starting to rearrange front end for better UX
 2022-01-11 12:17:57 -05:00
Andrew
c220c6d3d3 Remove schedule logic from backups. 2022-01-11 01:45:54 -05:00
Andrew
4f55ffed0f Add single execution to scheduled tasks. 2022-01-11 01:29:27 -05:00
Andrew
14ae7c9a46 Add working schedules. 
Do not use advanced cron scheduling yet.
Ability to add/delete scheduled jobs.
 2022-01-11 00:26:33 -05:00
Andrew
139b506554 Inital APScheduler code for integration with our SQLite DB in progress. Adding commands works with start/stop/restart 2022-01-10 20:11:52 -05:00
Andrew
73c6c1b871 Fix port reminder 
Add Server time zone to details
 2022-01-10 14:58:38 -05:00
Andrew
39ccb83008 Fix bug where backkups could not be restore. Directly caused by the changes made in server zip import 2022-01-10 00:10:03 -05:00
Andrew
70cc90549d Minor fixes to user deletion. 
Allow users with user permissions to delete users...wow. How many times can I say user?
 2022-01-09 23:34:11 -05:00
Andrew
db6a886e0f Fix minor bugs in super user activation. Add 'are you sure' to delete user 2022-01-09 23:16:11 -05:00
Andrew
4d636cce1b add working zip import selection functionality 2022-01-09 22:49:03 -05:00
Andrew
b815cf38a8 Zip import semi broken. 
Need to figure out why temp dir is not being passed correctly
Need to make sure tempdir gets deleted.
 2022-01-09 22:21:28 -05:00
Andrew
369ac7ad15 initial changes for zip imports selection 2022-01-09 18:04:54 -05:00
Andrew
3e90210f3b Remove port checker for a port reminder on first run 
Add DB column to track a server's first run
Send port reminder for crafty on fresh install.
Remove http server message from startup/logs - don't want to promote that it's running.
 2022-01-09 13:14:59 -05:00
Andrew
7dd24b6b15 Improved File Loading, Fixed Port checking 2022-01-08 23:03:45 +00:00
Andrew
3e2d2c89ee hotfix for failed scandir 2021-12-21 16:11:48 -05:00
Andrew
8a2f938dc9 Fix user error when trying to edit own language 
Fix bug where users could not be created because of a bad logical check for system uesr.
 2021-12-21 15:39:33 -05:00
Andrew
71d3e03875 Add final fix for system user 2021-12-20 23:04:07 -05:00
Quentin B
f018267b62 Made server polls asynchronus, fix for serverjars 2021-12-16 21:07:36 -05:00
Andrew
ebe65e081f Minor change to aestetic for tasks 2021-11-30 15:50:40 -05:00
Andrew
0845efc3b8 Add initial frontend to schedules 2021-11-30 15:46:30 -05:00
Andrew
33ab2583da Fix security issues 2021-11-30 14:37:45 -05:00
Andrew
b996f7e7e7 One added file for schedules. Fix large bug where any user could access subpages when they did not have a role to give them access. 2021-11-30 12:29:53 -05:00
Andrew
a19ba7dbb6 Backup Restore/Root Disable 2021-11-29 21:22:46 +00:00
Andrew
78834c1ed0 Fix bug where general user can change working directory and potentially destroy a system. 
Initial commit for path traversal for server config only.
 2021-11-27 21:52:49 -05:00
Andrew
4c6b459b43 Remove useless if in backups.i 2021-11-27 19:28:53 -05:00
Andrew
1bf47b5c54 Rework server start to look for user_id and not user_lang. Gives acces to more user info. 
Fixes websocket broadcast to only send broadcast to user who sent original request.
 2021-11-27 17:10:43 -05:00
Andrew
db4812c8ea Add feature where if server executable is changed in config it also changes the execution string to match. 2021-11-27 14:29:28 -05:00
Andrew
f569d3b4f0 Fix user lang for Lukas on panel_handler.py 2021-11-23 17:29:34 -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
dc83dc8fc8 Add EULA confirm message on server startup if EULA is not found. 2021-11-23 16:11:23 -05:00
Andrew
0e942311fb Add error message on login that does not direct to new page. 
Remove failed to create dir error on startup when crafty cannot create dir since it exists after first startup.

Error logging is still enabled for every error except FileExists for this case.
 2021-11-23 13:22:15 -05:00
Silversthorn
ea48bd5562 Merge branch 'dev' into dev-PathHelpers 2021-11-21 11:56:07 +01:00
Silversthorn
f20d41242d Adding Helpers for Path 
Correcting a MVC update missing function
 2021-11-21 11:52:29 +01:00
Andrew
315cd6909c Fixes update bug where 2 parameters were given when update only expected one. 
Adds "Access to All servers" for exec_super_user.

Will need to add translation support for accessto all servers message.
 2021-11-20 12:25:14 -05:00
Silversthorn
77deb6c126 Cleaner Path for Backups 2021-11-20 15:34:58 +01:00
Silversthorn
5164000c9a Fixing Path Errors for Backup files (Windows) 2021-11-20 14:44:20 +01:00
Andrew
b7039573a4 Maybe I fixed backups? 
Another attempt at allowing windows users to think about what they did by choosing windows to run a server on while also deleting backups
 2021-11-19 22:17:24 -05:00
Andrew
67444a2d4f More reverts from the windows issue. 2021-11-19 22:02:59 -05:00
Andrew
79190e15f5 Revert last push 2021-11-19 21:56:09 -05:00
Andrew
bd3da474f5 Another attempt to fix backup delete issue. 
This is hacky and can probably be done better.
 2021-11-19 21:47:03 -05:00
Andrew
146873eb10 Attempt to fix windows backup delete issue. Zedifus will test. 2021-11-19 21:28:46 -05:00
Andrew
4d31ee399a Puts a temporary fix on deleting backups. Will be fixed in alpha 4 2021-11-19 21:09:09 -05:00
Zedifus
6eb4f313f9 Add last updated timestamp to patrons 2021-11-18 21:08:19 +00:00
Zedifus
6744fe5409 Correct patreon to patron 
Patreon is the platform, supporters are patrons
 2021-11-18 20:01:30 +00:00
Andrew
aeb6b774f4 Fixes tryexceptpass for helpers and panel handler. 2021-11-17 17:23:14 -05:00
Andrew
327122348d Adds checkbox option for adding roles at server creation. 
Fixes bug on Panel Config page where duplicate servers would be listed.
Changes the way "roles" are served to the page. Dictionary instead of model object.
 2021-11-17 13:08:41 -05:00
Andrew
917bd5e32d Working single role selection on server creation. 2021-11-17 01:17:36 -05: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
Andrew
a93860ebd8 Fixes bug in player counts 2021-10-20 22:31:36 -04:00
Andrew
87b6bd7758 Enhances language on login page 2021-10-18 17:27:19 -04:00
Andrew
b4707703af Fixes translation error on status page. 2021-10-18 17:26:03 -04:00
Andrew
fdf9b3fcb9 Fixes bug where all servers would be included in offline/online count even if the user did not have access to those servers. 2021-10-18 17:11:43 -04:00
Silversthorn
eee528f329 Fixing Allowed Server on Config Page 2021-10-09 11:30:21 +02:00
Silversthorn
6984fe7abc Corrections on server creation 2021-10-09 10:59:54 +02:00
Silversthorn
a074cb7e1d Correction for roles on server creation 
Fix for superuser to be able to create a server
Don't create a role if the creator is a superuser
 2021-10-09 10:32:52 +02:00
Andrew
fc4e8a00e1 Working out bugs in regular user language 2021-09-29 19:50:51 -04:00
Andrew
72a85d7e64 Adds user based languages 
changes server creation so that it adds it to roles instead of creating one
Changes server creation so you cannot create a server without a role.
 2021-09-29 19:32:21 -04:00
Andrew
d0f6e6b8a9 More changes to users lang 2021-09-29 18:05:07 -04:00
Andrew
0ee8418ba5 Merge branch 'db-lang' into 'user-language' 
Db lang

See merge request crafty-controller/crafty-commander!79
 2021-09-29 21:50:17 +00:00
Andrew
56deaa0bcb Initial back end support for user based languages 2021-09-29 17:46:54 -04:00
Andrew
acedb0ad8a Added inital setup for user-based languages. 
Waiting for DB changes to finish.
 2021-09-28 22:25:47 -04:00
Silversthorn
8f2338c709 Correction for Uploading Files 2021-09-28 23:48:54 +02:00
Silversthorn
38f1b3908a Correction Crafty Perms 2021-09-28 18:41:54 +02:00
Silversthorn
93d3816f3a Correction controller links 2021-09-28 18:40:31 +02:00
Silversthorn
02358f189b Unique Name at Server Creation 2021-09-27 21:34:54 +02:00
Silversthorn
e059e7166c Fixing undefined controller on Upload 2021-09-26 01:02:05 +02: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
computergeek125
250b68ae51 Protype subprocess management 2021-09-25 14:29:28 -05:00
Andrew
74f4bf748e Adds support for a friendlier splashscreen when no servers are created. 
Users can go to an empty dashboard instead of a wall of text.
 2021-09-25 15:07:39 -04:00