Andrew
ce4a7619a6
Fixes wait window closing after first upload is complete and not waiting for all uploads to complete.
2021-08-23 18:22:35 -04:00
Silversthorn
6a29f1063b
Fixing Migrations Issues
2021-08-23 21:41:27 +02:00
Andrew
d83fd73755
Fix models error when trying to edit admin username
2021-08-22 17:42:12 -04:00
Andrew
6022e3814f
Fixed typo in uploads
2021-08-22 17:37:37 -04:00
Andrew
24aec429cc
Bandaid db error on migrations by comment.
...
Fix error in models where value was undefined
2021-08-22 17:29:52 -04:00
Andrew
192a5f2664
Modify handler to adapat to changes made in models.
2021-08-22 16:59:33 -04:00
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
68202cfa7b
Removed uploads from Ajax handler
2021-08-22 16:34:22 -04: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
Andrew
734a576cb9
Still broken
2021-08-22 10:54:34 -04:00
Andrew
7389b37198
Initial commit on this broken branch
2021-08-22 10:17:33 -04: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
a57a66901c
Revert "Merge branch 'revert-ecb2cfbe' into 'dev'"
...
This reverts merge request !49
2021-08-22 03:34:05 +00:00
Andrew
773ace55ad
Revert "Fixed error with modelselect"
...
This reverts commit cbd5d29fe9
2021-08-22 03:30:43 +00:00
Andrew
f472b377d2
Revert "Fixed bug where servers would not get added to roles on creation"
...
This reverts commit ecb2cfbe01
2021-08-22 03:27:12 +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
ecb2cfbe01
Fixed bug where servers would not get added to roles on creation
2021-08-21 22:47:43 -04:00
Andrew
c86c5040ea
Fixed bug where new servers would not be added to current role
2021-08-21 22:43:16 -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
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
Andrew
89f6a98dc9
Took out ability to assign specific users to specific servers. All role based now.
2021-08-21 10:07:43 -04:00
Silversthorn
a68d24b890
Adding Working Permissions for roles on html pages
2021-08-21 10:44:03 +02:00
Andrew
77a6d260a1
Made it so a new thread is spawned for uploads.
...
Need to add file checking so system doesn't crash when a user tries to upload a dmg or a .mov
2021-08-20 15:41:22 -04:00
Andrew
f539f9e095
I leaned on my keyboard just before the last commit. Fixed the things
2021-08-19 23:50:24 -04: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
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
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
