Commit Graph

412 Commits

Author SHA1 Message Date
f9559a601e Merge branch 'pretzel-unstable' into 'pretzel'
Added error statements for Failed Starts

See merge request crafty-controller/crafty-commander!32
2021-08-07 19:26:13 +00:00
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
f50e80749c Still fighting with failed start message 2021-08-07 14:28:34 -04:00
85fe2c9d21 Working through start error messages 2021-08-07 14:25:47 -04:00
e86998e57d This is the unstable version of pretzel where he breaks things. 2021-08-07 13:15:53 -04:00
ca9788081b Removed print statements 2021-08-06 14:15:10 -04:00
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
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
e40fb45853 Bug fixes for user/role based servers. 2021-08-06 12:21:47 -04:00
e827460a18 Revert 2021-08-06 01:13:58 -04:00
4bb798fd0c Dumb commit because I had an extraneous _ 2021-08-06 01:08:33 -04:00
41846e34a9 Made it so only super user can see other roles/users 2021-08-06 01:05:46 -04:00
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
2f8abc25bd Delete exit.txt 2021-08-05 21:27:24 +00:00
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
e15de6c461 Merge branch 'pretzel' of https://gitlab.com/crafty-controller/crafty-commander into pretzel 2021-08-04 22:07:51 -04:00
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
801d79fdca Fix Crafty version string 2021-07-30 22:50:33 +03:00
f5b6583dbf Remove unnecessary console.debug's 2021-07-30 19:27:48 +03:00
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
3559c0a942 Basic README 2021-07-30 18:37:36 +03:00
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
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
feab08b36f Minor changes 2021-07-26 22:22:31 -04:00
c3b4b1f213 Minor adjustments to updates 2021-07-26 22:17:37 -04:00
f8cda4b748 I don't know the difference between str and int I guess. 2021-07-26 21:49:47 -04:00
4e4911e0b5 I don't know how to indent 2021-07-26 21:45:33 -04:00
a661d33698 Fixing bugs with updates 2021-07-26 21:39:22 -04:00
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
67d5723c07 Re-enabled backups for updating jars. 2021-07-26 21:14:36 -04:00
a8449cc6f2 Cleanup update code 2021-07-26 21:08:46 -04:00
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
fa9184c1ad Dumb bug I just fixed because I'm dumb. 2021-07-26 18:49:05 -04:00
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
b205c00c06 Fixed bug where update button still had start command attached. 2021-07-26 12:12:51 -04:00
902f7e79bb Fixed bug where start command checks if the server was updating would fail everytime. 2021-07-26 12:11:46 -04:00
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
aaf8438ddb Added backup to jar update. 2021-07-25 11:49:11 -04:00
12db23f6e6 Fixed bug where settings were not reloaded from DB when server is launched 2021-07-25 11:28:09 -04:00
f5cc582334 Forgot to pull. Oops
Merge branch 'pretzel_update' of https://gitlab.com/crafty-controller/crafty-commander into pretzel_update
2021-07-25 11:09:13 -04:00
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
a949e3c236 Delete .DS_Store 2021-07-25 02:26:34 +00:00
474b397035 Typo 2021-07-24 21:37:55 -04:00
d5c6eb942a Added more detail to update message - alerting users download times will vary based on network connections. 2021-07-24 21:35:45 -04:00
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
a3be2cd2e2 Removed miscelaneous files that were created during testing i.e. /servers directory. 2021-07-24 21:10:47 -04:00
9cb46a86fb Added executable updater 2021-07-24 21:09:39 -04:00
a79f42f4da Escape logfile output, fixes weird formatting and remote code execution vulnerability 2021-06-02 21:47:08 +03:00
344c2219ec Handle SIGTERM 2021-06-02 21:30:12 +03:00
5a5cd65d4f Sort server types, I suffered a lot while doing this 2021-06-02 21:17:50 +03:00