b7802fdc45
Merge branch 'dev-Silversthorn' of gitlab.com:crafty-controller/crafty-commander into dev-Silversthorn
2021-08-30 21:31:20 +02:00
4c5ddf8f80
Fixing one comment
2021-08-30 21:23:21 +02:00
3ff3d0ccf1
Adding MOTD on Status Page
2021-08-29 00:48:30 +02:00
48c70279f7
Fixes error thrown when server download doesn't finsih before server creation ends.
...
Adds notification when download is complete.
2021-08-26 22:43:11 -04:00
f4ca0f6559
Addind support for -1 unlimited check
2021-08-25 20:22:43 +02:00
397fbd5268
Adding Support For Server Creation Quantity Limit
2021-08-25 00:23:33 +02:00
bb1f43bc81
Adding Support for Crafty Permissions with limits
2021-08-24 23:07:00 +02:00
1acb7827ae
Reworking Functions After User_Servers Deletion
2021-08-22 18:50:30 +02:00
331f3e7b12
Adding Crafty Permissions
2021-08-22 11:57:02 +02:00
31436bdc62
Merge branch 'dev' into dev-Silversthorn
2021-08-21 16:44:02 +02:00
a68d24b890
Adding Working Permissions for roles on html pages
2021-08-21 10:44:03 +02:00
e08df4d369
Completed file uploading. Need to fix listing when right clicking. Unzip is shown at all times. Added unzip function to helpers and is called through ajax for unzipping files to current directory.
2021-08-19 23:36:25 -04:00
8b66fc3fc4
Adding permissions on role_servers with edit
2021-08-20 00:18:50 +02: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
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
8db46d6ab6
Added option to remove server files on delete.
...
Added confirmation for server delete.
2021-08-09 20:48:22 -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
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
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
1e2abff40a
Moved server DB code to models, fix autobleach logging, fix redirect bug
2021-04-04 12:48:02 -05: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
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
cd617ad5f3
Users Access to Servers from Roles Working
...
Broke Users Servers Link
2021-03-13 23:12:42 +01:00
b957d73acb
Fixed critical bug where servers were abandoned at exit
2021-03-13 09:24:17 -06:00
3f0d1871ff
User access to servers operating
2021-03-09 23:17:50 +01:00
a0448f5408
Theoretically this fixes tasks scheduler
2021-03-06 14:48:02 -06:00
a25ad9295d
Fix typo that errors out when importing a server
2021-03-01 19:18:56 +02:00
9fb80a5062
added float_to_string for server memory configs
2021-01-19 09:17:29 -05:00
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
e3a359bbc6
File Manager: DONE
2021-01-17 19:20:28 +02:00
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
58b63cb9a4
Add Permissions Check To Import From Zip
2020-12-12 19:35:41 +00:00
f59328e4f1
Adding Support For Importing Servers From Zip Files
2020-12-12 17:54:10 +00:00
10bd7a74c9
fixed issue where server settings don't get reloaded when changing server config without restarting crafty. Now server settings get repulled from DB after writing new settings on config change
2020-10-07 09:19:47 -04:00
90ca5c151f
import server code done
2020-09-14 16:01:38 -04:00
f96649613f
did some refactoring on loading of servers, fixed bug where server object would be forgotten when new server added
2020-09-14 14:05:17 -04:00
fbc8e7fc2a
fixed broken return / redirect after downloading jar and adding server
2020-09-10 12:03:18 -04:00
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
d1906751e5
Moved server to shared in prep for plugins
2020-08-31 13:53:46 -04:00
d6c894c3d9
Creation of Command model, moved controler to shared in prep for plugins
2020-08-31 13:46:25 -04:00
