Commit Graph

45 Commits

Author SHA1 Message Date
Silversthorn
1acb7827ae Reworking Functions After User_Servers Deletion 2021-08-22 18:50:30 +02:00
Silversthorn
540cdf6149 Fixing Roles Permissions for Server Creation 2021-08-22 11:06:44 +02: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
Florian RVT
8b66fc3fc4 Adding permissions on role_servers with edit 2021-08-20 00:18:50 +02: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
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
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
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
luukas
5a5cd65d4f Sort server types, I suffered a lot while doing this 2021-06-02 21:17:50 +03:00
luukas
13d8259869 Make sure server name is not empty 2021-05-02 18:57:53 +03:00
luukas
d13f8aedcb Add better audit log stuff to server creation 2021-04-19 13:36:12 +03:00
luukas
9049e44803 Fix logging on import errors 2021-04-17 23:34:13 +03: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
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
506c9bb3c3 Merge branch 'backups-and-stuff' into dev 2021-03-21 23:32:48 -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
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
luukas
9c62099f32 Add authentication to WS, notify user when an activity log gets logged, and more 2021-03-01 02:54:20 +02:00
LukasDoesDev
ed0208ab0e Create clone servers button/action
Can't copy while running
2021-01-28 20:46:13 +02: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
Phillip Tarrant
8e2010af75 added version to bottom of pages 2020-09-22 16:17:17 -04:00
Phillip Tarrant
90ca5c151f import server code done 2020-09-14 16:01:38 -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
Phillip Tarrant
c5bf170a33 added audit logging, and commands logging, command handler and other stuff 2020-08-31 16:16:45 -04:00
Phillip Tarrant
d6c894c3d9 Creation of Command model, moved controler to shared in prep for plugins 2020-08-31 13:46:25 -04:00
Phillip Tarrant
79532ffc6b fixing merge conflict 2020-08-31 11:30:41 -04:00
Phillip Tarrant
c7e28e5b77 fixed server id not being correct for stop/restart on dashboard 2020-08-31 11:29:32 -04:00
kevdagoat
3d5f6828c0 fix setup wizard bug 2020-08-30 16:41:12 +08:00
Phillip Tarrant
d2d403e144 complete rewrite of stats pulling, fixed default.json, changed the config file and handling 2020-08-27 18:30:56 -04:00
Phillip Tarrant
d0720958f9 Error handling if server was deleted without crafty knowing
start/stop server functions complete
expanding out online/max/motd etc in db for easier parsing
fixed issue of servers loosing their name from 3.2
finished restart button
added fontawesome 5
2020-08-24 19:11:17 -04:00
Phillip Tarrant
a958b6dea0 populating dashboard with real data 2020-08-24 13:08:17 -04:00
Phillip Tarrant
a0fcda018c Fixed errand print statement
Re-init all servers when adding a server
server builder tested well. Next is importing a server
2020-08-23 22:17:36 -04:00
Phillip Tarrant
6ec2f1c6ac part 1 of the server builder complete 2020-08-23 18:43:28 -04:00
Phillip Tarrant
a6c1a885d6 finished redirect woes, adding server handler, made 404 and default pages pretty 2020-08-19 13:54:10 -04:00