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
4,059 Commits 12 Branches 45 Tags 104 MiB
a6b582b328
Commit Graph

4059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Iain Powrie
a6b582b328 Merge branch 'sec/bump-tornado' into 'dev' 
Bump tornado & requests for sec advisories

See merge request crafty-controller/crafty-4!774
 2024-07-08 23:22:01 +00:00
Iain Powrie
fd86533b47 Merge branch 'dev' into 'sec/bump-tornado' 
# Conflicts:
#   CHANGELOG.md
 2024-07-08 23:19:19 +00:00
Zedifus
0edd6005c6 Update changelog !774 2024-07-09 00:18:13 +01:00
Iain Powrie
522223a36f Merge branch 'bugfix/docker-audit-log' into 'dev' 
Ensure audit log exists

See merge request crafty-controller/crafty-4!771
 2024-06-23 15:36:35 +00:00
Zedifus
2c311499ac Update changelog !771 2024-06-23 16:32:12 +01:00
Zedifus
8b80d7e853 Merge branch 'dev' into bugfix/docker-audit-log 2024-06-23 16:30:44 +01:00
Iain Powrie
5df46ecd1c Merge branch 'tweak/status-typo' into 'dev' 
Remove text from status page and use symbols

See merge request crafty-controller/crafty-4!770
 2024-06-23 15:29:54 +00:00
Zedifus
cb41b613bf Update changelog !770 2024-06-23 16:26:26 +01:00
Zedifus
2fa23b14d1 Merge branch 'dev' into tweak/status-typo 2024-06-23 16:25:15 +01:00
Zedifus
a3ee37a8ff Bump requests to 2.32.0 for CVE-2024-35195 2024-06-23 16:18:25 +01:00
Zedifus
4ea9c75c41 Bump tornado to 6.4.1 for GHSA-753j-mpmx-qq6g & GHSA-w235-7p84-xx57 2024-06-23 16:17:55 +01:00
Iain Powrie
75f149849a Merge branch 'tweak/support-logs-threads' into 'dev' 
Add a thread dump to support logs

See merge request crafty-controller/crafty-4!769
 2024-06-23 15:08:51 +00:00
Zedifus
6ed23f09dd Update changelog !769 2024-06-23 16:03:07 +01:00
Zedifus
d05b986fa9 Merge branch 'dev' into tweak/support-logs-threads 2024-06-23 16:01:51 +01:00
Iain Powrie
c8d5bfb960 Merge branch 'bugfix/api-permissions' into 'dev' 
Fix bug where full access gives minimal access

See merge request crafty-controller/crafty-4!768
 2024-06-23 14:58:46 +00:00
Zedifus
b17347bd99 Update changelog !768 2024-06-23 15:49:29 +01:00
Zedifus
9331ad179e Merge branch 'dev' into bugfix/api-permissions 2024-06-23 15:48:05 +01:00
Iain Powrie
2253f1e812 Merge branch 'tweak/nav-label' into 'dev' 
Remove navigation label from sidebar

See merge request crafty-controller/crafty-4!766
 2024-06-23 14:36:02 +00:00
Zedifus
2438906be2 Update changelog !766 2024-06-23 15:32:00 +01:00
Zedifus
1a9ee2cbc1 Merge branch 'dev' into tweak/nav-label 2024-06-23 15:30:28 +01:00
Iain Powrie
2e9b7525be Merge branch 'bugfix/zip-server-creation' into 'dev' 
Fix Zip Root Dir Selection

See merge request crafty-controller/crafty-4!764
 2024-06-23 14:26:49 +00:00
Zedifus
ff56d8fe04 Update changelog !764 2024-06-23 15:23:19 +01:00
Zedifus
636ade7a9e Merge branch 'dev' into bugfix/zip-server-creation 2024-06-23 15:22:07 +01:00
Iain Powrie
b7830ec00b Merge branch 'tweak/default-creds' into 'dev' 
Add info note to default creds file

See merge request crafty-controller/crafty-4!760
 2024-06-23 14:15:12 +00:00
Zedifus
12d516a48d Update changelog !760 2024-06-23 14:55:33 +01:00
Zedifus
da97268cb3 Merge branch 'dev' into tweak/default-creds 2024-06-23 14:53:58 +01:00
Iain Powrie
5b02021478 Merge branch 'lang/additional-lang-for-4.4.0' into 'dev' 
Lang/additional lang for 4.4.0

See merge request crafty-controller/crafty-4!761
 2024-06-23 13:51:01 +00:00
Zedifus
af5c7aab10 Update changelog !761 2024-06-23 14:30:40 +01:00
amcmanu3
b904430069 Ensure audit log exists 2024-06-20 17:29:35 -04:00
amcmanu3
43bd2d0444 Remove formatting 2024-06-19 13:54:32 -04:00
amcmanu3
481691aec5 Remove text from status page and use symbols 2024-06-19 13:48:48 -04:00
amcmanu3
95437c3e64 Remove function from troubleshooting 2024-06-19 13:31:36 -04:00
Andrew
4aad365811 Add a thread dump to support logs 2024-06-08 12:24:04 -04:00
amcmanu3
bb6b516647 Fix bug where full access gives minimal access 2024-06-01 22:16:46 -04:00
amcmanu3
7d418355ba Remove navigation label from sidebar 2024-05-31 12:37:21 -04:00
Andrew
5340670ceb Fix bedrock zip imports 2024-05-28 19:39:13 -04:00
Andrew
a9856a8a2c Fix java server zip creation 2024-05-28 19:30:12 -04:00
Zedifus
94707be975 Merge branch 'dev' into lang/additional-lang-for-4.4.0 2024-05-24 00:33:05 +01:00
Analicia Abernathy
fdd1d2fca3 added big bucket translations 2024-05-24 00:15:43 +01:00
Analicia Abernathy
895ba2d2f5 updates for the big bucket release 2024-05-24 00:15:43 +01:00
Zedifus
2a6c0ca751 Revert pinned sonarq version, 
They've moved to a rootless image and cache was retaining files with root permissions, solution is to clear cache
 2024-05-23 23:40:03 +01:00
Zedifus
5d53a1fa46 Pin sonar-scanner-cli to 5.0.1 
Latest Broken
 2024-05-23 21:54:35 +01:00
amcmanu3
f845f54654 Add info note to default creds file 2024-05-18 20:32:27 -04:00
Zedifus
860b9aa5d1 Prepare 4.4.1 release base 2024-05-12 00:45:06 +01:00
Zedifus
938a7794bd Sort unsorted es_ES lang 2024-05-12 00:14:16 +01:00
Zedifus
ac4719158b Remove incorrectly placed translations 2024-05-11 23:56:06 +01:00
Zedifus
9de2d63d18 Merge branch 'lang/additional-lang-for-4.4.0' into dev 2024-05-11 23:44:14 +01:00
Iain Powrie
9f4e48deec Merge branch 'bugfix/authentication-return' into 'dev' 
Fix API authentication stack

See merge request crafty-controller/crafty-4!759
 2024-05-11 22:41:58 +00:00
Zedifus
c5e7b4a3b5 Update changelog !759 2024-05-11 23:32:20 +01:00
Analicia Abernathy
f0d934a7f9 updated language for merge 755 2024-05-11 11:14:58 -05:00