Andrew
b24fd93487
Merge branch 'broken-uploads' into 'dev'
...
Fixed upload streams
See merge request crafty-controller/crafty-commander!53
2021-08-22 20:37:02 +00:00
Andrew
86c1b374bf
Fixed upload streams
...
Lukas added a lot of pretty things to the upload waiting screen.
Current bug: progress bar is not 100% working.
2021-08-22 16:31:49 -04:00
Silversthorn
1acb7827ae
Reworking Functions After User_Servers Deletion
2021-08-22 18:50:30 +02:00
Silversthorn
0b29bdf855
Deletion on User_Servers table
2021-08-22 12:21:59 +02:00
Silversthorn
88042998d9
Merge branch 'dev' into dev-Silversthorn
2021-08-22 12:14:31 +02:00
Silversthorn
331f3e7b12
Adding Crafty Permissions
2021-08-22 11:57:02 +02:00
Silversthorn
540cdf6149
Fixing Roles Permissions for Server Creation
2021-08-22 11:06:44 +02:00
Andrew
73d8be2d57
Still cleaning up my mess...sorry
2021-08-21 23:56:02 -04:00
Andrew
0d11b80181
Merge branch 'dev' into 'dewfix'
...
# Conflicts:
# app/classes/shared/models.py
2021-08-22 03:38:39 +00:00
Andrew
7f1f667212
This should fix everything
2021-08-21 23:36:48 -04:00
Andrew
773ace55ad
Revert "Fixed error with modelselect"
...
This reverts commit cbd5d29fe9404b3f381f7dd4b12a5b135a0476a7
2021-08-22 03:30:43 +00:00
Andrew
cbd5d29fe9
Fixed error with modelselect
2021-08-21 23:21:06 -04:00
Andrew
8de3b3b3cd
Removed User_Servers table.
2021-08-21 23:17:54 -04:00
Andrew
2851493589
Removed servers from user_role_permissions query. Not needed and caused query to result in none very time
2021-08-21 22:02:27 -04:00
Silversthorn
1262d6708b
Improve UI and Permissions on Dashboard
2021-08-22 01:41:25 +02:00
Andrew
c8759ac872
Added serverdownload to thread.
...
Removed exit command if server jar doesn't exist. This was causing exit.txt to constantly try to stop crafty after a jar download in the thread.
2021-08-21 14:25:39 -04: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
Silversthorn
a68d24b890
Adding Working Permissions for roles on html pages
2021-08-21 10:44:03 +02:00
Andrew
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
Florian RVT
8b66fc3fc4
Adding permissions on role_servers with edit
2021-08-20 00:18:50 +02:00
Andrew
90d59faf5b
This is broken right now. Trying to add unzip function
2021-08-19 16:50:18 -04:00
xithical
c20ffb522d
Merge branch 'dev' into 'xithical'
...
# Conflicts:
# app/classes/shared/server.py
2021-08-18 23:30:45 +00:00
Andrew
00422f24cd
Moved delete server to ajax call instead of a task.
2021-08-18 18:50:53 -04:00
Andrew
c1ce2b985a
Fixed bugs from pretzel merge
2021-08-18 12:50:13 -04: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
luukas
f8aad8b33d
Add database migrations!
2021-08-18 18:11:53 +03:00
Scott R
689e4abb51
Oops! All backups are gone... but not anymore!
...
While loop automatically removed all old backups greater than the max backups threshold... including if it was set to 0. Set a test for the while loop to make sure max backups is greater than 0 before deletey delete
2021-08-14 00:07:24 -05:00
Scott R
5b8764cb45
Removed extra .zip
...
Unnecessary .zip in backup filename generation in server.py, nuked it
2021-08-14 00:00:09 -05:00
Scott R
096a38ae54
Redoing shutil zip after merging new DB things
...
Merged from Pretzel for DB change things and needed to readd code for shutil for zipping
2021-08-13 23:28:41 -05:00
Andrew
118fc7936f
Improved text highlighting for papermc servers. Need to still figure out what's going on with some random characters showing up.
2021-08-12 10:16:19 -04:00
Andrew
aebf50dfc6
Fixed updates
2021-08-12 00:33:18 -04:00
Andrew
0875734777
Key errors are fixed in this
2021-08-11 23:49:06 -04:00
Andrew
6cc87c6dd1
Cleaned up backups after I broke them.
2021-08-11 23:33:18 -04:00
Andrew
001a8ee9c3
Don't use a while loop to constantly write changes to DB.
2021-08-11 23:14:33 -04:00
luukas
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
luukas
4bac56e84a
Use stdout for virtual terminal. WebSockets seem to be "laggy".
2021-08-10 23:17:56 +03:00
luukas
7b66cc261e
Add cache for if language file exists
2021-08-10 22:36:17 +03: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
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
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
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
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
