Andrew
2d169e8f97
Add terminal catches for server stop command and restart command in crafty's terminal
2022-01-18 15:42:26 -05:00
Andrew
b368246614
If you want to start a server...or stop it... or send any command you should patch your install with this commit
2022-01-18 15:00:00 -05:00
Andrew
5087813900
add catch for restart command. Fix windows bug.
2022-01-18 14:43:22 -05:00
Andrew
2f1b56121a
fix windows path bug
2022-01-18 13:59:53 -05:00
Andrew
a49c5c0e92
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2022-01-18 13:16:12 -05:00
Andrew
bda81b8e20
Add delay on logs download start for on screen messages
2022-01-18 13:16:09 -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
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
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
Andrew
ccc41b7419
fix bug where crash detection was still using schedule
2022-01-14 19:52:51 -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
c736c2eec1
Fix for tzdata
2022-01-14 14:59:06 -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
ef4a31d1e8
Attempt fix for delayed start issues - was finally able to reproduce
...
Port feature from 3.4 added by Trevor (@uplusion23) for terminal history.
Add datatable to mobile version of tasks.
2022-01-14 02:35:26 -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
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
362f16fec4
Fix sorting on schedules
...
Fix deleting scheduled tasks that are disabled.
2022-01-13 00:30:35 -05:00
Andrew
9f798ff291
Add popover for tasks mobile
...
Add support logs download feature
2022-01-12 21:12:28 -05:00
Andrew
70ae81ecc9
setup logging for schedules in schedule.log
2022-01-12 17:29:45 -05:00
Andrew
a4071a3962
Add logging when loading schedules
2022-01-12 16:09:38 -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
7981f90a77
Fix bug where backups would not run due to extraneous character in server init
2022-01-12 01:24:03 -05:00
Andrew
3acc89c0eb
Remove depreciated scheduler from tasks
2022-01-11 21:56:37 -05:00
Andrew
5fc2f06274
Fix bug with re-enabling a task
2022-01-11 19:30:00 -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
e2f4a33380
Fix bug where servers would not auto start.
2022-01-11 18:30:06 -05:00
Andrew
85bcac7af4
Merge branch 'dew-schedule' into 'dev'
...
First major Schedules Commit to Dev
See merge request crafty-controller/crafty-commander!129
2022-01-11 22:49:09 +00:00
Andrew
8edec0357a
remove scheduler import
2022-01-11 17:47:37 -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
134a6431b8
Fix waiting start issue
2022-01-11 01:38:14 -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
deeff1717b
adding tempdir back
2022-01-09 22:27:43 -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
a1c67009c4
Remove crafty_managed.txt from showing up in files listing in crafty. managed.txt will still show up in dir.
2022-01-09 02:07:18 -05:00
Andrew
74b416b93f
Fix rename value showing up as null
2022-01-09 00:09:18 -05:00
Andrew
7dd24b6b15
Improved File Loading, Fixed Port checking
2022-01-08 23:03:45 +00:00
Andrew
5d6cbf6a4f
add port checking stuff
2021-12-21 17:39:24 -05:00
Andrew
c9908a3e0f
Add sorting to filelist
2021-12-21 17:36:49 -05:00
Andrew
460472fe9d
Fix weird caching thing causing slow folder opening on files
2021-12-21 17:33:59 -05:00
Andrew
3e2d2c89ee
hotfix for failed scandir
2021-12-21 16:11:48 -05:00
Andrew
3ed304c378
Add fix for port checker. We'll see if this works this time.
2021-12-21 15:58:48 -05:00
Andrew
07d7c7ae60
Remove extraneous print statements.
2021-12-21 15:52: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
2afecf8fab
Add improved file functions.
...
Add sort in filenames
2021-12-21 15:04:32 -05:00
Andrew
71d3e03875
Add final fix for system user
2021-12-20 23:04:07 -05:00
Andrew
b4f247bb95
Add final fixes for system user and automated backups
2021-12-20 22:34:20 -05:00
Andrew
9ae0991f4b
Make system user not super user
2021-12-20 20:24:27 -05:00
Andrew
67eee3374c
Merge branch 'dev' into 'pretzel-branch'
...
Dev
See merge request crafty-controller/crafty-commander!117
2021-12-21 01:18:36 +00: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
Quentin B
f018267b62
Made server polls asynchronus, fix for serverjars
2021-12-16 21:07:36 -05:00
xithical
cf1403a0ee
Added better handling for non UTF-8 characters in output
2021-12-13 20:44:22 -06:00
Andrew
c59b13bfde
Fix port issue
2021-12-09 23:58:35 -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
635f671fd9
Move internet check to start after server has started.
2021-12-09 17:58:36 -05:00
Andrew
49893ea5a6
Merge branch 'pretzels-fixes' into 'dev'
...
Pretzels fixes
See merge request crafty-controller/crafty-commander!110
2021-12-09 22:39:40 +00:00
Andrew
fd62da8137
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2021-12-09 11:33:27 -05:00
Quentin
12153b1207
Merge branch 'fix/exit-code-tweak' into 'dev'
...
removed old exit handling logic
See merge request crafty-controller/crafty-commander!109
2021-12-06 05:50:48 +00:00
Quentin B
b2dc1521d6
removed old exit handling logic
2021-12-05 23:01:44 -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
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
f2a55da58d
Fix windows root issues.
2021-11-29 17:18:06 -05:00
Andrew
1625883a7b
sending changes to windows
2021-11-29 17:12:25 -05:00
Andrew
79284a9094
Add potential fix for windows admin lockout
2021-11-29 16:56:17 -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
0cd8f6b3a7
Fix bug where no fields were required while editing servers
2021-11-27 20:09:13 -05:00
Andrew
4c6b459b43
Remove useless if in backups.i
2021-11-27 19:28:53 -05:00
Andrew
bfe6cabd9e
Fix bug where a false EULA on delay start would cause the user to never be able to start the server.
2021-11-27 18:43:14 -05:00
Andrew
c7d3b3aa1c
Fix update notifications.
2021-11-27 18:32:53 -05:00
Andrew
12c4c9ec45
Fix bug where all server terminals would show updating.
2021-11-27 17:46:37 -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
e21a019de4
Add better logging to falling back to default language on server start.
2021-11-27 12:53:29 -05:00
Andrew
64c4df343a
Fix autostart error with missing param.
...
Takes default lang for errors on auto start since there is no user language to choose from for an auto start error.
2021-11-27 12:01:55 -05:00
Andrew
f569d3b4f0
Fix user lang for Lukas on panel_handler.py
2021-11-23 17:29:34 -05:00
Andrew
c811c568a5
Fix Merge issues
2021-11-23 17:16:33 -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
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
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
cef282ca91
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2021-11-19 21:10:33 -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
computergeek125
62cac66e8e
revert readall change since it didn't work
2021-11-19 19:06:35 -06:00
computergeek125
5230a7ddc3
fix I/O thread read, fixed thread ident/pid
2021-11-19 18:31:33 -06:00
computergeek125
45e074ac4a
Resolved thread leak, fixed non-Minecraft java terminate, renamed
...
threads
2021-11-19 18:14:32 -06:00
Silversthorn
6f9d722a92
Fixing MOTD display
2021-11-19 21:59:23 +01:00
Iain Powrie
c40ce93ca5
Merge branch 'tweak/update-credits-json' into 'dev'
...
Update Credits
See merge request crafty-controller/crafty-commander!87
2021-11-19 16:58:12 +00:00
Andrew
df398718f1
Fixes bug for backup loops on shutil.
2021-11-19 01:07:53 -05:00
Andrew
65a9c54f72
Fixes DB corruption when saving backup config.
2021-11-18 23:44:29 -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
computergeek125
64ec33ff52
Resolved subprocess issues with windows
...
- Repaired introduced bug where backslashes in the far path weren't
handled properly
- Resolved latent subprocess issue where stdout would fail to send
websocket notifications when a a windows \r\n was emitted
2021-11-14 18:17:23 -06:00
computergeek125
9720929e33
Resolved missing stdout when java process exits quickly
2021-11-06 12:06:26 -05:00
computergeek125
82f4661044
Fixed db_helper issue
2021-11-06 11:27:15 -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
895e6106a7
Fixing utf-8 encodinf traduction files
2021-10-09 12:51:41 +02: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
2f36cdd249
Correction for crafty permissions
2021-10-09 10:45:40 +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
606d0ac74b
Allows translation on start error messages.
2021-09-29 21:53:14 -04:00
Andrew
f16580aa43
Fixes bug where non-super users couldn't edit language/password
2021-09-29 20:06:16 -04: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
Silversthorn
8574547d14
Correction Role Edit
2021-09-29 22:08:43 +02:00
Silversthorn
a180d80f5b
Fixing Role Deletion
2021-09-29 21:46:11 +02:00
Silversthorn
5a0789faa5
Fixing role edit in case creating role before server
2021-09-29 21:40:56 +02:00
Silversthorn
f5ae4d02ff
Correction Role deletion
2021-09-29 21:14:34 +02:00
Silversthorn
1015c4032e
Correction Role when deleting Server
2021-09-29 20:57:04 +02: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
04a2de14fd
Correction for status Page
2021-09-27 21:52:50 +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
85878382b7
Fixing Starting Servers
2021-09-26 00:25:24 +02:00
Silversthorn
057379d888
Fixing Remove Roles when Removing a Server
2021-09-26 00:17:06 +02:00
Silversthorn
eb3b86641d
Fixing Server Deletion Error
2021-09-25 23:59:01 +02:00
Silversthorn
eee9796428
Move out_buf in the try method
2021-09-25 23:08:40 +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
computergeek125
4f320e69a5
Added string to array command parser
2021-09-25 14:29:03 -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
Andrew
28f46a6f01
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2021-09-25 13:26:46 -04:00
computergeek125
f10db73fa5
Set TCP timeout to a more reasonable value
2021-09-25 12:26:10 -05:00
Andrew
aa24782b5b
Fixes error thrown on initial server creation for waiting_start.
2021-09-25 13:26:06 -04:00
computergeek125
6fe8debeba
Set TCP timeout to a more reasonable value
2021-09-25 12:25:27 -05:00
Andrew
959b02f58f
Adds exception to page_data for initial server creation.
2021-09-25 11:56:12 -04:00
Zedifus
d93038a70d
Fix unhandled exception with port check function
2021-09-24 22:20:13 +01:00
Silversthorn
5146a490df
Merge dev to dev-MVC
2021-09-21 21:13:17 +02:00
Silversthorn
186dcdc616
Merge branch 'dev-Silversthorn' into dev-Silversthorn-MVC
2021-09-21 21:12:56 +02:00
Silversthorn
813ce1c73b
Merge branch 'dev' into dev-Silversthorn
2021-09-21 21:01:40 +02:00
Andrew
44478939db
Merge branch 'wait_start' into 'dev-staging'
...
Wait start
See merge request crafty-controller/crafty-commander!72
2021-09-20 22:32:19 +00:00
Andrew
6e54089890
Adds delayed start status for auto-launching servers when crafty starts.
2021-09-20 18:30:17 -04:00
Andrew
afc95a40fe
Fixes bug where you cannot disable auto backup
2021-09-20 15:41:08 -04:00
Andrew
f032f4054e
Adds inital support for waiting to start. Need to test on more powerful machine.
2021-09-20 14:46:31 -04:00
Andrew
dfc07fcb4c
Fixes message for audit log. I know, I know too many pushes to dev. I'm done I promise!
2021-09-13 22:58:29 -04:00
Andrew
f18d74540a
Fixes bug where player counts would cause crash if not super user.
...
Adds commands sent through terminal to audit log.
Makes it so regular users cannot see the audit log.
2021-09-13 22:02:57 -04:00
Andrew
afb95dc828
Final change for port ping issues
2021-09-13 20:08:38 -04:00
Andrew
f594c7a638
Fixes server-port/ip not updating after config change for stats.
2021-09-13 19:18:56 -04:00
Andrew
92725d2249
Starts troubleshooting of port not changing after config change.
2021-09-13 17:52:09 -04:00
Andrew
333cd33be3
Fixes server port writing issue.
2021-09-13 17:04:46 -04:00
Andrew
45d2bff57a
Adds translations to start error messages.
2021-09-13 15:37:59 -04:00
Andrew
7316cc7ea0
Adds kill process button to dashboard.
2021-09-13 15:03:47 -04:00
Andrew
2528c123f2
Adds port/internet connection checks.
...
Checks when crafty starts for internet and a port forward for Crafty's https port.
Checks on server launch for internet connection and for port forwarding for executed server.
2021-09-13 13:10:34 -04:00
Silversthorn
1c13c640fc
fixing double server start process
2021-09-09 22:00:52 +02:00
Silversthorn
600430547f
server creation fix
2021-09-09 00:20:38 +02:00
Silversthorn
70ca82a086
Rework architecture for better MVC
2021-09-09 00:01:10 +02:00
Silversthorn
cb73540e65
Doing MVC on Crafty Permissions
2021-09-06 19:27:01 +02:00
Silversthorn
2d3482db4f
Merge
2021-08-30 21:31:29 +02:00
Silversthorn
b7802fdc45
Merge branch 'dev-Silversthorn' of gitlab.com:crafty-controller/crafty-commander into dev-Silversthorn
2021-08-30 21:31:20 +02:00
Silversthorn
4c5ddf8f80
Fixing one comment
2021-08-30 21:23:21 +02:00
Silversthorn
40be16ec96
Adding TTL helpers functions
2021-08-30 20:58:30 +02:00
Silversthorn
bbcde97684
Commenting and Sorting some Code
2021-08-30 20:43:07 +02:00
Silversthorn
3ff3d0ccf1
Adding MOTD on Status Page
2021-08-29 00:48:30 +02:00
Silversthorn
a05b3a8634
Status Improvements and Fix
2021-08-28 01:48:46 +02:00
Andrew
48c70279f7
Fixes error thrown when server download doesn't finsih before server creation ends.
...
Adds notification when download is complete.
2021-08-26 22:43:11 -04:00
Andrew
4721085783
Merge branch 'status' into 'dev'
...
Adds status page at /status
See merge request crafty-controller/crafty-commander!63
2021-08-27 01:08:26 +00:00
Andrew
e4d94fbda5
Adds status page at /status
2021-08-26 21:06:22 -04:00
Zedifus
1eb7ebdc11
Fix no attribute 'Insert' bug
2021-08-26 23:39:11 +01:00
Silversthorn
4210dfbe77
Last fix for Old Crafty Users without Permissions (I hope)
2021-08-27 00:09:16 +02:00
Silversthorn
f249841438
Fixing definitely Permissions for old users
2021-08-26 23:23:26 +02:00
Silversthorn
e5212698fe
Fixing permissions limits on old users
2021-08-26 22:42:10 +02:00
Silversthorn
2cf7ae464b
Fixing permissions for old users without Crafty permissions
2021-08-26 21:21:53 +02:00
Silversthorn
f4ca0f6559
Addind support for -1 unlimited check
2021-08-25 20:22:43 +02:00
Andrew
b77aab954d
Adds download options for files in file tree. This does not add ability to download directories.
2021-08-24 21:33:29 -04:00
Andrew
aea023b893
Fixes error thrown when calling add_user page
2021-08-24 19:25:35 -04:00
Andrew
af7e31a744
Fixes issue with error thrown when click save in edit_user
2021-08-24 19:19:33 -04:00
Andrew
754da44b5b
Merge branch 'http_redirect' into 'dev'
...
Adds support for http redirects to https
See merge request crafty-controller/crafty-commander!61
2021-08-24 22:33:27 +00:00
Silversthorn
397fbd5268
Adding Support For Server Creation Quantity Limit
2021-08-25 00:23:33 +02:00
Silversthorn
bb1f43bc81
Adding Support for Crafty Permissions with limits
2021-08-24 23:07:00 +02:00
Andrew
d8f090b34d
Makes redirect code way more efficient.
2021-08-23 22:54:52 -04:00
Andrew
42bdc055aa
Adds some http redirect support. User is redirected to https login screen on attempted connection.
2021-08-23 22:25:19 -04:00
Silversthorn
cf331a8bc3
Merge branch 'dev' into dev-Silversthorn
2021-08-24 00:25:07 +02:00
Silversthorn
261c8665c8
Pretty Server Version Choice
2021-08-24 00:24:40 +02:00
Andrew
ce4a7619a6
Fixes wait window closing after first upload is complete and not waiting for all uploads to complete.
2021-08-23 18:22:35 -04:00
Silversthorn
6a29f1063b
Fixing Migrations Issues
2021-08-23 21:41:27 +02:00
Andrew
d83fd73755
Fix models error when trying to edit admin username
2021-08-22 17:42:12 -04:00
Andrew
6022e3814f
Fixed typo in uploads
2021-08-22 17:37:37 -04:00
Andrew
24aec429cc
Bandaid db error on migrations by comment.
...
Fix error in models where value was undefined
2021-08-22 17:29:52 -04:00
Andrew
192a5f2664
Modify handler to adapat to changes made in models.
2021-08-22 16:59:33 -04:00
Andrew
b24fd93487
Merge branch 'broken-uploads' into 'dev'
...
Fixed upload streams
See merge request crafty-controller/crafty-commander!53
2021-08-22 20:37:02 +00:00
Andrew
68202cfa7b
Removed uploads from Ajax handler
2021-08-22 16:34:22 -04:00
Andrew
86c1b374bf
Fixed upload streams
...
Lukas added a lot of pretty things to the upload waiting screen.
Current bug: progress bar is not 100% working.
2021-08-22 16:31:49 -04:00
Silversthorn
1acb7827ae
Reworking Functions After User_Servers Deletion
2021-08-22 18:50:30 +02:00
Andrew
734a576cb9
Still broken
2021-08-22 10:54:34 -04:00
Andrew
7389b37198
Initial commit on this broken branch
2021-08-22 10:17:33 -04:00
Silversthorn
0b29bdf855
Deletion on User_Servers table
2021-08-22 12:21:59 +02:00
Silversthorn
88042998d9
Merge branch 'dev' into dev-Silversthorn
2021-08-22 12:14:31 +02:00
Silversthorn
331f3e7b12
Adding Crafty Permissions
2021-08-22 11:57:02 +02:00
Silversthorn
540cdf6149
Fixing Roles Permissions for Server Creation
2021-08-22 11:06:44 +02:00
Andrew
73d8be2d57
Still cleaning up my mess...sorry
2021-08-21 23:56:02 -04:00
Andrew
0d11b80181
Merge branch 'dev' into 'dewfix'
...
# Conflicts:
# app/classes/shared/models.py
2021-08-22 03:38:39 +00:00
Andrew
7f1f667212
This should fix everything
2021-08-21 23:36:48 -04:00
Andrew
a57a66901c
Revert "Merge branch 'revert-ecb2cfbe' into 'dev'"
...
This reverts merge request !49
2021-08-22 03:34:05 +00:00
Andrew
773ace55ad
Revert "Fixed error with modelselect"
...
This reverts commit cbd5d29fe9
2021-08-22 03:30:43 +00:00
Andrew
f472b377d2
Revert "Fixed bug where servers would not get added to roles on creation"
...
This reverts commit ecb2cfbe01
2021-08-22 03:27:12 +00:00
Andrew
cbd5d29fe9
Fixed error with modelselect
2021-08-21 23:21:06 -04:00
Andrew
8de3b3b3cd
Removed User_Servers table.
2021-08-21 23:17:54 -04:00
Andrew
ecb2cfbe01
Fixed bug where servers would not get added to roles on creation
2021-08-21 22:47:43 -04:00
Andrew
c86c5040ea
Fixed bug where new servers would not be added to current role
2021-08-21 22:43:16 -04:00
Andrew
2851493589
Removed servers from user_role_permissions query. Not needed and caused query to result in none very time
2021-08-21 22:02:27 -04:00
Silversthorn
1262d6708b
Improve UI and Permissions on Dashboard
2021-08-22 01:41:25 +02:00
Andrew
c8759ac872
Added serverdownload to thread.
...
Removed exit command if server jar doesn't exist. This was causing exit.txt to constantly try to stop crafty after a jar download in the thread.
2021-08-21 14:25:39 -04:00
Silversthorn
0e7013f2bc
Role Replication
...
Removing because Can give Role from an other Server to This Server
2021-08-21 16:46:50 +02:00
Silversthorn
31436bdc62
Merge branch 'dev' into dev-Silversthorn
2021-08-21 16:44:02 +02:00
Andrew
1150c98faf
Made it so server is added to all user roles when created.
2021-08-21 10:30:37 -04:00
Andrew
89f6a98dc9
Took out ability to assign specific users to specific servers. All role based now.
2021-08-21 10:07:43 -04:00
Silversthorn
a68d24b890
Adding Working Permissions for roles on html pages
2021-08-21 10:44:03 +02:00
Andrew
77a6d260a1
Made it so a new thread is spawned for uploads.
...
Need to add file checking so system doesn't crash when a user tries to upload a dmg or a .mov
2021-08-20 15:41:22 -04:00
Andrew
f539f9e095
I leaned on my keyboard just before the last commit. Fixed the things
2021-08-19 23:50:24 -04:00
Andrew
e08df4d369
Completed file uploading. Need to fix listing when right clicking. Unzip is shown at all times. Added unzip function to helpers and is called through ajax for unzipping files to current directory.
2021-08-19 23:36:25 -04:00
Florian RVT
8b66fc3fc4
Adding permissions on role_servers with edit
2021-08-20 00:18:50 +02:00
Andrew
90d59faf5b
This is broken right now. Trying to add unzip function
2021-08-19 16:50:18 -04:00
xithical
c20ffb522d
Merge branch 'dev' into 'xithical'
...
# Conflicts:
# app/classes/shared/server.py
2021-08-18 23:30:45 +00:00
Andrew
00422f24cd
Moved delete server to ajax call instead of a task.
2021-08-18 18:50:53 -04:00
Andrew
c1ce2b985a
Fixed bugs from pretzel merge
2021-08-18 12:50:13 -04:00
Andrew
0ab8f11a60
Merge branch 'dev' into 'pretzel'
...
# Conflicts:
# app/classes/shared/server.py
# app/classes/web/panel_handler.py
# main.py
2021-08-18 16:34:41 +00:00
Andrew
9a2212e94e
Merge branch 'lukas-features' into 'dev'
...
Lukas features
See merge request crafty-controller/crafty-commander!45
2021-08-18 16:29:36 +00:00
luukas
f8aad8b33d
Add database migrations!
2021-08-18 18:11:53 +03:00
Scott R
689e4abb51
Oops! All backups are gone... but not anymore!
...
While loop automatically removed all old backups greater than the max backups threshold... including if it was set to 0. Set a test for the while loop to make sure max backups is greater than 0 before deletey delete
2021-08-14 00:07:24 -05:00
Scott R
5b8764cb45
Removed extra .zip
...
Unnecessary .zip in backup filename generation in server.py, nuked it
2021-08-14 00:00:09 -05:00
Scott R
096a38ae54
Redoing shutil zip after merging new DB things
...
Merged from Pretzel for DB change things and needed to readd code for shutil for zipping
2021-08-13 23:28:41 -05:00
Andrew
118fc7936f
Improved text highlighting for papermc servers. Need to still figure out what's going on with some random characters showing up.
2021-08-12 10:16:19 -04:00
Andrew
aebf50dfc6
Fixed updates
2021-08-12 00:33:18 -04:00
Andrew
0875734777
Key errors are fixed in this
2021-08-11 23:49:06 -04:00
Andrew
6cc87c6dd1
Cleaned up backups after I broke them.
2021-08-11 23:33:18 -04:00
Andrew
001a8ee9c3
Don't use a while loop to constantly write changes to DB.
2021-08-11 23:14:33 -04:00
luukas
d1f582edfe
Full release on stdout fix!
...
Basically I ditch the ANSI codes and use the old highlighting system.
2021-08-11 23:29:31 +03:00
luukas
4bac56e84a
Use stdout for virtual terminal. WebSockets seem to be "laggy".
2021-08-10 23:17:56 +03:00
luukas
7b66cc261e
Add cache for if language file exists
2021-08-10 22:36:17 +03:00
xithical
c3be92f1e8
Fixed showing all servers on new server creation
...
Removed extraneous variable definition for defined_servers, which caused all servers to appear in menu when creating a new server regardless of role
2021-08-09 22:20:18 -04:00
xithical
0689b735ff
Fixed showing all servers on new server creation
...
Removed extraneous variable definition for defined_servers, which caused all servers to appear in menu when creating a new server regardless of role
2021-08-09 21:11:15 -05:00
Andrew
8db46d6ab6
Added option to remove server files on delete.
...
Added confirmation for server delete.
2021-08-09 20:48:22 -04:00
Andrew
046228a0e1
Fixed bug that I created in create roles. Just didn't add data to the page that should have been there
2021-08-09 17:18:02 -04:00
Andrew
488175cc2e
Added users attached to roles on role edit page.
2021-08-09 17:11:45 -04:00
Andrew
7dd4702680
Fixed error thrown on add user
2021-08-09 01:44:16 -04:00
Andrew
0e5e2cd217
Added the ability for non super-users to change their own password.
2021-08-09 01:29:13 -04:00
Andrew
b1215ff20a
Fixed bug where all roles showed the sum of servers associated with all roles
2021-08-09 00:24:08 -04:00
Andrew
9ec10db762
Disabled checkboxes in user configs if servers were granted by role.
2021-08-08 18:26:28 -04:00
Andrew
debabfc045
Added server/role lists to panel config
2021-08-08 16:43:04 -04:00
Andrew
e4db76e4b9
Removing print statements.
2021-08-08 13:30:16 -04:00
Andrew
160e374c7a
Update messages are working, but it's not clean and we should find a better way at some point.
2021-08-07 15:23:22 -04:00
Andrew
e86998e57d
This is the unstable version of pretzel where he breaks things.
2021-08-07 13:15:53 -04:00
Andrew
ca9788081b
Removed print statements
2021-08-06 14:15:10 -04:00
Andrew
f957d54348
Fixed issue with duplicate servers on dash if role and user both had access to the server.
2021-08-06 13:47:06 -04:00
Andrew
67008f0e37
Fixed bug where if a user created a server they would not have access to it.
2021-08-06 12:49:07 -04:00
Andrew
e40fb45853
Bug fixes for user/role based servers.
2021-08-06 12:21:47 -04:00
Andrew
e827460a18
Revert
2021-08-06 01:13:58 -04:00
Andrew
4bb798fd0c
Dumb commit because I had an extraneous _
2021-08-06 01:08:33 -04:00
Andrew
41846e34a9
Made it so only super user can see other roles/users
2021-08-06 01:05:46 -04:00
Andrew
b39e0e3a62
Added users to servers. Fixed some bugs with assigning users to role/servers. Fixed bug where user could not edit server config
2021-08-06 00:34:57 -04:00
Andrew
6aa910c8de
Added check for server.properties to avoid white throwback if server.properties doesn't exist on a zip import.
2021-08-05 17:17:36 -04:00
Andrew
e15de6c461
Merge branch 'pretzel' of https://gitlab.com/crafty-controller/crafty-commander into pretzel
2021-08-04 22:07:51 -04:00
Andrew
4f9dd972cb
Added a fix for zip import. Should still add a catch for no server.properties and create one.
2021-08-04 22:06:38 -04:00
luukas
801d79fdca
Fix Crafty version string
2021-07-30 22:50:33 +03:00
luukas
f5b6583dbf
Remove unnecessary console.debug's
2021-07-30 19:27:48 +03:00
luukas
7acf095463
Make HTTP handler functions not return anything else than None to remove an error in the log. Also make users not log out when visiting a page on the public handler
2021-07-30 19:20:01 +03:00
Andrew McManus
3d979ffed3
Merge branch 'pretzel_update' into 'pretzel'
...
Added update button and bug fixes
See merge request crafty-controller/crafty-commander!31
2021-07-30 14:59:16 +00:00
Andrew McManus
c2a673dfc3
Added Try Catch around server job spawn. This fixes bug where crafty would not gracefully handle if java did not exist.
2021-07-30 10:30:58 -04:00
Andrew McManus
feab08b36f
Minor changes
2021-07-26 22:22:31 -04:00
Andrew McManus
c3b4b1f213
Minor adjustments to updates
2021-07-26 22:17:37 -04:00
Andrew McManus
f8cda4b748
I don't know the difference between str and int I guess.
2021-07-26 21:49:47 -04:00
Andrew McManus
4e4911e0b5
I don't know how to indent
2021-07-26 21:45:33 -04:00
Andrew McManus
a661d33698
Fixing bugs with updates
2021-07-26 21:39:22 -04:00
Andrew McManus
c8f25b0f9c
Added block to change to updating if user hits dash or term before the update actually starts.
2021-07-26 21:23:56 -04:00
Andrew McManus
67d5723c07
Re-enabled backups for updating jars.
2021-07-26 21:14:36 -04:00
Andrew McManus
a8449cc6f2
Cleanup update code
2021-07-26 21:08:46 -04:00
Andrew McManus
0643a68c74
Adding refresh on dash and term when update finishes to get the status to change. Could not do it dynamically. Buttons would no longer be clickable. Would like to figure that out at some point in the future.
2021-07-26 21:05:52 -04:00
Andrew McManus
a2f32ed324
Another commit because it seems like the first one didn't work. Added seamless hchanging on update status
2021-07-26 18:43:57 -04:00
Andrew McManus
902f7e79bb
Fixed bug where start command checks if the server was updating would fail everytime.
2021-07-26 12:11:46 -04:00
Andrew McManus
979c67d064
Added db setter for stats field (updating) so we can disable start button when server is updating.
2021-07-25 17:04:10 -04:00
Andrew McManus
aaf8438ddb
Added backup to jar update.
2021-07-25 11:49:11 -04:00
Andrew McManus
12db23f6e6
Fixed bug where settings were not reloaded from DB when server is launched
2021-07-25 11:28:09 -04:00
Andrew McManus
3c313fa52f
Fixed bug where backup screen would lock up. Now runs in it's own thread. Fixed backup bug where if a user had a policy of 4 backups, but changed it to 2 then backed up Crafty would only delete the oldest one. No the two oldest.
2021-07-25 11:05:16 -04:00
Andrew McManus
c48fa435fe
Fixed bug where update would not happen once server was shut down if server was running when button was pressed.
2021-07-24 21:32:16 -04:00
Andrew McManus
9cb46a86fb
Added executable updater
2021-07-24 21:09:39 -04:00
luukas
a79f42f4da
Escape logfile output, fixes weird formatting and remote code execution vulnerability
2021-06-02 21:47:08 +03:00
luukas
5a5cd65d4f
Sort server types, I suffered a lot while doing this
2021-06-02 21:17:50 +03:00
luukas
918364d08a
Remove accidental line I added in 736924c8
2021-05-27 21:42:43 +03:00
luukas
55d63c1f7a
Add translation file caching, show file read error (if any) and fix a typo in the Finnish translation.
2021-05-27 21:39:46 +03:00
luukas
13d8259869
Make sure server name is not empty
2021-05-02 18:57:53 +03:00
luukas
092a8e85f1
Fix not being able to go to credits or contribute page when there are no servers
2021-05-02 18:52:10 +03:00
luukas
db9e6c2fac
Move webserver online logging to the right place
2021-05-02 18:15:19 +03:00
luukas
890e0a1925
Fix blank page on wrong password and add spaces to previous login failed redirects
2021-05-02 18:05:14 +03:00
luukas
d13f8aedcb
Add better audit log stuff to server creation
2021-04-19 13:36:12 +03:00
luukas
e71b6ce0b1
Fix __init__ being defined 2 times in cmd.py MainPrompt
2021-04-18 13:03:21 +03:00
luukas
23ce45724a
Create universal exit function so exiting code can be in one place.
2021-04-18 00:24:54 +03:00
luukas
736924c839
Fix uptime negative time error by saving it as UTC from the start.
2021-04-18 00:20:23 +03:00
luukas
9049e44803
Fix logging on import errors
2021-04-17 23:34:13 +03:00
luukas
d5e83c5935
Fix a bunch of errors in API base handler and
...
add some verbosity to logging in it
2021-04-17 18:19:19 +03:00
luukas
2e2d338c9d
Fix static handler 404 error
2021-04-17 18:12:23 +03:00
luukas
805f51ffb2
One big bug slapping commit
...
Fix bug where arguments would not have default values and would break editing users (panel handler line 507, 508 and 559), fix major typo (panel handler line 569) and fix autobleach logging (base handler lines 35 and 36)
2021-04-04 21:22:52 +03:00
computergeek125
1e2abff40a
Moved server DB code to models, fix autobleach logging, fix redirect bug
2021-04-04 12:48:02 -05:00
Andrew
49a9bd982c
Added temporary fix for index out of range execption thrown when adding a server.
2021-04-03 19:21:05 -04:00
computergeek125
d501260ef9
Updated error info per CRAFTY-CONTROLLER-T-57
2021-04-03 13:29:21 -05:00
computergeek125
f3b1d1e87d
cleaned up DB commands a bit to resolve the rest of CRAFTY-CONTROLLER-T-81
2021-04-03 13:18:43 -05:00
computergeek125
54b0578e79
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2021-04-03 12:39:25 -05:00
computergeek125
bd6eed118a
Resolves CRAFTY-CONTROLLER-T-81 - error when creating new user
...
Also cleans up the panel and server code to handle other states better
2021-04-03 12:36:01 -05:00
luukas
0b3d20ffbe
One monster truck commit for
...
add translation API, add fi_FI and en_EN translations, add C and
.properties file support, check if file is binary before sending and
clean up ajax handler
2021-03-26 15:57:50 +02:00
luukas
85cb28b9ad
Fix bug where server wizard would not show
2021-03-22 10:08:58 +02:00
computergeek125
680cb1885e
Moved to semver
2021-03-22 00:05:45 -05:00
computergeek125
02a05b41c9
quickfix stats
2021-03-21 23:48:06 -05:00
computergeek125
fb08d77a80
General cleanup after merge, hopefully improved roles with backup
2021-03-21 23:44:22 -05:00
computergeek125
506c9bb3c3
Merge branch 'backups-and-stuff' into dev
2021-03-21 23:32:48 -05:00
computergeek125
da97597d52
Merge branch 'dev-Silversthorn' into dev
2021-03-21 23:24:49 -05:00
computergeek125
1d3880207f
Merge branch 'mcmanus-ping-port-patched' into dev
2021-03-21 23:23:27 -05:00
computergeek125
c690f9113e
Merge branch 'macgeek-noshell' into dev
2021-03-21 23:17:36 -05:00
computergeek125
81c60d6dac
One monster truck commit for rework and backups
2021-03-21 23:02:18 -05:00
Silversthorn
cd617ad5f3
Users Access to Servers from Roles Working
...
Broke Users Servers Link
2021-03-13 23:12:42 +01:00
computergeek125
c65b4a267e
Staff, patreon, and translations all proceedurally generate now
2021-03-13 11:07:04 -06:00
computergeek125
b957d73acb
Fixed critical bug where servers were abandoned at exit
2021-03-13 09:24:17 -06:00
Andrew
287d45a1bc
Port/ip-get patched
...
Patched super user in panel_handler
2021-03-13 09:29:05 -05:00
Florian RVT
3f0d1871ff
User access to servers operating
2021-03-09 23:17:50 +01:00
Andrew
03d7cfae80
Port/ip-get patched
...
Patched super user in panel_handler
Working issue is the server doesn not reload settings from DB after value changes in table.
!!CAUTION LOTS OF PRINT STATEMENTS!!
2021-03-09 16:57:45 -05:00
Andrew
58f6949fad
Port/ip-get patched
...
Working issue is the socket will only work for 25565.
!!CAUTION LOTS OF PRINT STATEMENTS!!
2021-03-08 22:01:42 -05:00
Phillip Tarrant
653a4d6bc7
Merge branch 'admin-controls' into 'dev'
...
Player controls
See merge request crafty-controller/crafty-commander!26
2021-03-07 21:30:19 +00:00
Phillip Tarrant
85403c61af
Merge branch 'dev' into 'websocket'
...
# Conflicts:
# app/classes/shared/models.py
# app/classes/shared/tasks.py
2021-03-07 21:29:57 +00:00
computergeek125
a0448f5408
Theoretically this fixes tasks scheduler
2021-03-06 14:48:02 -06:00
luukas
458456a716
try fix merge conflict
2021-03-05 11:35:05 +02:00
luukas
06a5f4713e
fix merge conflict in tasks.py
2021-03-05 11:30:18 +02:00
luukas
8eb89dc131
Delete file_edit.html as it is not needed
2021-03-05 11:07:00 +02:00
luukas
1be41b8534
Player controls
2021-03-05 10:58:38 +02:00
luukas
37597f920f
Make sure clients are authenticated before sending messages.
...
As the system is asynchronous some messages could (?) slip through before the socket is closed when auth fails.
2021-03-01 19:33:15 +02:00
luukas
a25ad9295d
Fix typo that errors out when importing a server
2021-03-01 19:18:56 +02:00
luukas
9c62099f32
Add authentication to WS, notify user when an activity log gets logged, and more
2021-03-01 02:54:20 +02:00
luukas
a965af5491
Remove unnecessary websocket.html
2021-02-27 14:17:37 +02:00
luukas
7691dc566e
Finish WebSockets
2021-02-27 14:05:04 +02:00
luukas
2595e6950d
Host stats are now realtime(d) by websockets
2021-02-26 17:39:35 +02:00
Phillip Tarrant
92bcefa8cc
Merge branch 'clone_servers' into 'dev'
...
Create clone servers button/action
See merge request crafty-controller/crafty-commander!23
2021-02-21 17:17:34 +00:00
Phillip Tarrant
96dbaf3583
Merge branch 'file_manager_polishing' into 'dev'
...
File manager polishing
See merge request crafty-controller/crafty-commander!22
2021-02-21 17:14:43 +00:00
Phillip Tarrant
abcb097cdb
Merge branch 'remove-old-logs' into 'dev'
...
"remove old logs" feature
See merge request crafty-controller/crafty-commander!21
2021-02-21 17:14:03 +00:00
computergeek125
d2c81eafe0
These are not the typos you're looking for
2021-02-13 06:02:27 +00:00
computergeek125
90465410f8
Forgot to start the process. You saw nothing
2021-02-13 06:00:28 +00:00
computergeek125
7b03dd3da4
forward-port the noshell branch from 3.x
2021-02-13 05:47:30 +00:00
LukasDoesDev
ed0208ab0e
Create clone servers button/action
...
Can't copy while running
2021-01-28 20:46:13 +02:00
LukasDoesDev
1bf3b381ac
Add icons to file tree
2021-01-23 00:50:56 +02:00
LukasDoesDev
6b2ef2c451
Remove unnecessary logs, update logs to have more information, add resizing to file editor
2021-01-20 23:10:25 +02:00
LukasDoesDev
bcaac8b9eb
I think that the "remove old logs" feature is done
2021-01-20 17:20:42 +02:00
Phillip
9fb80a5062
added float_to_string for server memory configs
2021-01-19 09:17:29 -05:00
Phillip
19e4a31bf7
fixed console.debug printing - added module auto-installer
2021-01-19 08:56:00 -05:00
Phillip Tarrant
307d14ab77
Merge branch 'macgeek_role_manager' into 'dev'
...
Basic role manager
See merge request crafty-controller/crafty-commander!18
2021-01-19 12:29:26 +00:00
Phillip Tarrant
c154f316b7
Merge branch 'lukas-development' into 'dev'
...
File Manager
See merge request crafty-controller/crafty-commander!19
2021-01-19 12:28:58 +00:00
LukasDoesDev
7e0f592330
Delete code that will crash and change a bit of logging in websocket_handler.py
2021-01-18 21:34:29 +02:00
LukasDoesDev
e9dc45eeda
Add auth requirement to AJAX handlers
2021-01-18 17:02:38 +02:00
LukasDoesDev
e3a359bbc6
File Manager: DONE
2021-01-17 19:20:28 +02:00
LukasDoesDev
eb06f1b33b
Now can edit files. Also fixed a bunch of bugs.
2021-01-15 21:59:58 +02:00
LukasDoesDev
75fb8fc920
(Maybe) fix potential code injection attack
2021-01-15 14:33:17 +02:00
LukasDoesDev
eba7bff050
Now can see a tree view of the directory the server is in. Will do file editing now.
2021-01-15 14:13:06 +02:00
LukasDoesDev
c08751c7f8
FILES: Got everything working except Tornado seems to escape my HTML output, works if you set the output to the DOM and run the script below it.
2021-01-15 00:55:14 +02:00
Phillip Tarrant
30b65d0d48
Merge branch 'macgeek_issue10' into 'dev'
...
WSL Fix, issue 10
See merge request crafty-controller/crafty-commander!17
2021-01-14 14:56:51 +00:00
Phillip Tarrant
0c5d11c780
Merge branch 'issue_8' into 'dev'
...
Time improvements, Issue 8
See merge request crafty-controller/crafty-commander!16
2021-01-14 14:56:15 +00:00
LukasDoesDev
9e66f46c2e
2 bug fixes
...
1st: Footer had padding in credits.html, caused by missing closing div tag.
2nd: Java VM errors when memory is a float. Server wizard should convert from gigabytes to megabytes (Trello card)
2021-01-13 16:48:04 +02:00
computergeek125
8131cfd396
Added skeleton role manager
2020-12-27 11:00:26 -05:00
computergeek125
d91361efa5
Updated user manager to support server selection
2020-12-25 22:00:28 -05:00
computergeek125
8bba57d950
Added exception handler if the initial request fails
2020-12-25 15:40:55 -05:00
computergeek125
cf61c3c931
Skeleton user manager added
2020-12-24 17:55:15 -05:00
computergeek125
1239822761
Fixed logic inversion that resolves #10
2020-12-19 08:44:04 -05:00
computergeek125
d30cbb8563
Merge branch 'macgeek_wslfix' into dev
2020-12-19 08:41:36 -05:00
computergeek125
8795a1eaf5
Fixed crash on CPU speed reading for certain systems
2020-12-19 08:39:31 -05:00
LukasDoesDev
8cd2d59230
Websockets.. Work in progress!
...
websocket.html is just a blank page with the newest javascript helpers
threading working wonderfully! Except my own code.
websocket.html and thte bit from panel_handler.py can be deleted once this is done. It was just because the css and js kept loading for super long
2020-12-17 15:39:29 +02:00
LukasDoesDev
359a2e1c42
Now server started shows browser time, not server time.
2020-12-16 01:17:41 +02:00
LukasDoesDev
4c9f947aa1
Rework #8
2020-12-14 23:52:46 +02:00
Phillip Tarrant
fb763335d1
removed datatables from vendors as it's outdated and going to use CDN
...
added activity logs page
added db_helper method to return rows from db as a dict object.
this is work for issue 9
2020-12-13 13:42:49 -05:00
Phillip Tarrant
d97712b174
Merge branch 'issue_6' into 'dev'
...
Fix Issue 6
See merge request crafty-controller/crafty-commander!12
2020-12-13 17:24:17 +00:00
MCgamin1738
58b63cb9a4
Add Permissions Check To Import From Zip
2020-12-12 19:35:41 +00:00
MCgamin1738
f59328e4f1
Adding Support For Importing Servers From Zip Files
2020-12-12 17:54:10 +00:00
LukasDoesDev
0ac3f15b8b
Start working on the file explorer UI. W.I.P. 🚧
2020-12-12 01:59:52 +02:00
MCgamin1738
7acb044bd8
Fixing SEC_ERROR_REUSED_ISSUER_AND_SERIAL
2020-12-11 19:08:09 +00:00
Phillip Tarrant
1542f2559a
adding creation of app/config/db directory to helper so if it's not there,it will be created
...
bug introduced by commit 102f63c7
2020-12-11 10:14:48 -05:00
Phillip Tarrant
5270bdcc3d
Merge branch 'issue_4_server_cascade' into 'dev'
...
patches for issue #4 :
See merge request crafty-controller/crafty-commander!8
2020-12-11 14:56:11 +00:00
Phillip Tarrant
6b686c5b47
patches for issue #4 :
...
biggest issue causing the cascade was building crash detection in check_running method
that method is called everywhere, so when called (sometimes 5 times at the same time) it tries to restart the server over and over
i created a new detect_crash method that will now look for crashes and removed all crash detection from check_running method
also added the remove_watcher_thread method to remove the old scheduled task watching the older server.
2020-12-11 09:52:36 -05:00
MCgamin1738
102f63c771
Move session.lock, Database And config.json To Config Folder
2020-12-11 12:59:48 +00:00
Phillip Tarrant
6ea66c37f5
adding GUI / routing for users admin (eventually roles will be here as well)
2020-12-06 15:42:49 -05:00
Phillip Tarrant
10bd7a74c9
fixed issue where server settings don't get reloaded when changing server config without restarting crafty. Now server settings get repulled from DB after writing new settings on config change
2020-10-07 09:19:47 -04:00
Phillip Tarrant
43ad169aa9
removing print from update
2020-09-23 08:49:19 -04:00
Phillip Tarrant
6951d7cc8a
fixed IP not updating, fixed usernames being case sensitive in update query
2020-09-22 23:26:23 -04:00
Phillip Tarrant
635bef867b
adding todo: for version data
2020-09-22 21:43:22 -04:00
Phillip Tarrant
7f090b928f
changed notify icon - added code to grab remote json from craftycontrol.com for announcements and such - icon turns red if update available
2020-09-22 21:42:41 -04:00
Phillip Tarrant
8e2010af75
added version to bottom of pages
2020-09-22 16:17:17 -04:00
Phillip Tarrant
2eeee9d6c4
fixed bug where tables/default settings were firing each restart
2020-09-22 15:00:05 -04:00
Phillip Tarrant
c896a12b17
Added server_ip to DB, also removed
...
max_stats_count as it's not needed
2020-09-22 12:11:16 -04:00
Phillip Tarrant
7657b77785
adding virtual console ajax to actually send the command
2020-09-21 22:01:16 -04:00
Phillip Tarrant
90ca5c151f
import server code done
2020-09-14 16:01:38 -04:00
Phillip Tarrant
f96649613f
did some refactoring on loading of servers, fixed bug where server object would be forgotten when new server added
2020-09-14 14:05:17 -04:00
Phillip Tarrant
fbc8e7fc2a
fixed broken return / redirect after downloading jar and adding server
2020-09-10 12:03:18 -04:00
Phillip Tarrant
66d7c6f10a
Refactored the server add outside of serverjars.py (since it's going away). Also made it more flexible since we are doing more than just jars now
2020-09-10 11:01:57 -04:00
kevdagoat
e6bf64a41f
working statistics api route
2020-09-06 12:58:17 +08:00
kevdagoat
1f184d3e94
fix future fustration :)
2020-09-06 12:37:56 +08:00
kevdagoat
8c36ddad84
add api base handler
2020-09-06 12:13:42 +08:00
Phillip Tarrant
d7fabb3da8
fixed crash detection / auto start checkboxes - found huge issue with crash detection. putting on bug list for later
2020-09-04 14:05:42 -04:00
Phillip Tarrant
568e1e8f41
finished server config page v1 - wanna add more later, but that's for alter
2020-09-04 12:35:06 -04:00
Phillip Tarrant
77021a5c0b
starting server config tab
2020-09-04 00:02:03 -04:00
Phillip Tarrant
9ded6a1a4b
added max_log_lines to config.json, added server_logs subpage, split server details top part to it's own include
2020-09-03 22:49:20 -04:00
Phillip Tarrant
adf8d3f51a
many new things,
...
regexit sub function created
virtual console now has colors
fixed error with login function auditing None instead of 0
other things I can't remember atm
2020-09-01 21:30:39 -04:00