Andrew
c44a128f19
Added proper messages for deleting server.
2021-08-09 21:49:40 -04:00
xithical
d3539974d1
Fixed typo in WTF error
...
Changed from "What a Terrble Failure!" to "What a Terrible Failure!"
2021-08-09 20:25:02 -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
ad4b3b6075
Merge branch 'pretzel-unstable' of https://gitlab.com/crafty-controller/crafty-commander into pretzel-unstable
2021-08-08 11:59:50 -04:00
Andrew
a4aee7e413
Fixed "other" page on role editor so it looks for role id and not role name
2021-08-08 11:59:18 -04:00
Andrew
ea57d62b1b
Fixed reset buttons on role editor and user server edit page
2021-08-08 10:49:00 -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
f50e80749c
Still fighting with failed start message
2021-08-07 14:28:34 -04:00
Andrew
85fe2c9d21
Working through start error messages
2021-08-07 14:25:47 -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
fa9184c1ad
Dumb bug I just fixed because I'm dumb.
2021-07-26 18:49:05 -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
b205c00c06
Fixed bug where update button still had start command attached.
2021-07-26 12:12:51 -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
474b397035
Typo
2021-07-24 21:37:55 -04:00
Andrew McManus
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
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
500e537b18
Disable "Other" page button on new user page
2021-04-17 23:27:35 +03:00
luukas
b772bcb03e
Fix "Server wizard has multiple elements with same ids"
2021-04-17 23:24:34 +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
computergeek125
47305d74d9
Parse fail hotfix on json file
2021-04-04 16:00:27 -05:00
computergeek125
acfcb33bdc
Converted to Unix line endings
2021-04-04 15:03:11 -05:00
computergeek125
5a6f09d38f
Added patreons (WIP), fixed spelling error
2021-04-04 15:02:35 -05:00
Andrew
f3baedd41d
Added term-nav-item class to all nav items in every server navigation in HTML files to fix CSS formatting issues.
2021-04-04 14:34:14 -04: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
5272756240
Merge logo swap
2021-03-21 23:50:38 -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
computergeek125
12cc971c64
Whoops forgot to add the credits
2021-03-21 23:00:19 -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
932f3586eb
Change wait message for when a server is importing
2021-03-05 11:10:13 +02:00
luukas
8eb89dc131
Delete file_edit.html as it is not needed
2021-03-05 11:07:00 +02:00
luukas
031cf8cf96
Change copyright from 2020 to 2021
2021-03-05 11:05:03 +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
7be57ecfc9
Oops, forgot one thing
2021-02-27 14:07:16 +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
luukas
c6555b53e4
Change comment type from HTML to JS
2021-02-26 10:59:25 +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
oasis
e1fb653aa8
Changed logo-long to crafty controller image. Removed commander image.
2021-02-09 12:25:05 -05: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
521eac3a83
Change "Ace" button to "Default"
2021-01-23 00:18:48 +02:00
LukasDoesDev
bf200480ce
Add buttons for choosing the keyboard handler thing (Ace, Vim, Emacs, Sublime)
2021-01-23 00:12:52 +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
LukasDoesDev
6a253971e7
Add error when JavaScript isn't enabled
2021-01-11 21:51:38 +02:00
LukasDoesDev
2523e2e198
Fix error when server is offline, change "Not calculated yet" to "Error Calculating", remove unnecessary logging, make a loop, and fix durationToHumanizedString output number types having s's even though the number is 1 or -1.
2020-12-31 19:41:02 +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
