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,159 Commits 12 Branches 45 Tags 104 MiB
266e540374
Commit Graph

2159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew
266e540374 Add bedrock update support 2022-08-31 11:59:33 -04:00
Zedifus
cb1490724c Merge branch 'master' into dev 2022-08-28 01:19:37 +01:00
Zedifus
9f62f6d0ca Prepare 4.0.12 release base 2022-08-28 01:17:55 +01:00
Iain Powrie
5af3c30aa5 Merge branch 'dev' into 'master' 
4.0.11

See merge request crafty-controller/crafty-4!439
 2022-08-28 00:13:41 +00:00
Iain Powrie
14b2891e1c Tidy 4.0.11 changelog 2022-08-27 20:58:52 +00:00
Iain Powrie
ee71e48035 Merge branch 'tweak/support-logs-zip-comment' into 'dev' 
Add Zip comments to support archives

See merge request crafty-controller/crafty-4!438
 2022-08-27 19:15:49 +00:00
Zedifus
381648eaca Update changelog !438 2022-08-27 19:01:41 +01:00
Zedifus
51d123e9eb Merge branch 'dev' into tweak/support-logs-zip-comment 2022-08-27 19:00:38 +01:00
Iain Powrie
619a760482 Merge branch 'devops/bedrock-docker-deps-update' into 'dev' 
Add bedrock dependency (libcurl.so.4)

See merge request crafty-controller/crafty-4!437
 2022-08-27 17:18:43 +00:00
Zedifus
33051e522b Update changelog !437 2022-08-27 18:13:45 +01:00
Zedifus
b174d43851 Merge branch 'dev' into devops/bedrock-docker-deps-update 2022-08-27 18:12:22 +01:00
Iain Powrie
9876f37c85 Merge branch 'feature/pretzel-metrics-graph' into 'dev' 
Add metrics graph

See merge request crafty-controller/crafty-4!436
 2022-08-27 17:08:01 +00:00
Zedifus
ab248bb006 Update changelog !436 2022-08-27 18:02:03 +01:00
Zedifus
fdb98cf1f8 Merge branch 'dev' into feature/pretzel-metrics-graph 2022-08-27 18:00:36 +01:00
Iain Powrie
c7b8b4b313 Merge branch 'feature/pretzel-variable-shutdown-timeout' into 'dev' 
Add variable shutdown timeouts

See merge request crafty-controller/crafty-4!435
 2022-08-27 16:57:13 +00:00
Zedifus
00fb994fb3 Update changelog !435 2022-08-27 17:52:32 +01:00
Zedifus
b0b04a6495 Merge branch 'dev' into feature/pretzel-variable-shutdown-timeout 2022-08-27 17:50:50 +01:00
Iain Powrie
ffd0f3d55d Merge branch 'feature/pretzel-users-roles-manager' into 'dev' 
Add manager field to users/roles. Add created by field to servers - fixes bug with quotas.

See merge request crafty-controller/crafty-4!434
 2022-08-27 16:39:59 +00:00
Zedifus
2c0c775fa7 Update changelog !434 2022-08-27 17:31:01 +01:00
Zedifus
1b4777fbab Merge branch 'dev' into feature/pretzel-users-roles-manager 2022-08-27 17:25:49 +01:00
Iain Powrie
bb714d81bd Merge branch 'enhancement/pretzel-import-threading' into 'dev' 
Add imports to their own threads. Add status indicators

See merge request crafty-controller/crafty-4!433
 2022-08-27 16:22:51 +00:00
Zedifus
d7244cb100 Update chasngelog !433 2022-08-27 17:18:54 +01:00
Zedifus
6f66b77478 Add 'optional' comment to all archival methods 2022-08-27 17:05:13 +01:00
Andrew
b1769ba9a4 Remove manager parameter from add_raw_pass 2022-08-27 11:25:55 -04:00
Andrew
27ad78c14d Make admin manager none on fresh install 2022-08-27 11:17:31 -04:00
Andrew
3c14d0f2ee Appease the linter 2022-08-27 10:44:34 -04:00
Zedifus
7d801ac216 Add date and time to log archive 2022-08-26 16:23:08 +01:00
Zedifus
b8b61649b7 Tidy support string creation and include as comment 2022-08-26 15:57:35 +01:00
Zedifus
d3b7ab048d Add comment arg to make_compressed_archive 
This is an optional arg that will add a comment to zip file
 2022-08-26 15:56:31 +01:00
Andrew
9831705677 Fix height on different viewports 2022-08-22 22:39:39 -04:00
Andrew
1e569300fc Add translations 2022-08-22 20:23:09 -04:00
Andrew
037758accb Working live graph 2022-08-22 20:04:40 -04:00
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