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,027 Commits 12 Branches 45 Tags 104 MiB
326f5aa78d
Commit Graph

565 Commits

Author SHA1 Message Date
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