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
2,277 Commits 12 Branches 45 Tags 104 MiB
ef87920114
Commit Graph

2277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zedifus
fc0d2891dc Add libcurl.so.4 
This is a dependancy for bedrock Ref: #145
 2022-08-22 22:05:48 +01:00
amcmanu3
6ad9863cbf Still kinda broken, but this is cool 2022-08-22 01:15:18 -04:00
amcmanu3
eec9f0fc95 Remove zooming 2022-08-21 21:53:24 -04:00
amcmanu3
7e5d6fddda Add zoom to chart 2022-08-21 21:47:05 -04:00
Andrew
4225de55e8 Add server metrics graph 2022-08-21 17:04:23 -04:00
Andrew
9d961215a5 Fix logical bug with shutdown log/console prompts 2022-08-21 13:00:24 -04:00
Andrew
d06db6e028 Fix formatting for general users 2022-08-21 12:46:07 -04:00
Andrew
44afc72d3a Add variable shutdown timeouts 2022-08-21 12:41:28 -04:00
amcmanu3
02b6c3b545 Fix logical issues with panel handler 2022-08-20 20:58:46 -04:00
amcmanu3
6b82170d6f Appease the linter 2022-08-20 20:47:15 -04:00
Andrew
0672b9378a Add more secure logic to add/edit users 2022-08-20 18:51:35 -04:00
Andrew
cbbb9f9fd2 Fix clone server not taking into account quotas 2022-08-20 13:45:10 -04:00
Andrew
0f43917083 Remove unused methods 2022-08-20 13:15:44 -04:00
Andrew
cafa720bba Fix server quotas. Removed un-used perms columns 2022-08-20 13:00:20 -04:00
Andrew
245d64ca45 Refactor managed roles to users controller/model 2022-08-20 12:56:38 -04:00
Andrew
31b75b1c50 Remove manager from role when user deleted 2022-08-20 10:24:43 -04:00
Andrew
7a68e08a64 Working role manger super user 
TODO: Remove maanger after user is deleted
 2022-08-20 09:31:33 -04:00
Andrew
552a2e26c2 Working role managers. 
TODO: Add super user select option
 2022-08-20 08:49:38 -04:00
Andrew
56e9aaab01 Regression 2022-08-20 08:34:38 -04:00
Andrew
bd64f0d2ae Initial commit for role managers 2022-08-20 08:32:39 -04:00
amcmanu3
f75286e112 Fix logical issue in panel_handler 2022-08-19 15:14:42 -04:00
amcmanu3
7a98331b1f Add translations. Tweak frontend 2022-08-19 15:08:35 -04:00
amcmanu3
c1d16522d0 Add manager field to users 2022-08-19 13:09:59 -04:00
amcmanu3
b10523ae0a Add import status to working bedrock 2022-08-17 19:07:56 -04:00
amcmanu3
504ffd57f6 Working zip imports 2022-08-17 18:14:16 -04:00
amcmanu3
b5420c083e Starting zip imports 2022-08-17 17:41:44 -04:00
amcmanu3
eea5e329af Refactor and add import_helpers. 
Working jar imports
 2022-08-17 17:22:03 -04:00
amcmanu3
65c8ca680b Add importing threading to jar servers. 
Refactor "downloading" status
 2022-08-17 14:48:05 -04:00
Zedifus
f3590ded0f Prepare 4.0.11 release base 2022-08-14 19:27:19 +01:00
Iain Powrie
5d021fc5c6 Merge branch 'dev' into 'master' 
4.0.10

See merge request crafty-controller/crafty-4!432
 2022-08-14 18:23:04 +00:00
Zedifus
4014aec0f3 Cleanup release !432 2022-08-14 19:01:16 +01:00
Iain Powrie
138ecda9f6 Merge branch 'bug/backup-reload' into 'dev' 
Reload backup page on front end - Fix & in backup path

See merge request crafty-controller/crafty-4!431
 2022-08-14 17:48:11 +00:00
Zedifus
28136be5a8 Update changelog !431 2022-08-14 18:43:17 +01:00
Zedifus
e2a4e096a2 Merge branch 'dev' into bug/backup-reload 2022-08-14 18:36:27 +01:00
Iain Powrie
246ad37b34 Merge branch 'devops/release-changelog-trimming' into 'dev' 
Trim changelog before including in release description

See merge request crafty-controller/crafty-4!430
 2022-08-14 17:30:46 +00:00
Iain Powrie
859a05b819 Merge branch 'tweak/pretzel-users-title' into 'dev' 
Fix users title

See merge request crafty-controller/crafty-4!427
 2022-08-14 17:26:12 +00:00
Zedifus
5bea34e2d0 Update changelog !427 2022-08-14 18:18:16 +01:00
Zedifus
b452d06b8e Merge branch 'dev' into tweak/pretzel-users-title 2022-08-14 18:16:11 +01:00
Iain Powrie
d295c21104 Merge branch 'tweak/pretzel-backup-list' into 'dev' 
Only list zip files in backups list

See merge request crafty-controller/crafty-4!426
 2022-08-14 17:08:44 +00:00
Zedifus
59e6bf73d0 Update changelog !426 2022-08-14 18:05:00 +01:00
Zedifus
ab5f587f50 Merge branch 'dev' into tweak/pretzel-backup-list 2022-08-14 18:03:30 +01:00
Iain Powrie
6a94417a63 Merge branch 'bug/pretzel-fresh-install' into 'dev' 
Fix Logic issues on Fresh Install Detect

See merge request crafty-controller/crafty-4!425
 2022-08-14 16:59:32 +00:00
Zedifus
bf00025f5e Update changelog !425 2022-08-14 17:55:20 +01:00
Zedifus
8c3649d0bb Merge branch 'dev' into bug/pretzel-fresh-install 2022-08-14 17:53:22 +01:00
Iain Powrie
4c4ccd8eba Merge branch 'tweak/pretzel-logout' into 'dev' 
Fix session handling/logout

See merge request crafty-controller/crafty-4!424
 2022-08-14 16:45:56 +00:00
Zedifus
09c407f992 Update changelog !424 2022-08-14 17:40:40 +01:00
Zedifus
1b9445bde0 Merge branch 'dev' into tweak/pretzel-logout 2022-08-14 17:37:32 +01:00
Iain Powrie
dab0957d3d Merge branch 'bug/reaction' into 'dev' 
Fix reaction tasks not firing

See merge request crafty-controller/crafty-4!423
 2022-08-14 16:34:35 +00:00
Zedifus
974e0b8bf3 Update changelog !423 2022-08-14 17:29:17 +01:00
Zedifus
0a019d46b5 Merge branch 'dev' into bug/reaction 2022-08-14 17:23:33 +01:00