Commit Graph

1079 Commits

Author SHA1 Message Date
00422f24cd Moved delete server to ajax call instead of a task. 2021-08-18 18:50:53 -04:00
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
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
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
4bac56e84a Use stdout for virtual terminal. WebSockets seem to be "laggy". 2021-08-10 23:17:56 +03:00
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
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
8db46d6ab6 Added option to remove server files on delete.
Added confirmation for server delete.
2021-08-09 20:48:22 -04:00
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
488175cc2e Added users attached to roles on role edit page. 2021-08-09 17:11:45 -04:00
7dd4702680 Fixed error thrown on add user 2021-08-09 01:44:16 -04:00
0e5e2cd217 Added the ability for non super-users to change their own password. 2021-08-09 01:29:13 -04:00
b1215ff20a Fixed bug where all roles showed the sum of servers associated with all roles 2021-08-09 00:24:08 -04:00
9ec10db762 Disabled checkboxes in user configs if servers were granted by role. 2021-08-08 18:26:28 -04:00
debabfc045 Added server/role lists to panel config 2021-08-08 16:43:04 -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
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
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
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
5a5cd65d4f Sort server types, I suffered a lot while doing this 2021-06-02 21:17:50 +03:00
13d8259869 Make sure server name is not empty 2021-05-02 18:57:53 +03:00
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
db9e6c2fac Move webserver online logging to the right place 2021-05-02 18:15:19 +03:00
890e0a1925 Fix blank page on wrong password and add spaces to previous login failed redirects 2021-05-02 18:05:14 +03:00
d13f8aedcb Add better audit log stuff to server creation 2021-04-19 13:36:12 +03:00
9049e44803 Fix logging on import errors 2021-04-17 23:34:13 +03:00
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
2e2d338c9d Fix static handler 404 error 2021-04-17 18:12:23 +03:00
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
1e2abff40a Moved server DB code to models, fix autobleach logging, fix redirect bug 2021-04-04 12:48:02 -05:00
49a9bd982c Added temporary fix for index out of range execption thrown when adding a server. 2021-04-03 19:21:05 -04:00
f3b1d1e87d cleaned up DB commands a bit to resolve the rest of CRAFTY-CONTROLLER-T-81 2021-04-03 13:18:43 -05:00
54b0578e79 Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev 2021-04-03 12:39:25 -05:00
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
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
85cb28b9ad Fix bug where server wizard would not show 2021-03-22 10:08:58 +02:00
fb08d77a80 General cleanup after merge, hopefully improved roles with backup 2021-03-21 23:44:22 -05:00
506c9bb3c3 Merge branch 'backups-and-stuff' into dev 2021-03-21 23:32:48 -05:00
da97597d52 Merge branch 'dev-Silversthorn' into dev 2021-03-21 23:24:49 -05:00
c690f9113e Merge branch 'macgeek-noshell' into dev 2021-03-21 23:17:36 -05:00
81c60d6dac One monster truck commit for rework and backups 2021-03-21 23:02:18 -05:00