Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
529 Commits 12 Branches 45 Tags 104 MiB
c6389f14b3
Commit Graph

414 Commits

Author SHA1 Message Date
Andrew
7316cc7ea0 Adds kill process button to dashboard. 2021-09-13 15:03:47 -04:00
Andrew
2528c123f2 Adds port/internet connection checks. 
Checks when crafty starts for internet and a port forward for Crafty's https port.
Checks on server launch for internet connection and for port forwarding for executed server.
 2021-09-13 13:10:34 -04:00
Silversthorn
1c13c640fc fixing double server start process 2021-09-09 22:00:52 +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
2d3482db4f Merge 2021-08-30 21:31:29 +02:00
Silversthorn
b7802fdc45 Merge branch 'dev-Silversthorn' of gitlab.com:crafty-controller/crafty-commander into dev-Silversthorn 2021-08-30 21:31:20 +02:00
Silversthorn
4c5ddf8f80 Fixing one comment 2021-08-30 21:23:21 +02:00
Silversthorn
40be16ec96 Adding TTL helpers functions 2021-08-30 20:58:30 +02:00
Silversthorn
bbcde97684 Commenting and Sorting some Code 2021-08-30 20:43:07 +02:00
Silversthorn
45739a2e5f Fixing errors messags in js 2021-08-29 00:51:34 +02:00
Silversthorn
3ff3d0ccf1 Adding MOTD on Status Page 2021-08-29 00:48:30 +02:00
Silversthorn
a05b3a8634 Status Improvements and Fix 2021-08-28 01:48:46 +02:00
Andrew
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
Andrew
4721085783 Merge branch 'status' into 'dev' 
Adds status page at /status

See merge request crafty-controller/crafty-commander!63
 2021-08-27 01:08:26 +00:00
Andrew
e4d94fbda5 Adds status page at /status 2021-08-26 21:06:22 -04:00
Zedifus
1eb7ebdc11 Fix no attribute 'Insert' bug 2021-08-26 23:39:11 +01:00
Silversthorn
4210dfbe77 Last fix for Old Crafty Users without Permissions (I hope) 2021-08-27 00:09:16 +02:00
Silversthorn
f249841438 Fixing definitely Permissions for old users 2021-08-26 23:23:26 +02:00
Silversthorn
e5212698fe Fixing permissions limits on old users 2021-08-26 22:42:10 +02:00
Silversthorn
2cf7ae464b Fixing permissions for old users without Crafty permissions 2021-08-26 21:21:53 +02:00
Silversthorn
f4ca0f6559 Addind support for -1 unlimited check 2021-08-25 20:22:43 +02:00
Andrew
86ad734f4d Changed coloring on files menu. Delete is now red 2021-08-24 22:20:03 -04:00
Andrew
d125ec76f2 Adds default value when renaming a file. 2021-08-24 22:05:30 -04:00
Andrew
b77aab954d Adds download options for files in file tree. This does not add ability to download directories. 2021-08-24 21:33:29 -04:00
Andrew
aea023b893 Fixes error thrown when calling add_user page 2021-08-24 19:25:35 -04:00
Andrew
af7e31a744 Fixes issue with error thrown when click save in edit_user 2021-08-24 19:19:33 -04:00
Andrew
754da44b5b Merge branch 'http_redirect' into 'dev' 
Adds support for http redirects to https

See merge request crafty-controller/crafty-commander!61
 2021-08-24 22:33:27 +00: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
25a0cf3d1e Improving French Translation 2021-08-24 18:23:45 +02:00
Andrew
d8f090b34d Makes redirect code way more efficient. 2021-08-23 22:54:52 -04:00
Andrew
42bdc055aa Adds some http redirect support. User is redirected to https login screen on attempted connection. 2021-08-23 22:25:19 -04:00
Andrew
bd27e619b4 Merge branch 'dew-translation' into 'dev' 
Added translations for files page (uploads/zips)

See merge request crafty-controller/crafty-commander!60
 2021-08-24 00:29:38 +00:00
Andrew
d767dd066c Added translations for files page (uploads/zips) 2021-08-23 20:24:40 -04:00
Silversthorn
cf331a8bc3 Merge branch 'dev' into dev-Silversthorn 2021-08-24 00:25:07 +02:00
Silversthorn
261c8665c8 Pretty Server Version Choice 2021-08-24 00:24:40 +02:00
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
Andrew
833cc55c5d Fixes upload indicator 
Fixes max-body-size
 2021-08-23 17:52:55 -04:00
Silversthorn
6a29f1063b Fixing Migrations Issues 2021-08-23 21:41:27 +02:00
Silversthorn
e776afc6d2 Fixing Bandaid Workaroud for Permissions Migration 2021-08-22 23:00:46 +00:00
Andrew
910a789ad4 Puts even bigger bandaid on migrations. This needs to have a permanent fix eventually. 2021-08-22 18:05:04 -04:00
Andrew
d83fd73755 Fix models error when trying to edit admin username 2021-08-22 17:42:12 -04:00
Andrew
000c764ca3 Fix bandaid on migrations...let's call it a cast 2021-08-22 17:40:28 -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
8eef9e094d Fixing UI after deletion of User_Servers 2021-08-22 22:18:39 +02: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
4ff0392292 Still broken 2021-08-22 10:42:06 -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
Andrew
032da16a7b Somehow the delete function was broken. Fixed it 2021-08-21 20:20:33 -04:00
Silversthorn
2df9810ab4 Merge branch 'dev' into dev-Silversthorn 2021-08-22 01:42:43 +02:00
Silversthorn
f1fc2f7d49 Add update for French language 2021-08-22 01:41:55 +02:00
Silversthorn
1262d6708b Improve UI and Permissions on Dashboard 2021-08-22 01:41:25 +02:00
Andrew
2ea4ff1214 Now I actually removed the scroll bars...I think 2021-08-21 18:52:46 -04:00
Andrew
0058b6c8cb Removed scroll bars from virt_console 2021-08-21 18:51:11 -04:00
Andrew
6ecf6285b9 Made it so vterm stops auto scrolling if user interrupts. 2021-08-21 16:17:35 -04:00
Andrew
35047e062a Fixed term buttons not changing on start/stop 2021-08-21 15:17:07 -04: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
Silversthorn
5f387106e2 Adding French Language File 2021-08-21 16:33:11 +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
1bc8acb1c5 FIxed scrollbars on overlay 2021-08-20 15:18:55 -04:00
Andrew
af3ab28ee8 Fixed context menu css dupe 2021-08-20 15:15:17 -04:00
Andrew
6e59bbd524 Fixed context menu. Added feature for off-clicking. 2021-08-20 14:58:52 -04:00
Andrew
bd51742b94 Added better context menu 2021-08-20 13:46:01 -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