luukas
e009ff9819
Use relative paths for the jarfile and logs
2022-06-16 02:10:26 +03:00
Andrew
8ff2d8437d
Fix permissions on server clone
2022-06-02 08:51:12 -04:00
Silversthorn
f597a26e5b
Trying to fix stuff
2022-05-30 22:05:36 +02:00
Silversthorn
37bda32164
Fixing moved functions calls
2022-05-30 07:36:25 +02:00
Silversthorn
8423cc24c1
I'm breaking/fixing stuff
2022-05-26 14:50:20 +02:00
luukas
27d310e2de
Declutter set()s
2022-05-16 00:55:22 +03:00
Zedifus
92c8fc04f3
Refactor to standardize class/variable naming ✨
2022-04-14 03:10:25 +01:00
Andrew
12b0f8326d
Fix bug where no backup dir would exist on clone
2022-04-12 17:17:12 -04:00
Zedifus
19f2429a4c
Fix formatting to comply with ⬛ Black
2022-04-11 11:08:36 +01:00
computergeek125
42ca4bb973
Refactored the yes to not pass objects in import
...
Merge Conflicts ᴙ Us
2022-04-11 00:23:55 -05:00
Andrew
f78d59fd34
Server jars/gravatar would stack with no internet
2022-03-27 18:09:49 -04:00
Zedifus
2a512d7273
Fix files to conform with new ⚫ Black pylintrc
...
Mostly just breaking up strings and comments into new lines
Some strings dont require 'f' but keeping in for readability
with the rest of the concatinated string
2022-03-23 06:06:13 +00:00
Zedifus
e06fe8a52a
⬛ Black codebase
...
Apply black formatting to codebase
2022-03-23 02:50:12 +00:00
Zedifus
b306d1f313
Tidy imports & dep auto-installer
2022-03-08 04:40:44 +00:00
Silversthorn
506129729e
Update Translation
...
- Adding Translation for Credits Page
- Adding detection support for webpage
2022-03-05 12:01:36 +01:00
Andrew
19f8775b32
Fix traceback when importing regular server
2022-03-01 18:49:16 -05:00
xithical
c4f706d415
Rework of files handling and added exclusions selection for backups.
2022-03-01 01:02:30 +00:00
Andrew
540584990e
Inital bedrock support
2022-02-10 18:20:36 -05:00
Andrew
5adc48c524
Merge branch 'pretzel-bedrock' into 'pretzel-fixes'
...
# Conflicts:
# app/frontend/templates/server/bedrock_wizard.html
# app/frontend/templates/server/wizard.html
2022-02-10 20:57:31 +00:00
Andrew
b025899aee
Inital bedrock support
2022-02-10 15:54:00 -05:00
Andrew
c89609ae61
Inital bedrock support
2022-02-10 15:27:40 -05:00
Iain Powrie
e0ce1d118c
Create pylintrc, code review pipeline & correct codebase errors
...
Fix uploads,
Only send server stats to user page when they have access to servers
2022-01-26 01:45:30 +00:00
Andrew
6f860e967c
final changes for windows path issues
2022-01-19 15:14:56 -05:00
luukas
a20f7c4acf
Fix translation stuff
...
* Make fallback stuff work
* Use helper.get_setting('language') instead of hardcoded 'en_US'
* Fix status and public pages lang variables
* Fix and add some translations for fi_FI
2022-01-15 17:38:08 +02:00
luukas
93857f90db
JWT login and multi API keys!
2022-01-15 02:23:50 +02:00
Andrew
4d636cce1b
add working zip import selection functionality
2022-01-09 22:49:03 -05:00
Andrew
b815cf38a8
Zip import semi broken.
...
Need to figure out why temp dir is not being passed correctly
Need to make sure tempdir gets deleted.
2022-01-09 22:21:28 -05:00
Quentin B
f018267b62
Made server polls asynchronus, fix for serverjars
2021-12-16 21:07:36 -05:00
Silversthorn
f20d41242d
Adding Helpers for Path
...
Correcting a MVC update missing function
2021-11-21 11:52:29 +01: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
Silversthorn
6984fe7abc
Corrections on server creation
2021-10-09 10:59:54 +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
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
Silversthorn
02358f189b
Unique Name at Server Creation
2021-09-27 21:34:54 +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
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
Silversthorn
261c8665c8
Pretty Server Version Choice
2021-08-24 00:24:40 +02:00
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
