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
1,922 Commits 12 Branches 45 Tags 104 MiB
43a93f35b3
Commit Graph

1922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zedifus
e4140748cf Merge branch 'dev' into dev-BetterMobileDisplayStatusPage 2022-06-24 02:56:52 +01:00
Iain Powrie
7939b70e8c Merge branch 'bug/backup-delete-page-2' into 'dev' 
Fix cannot delete backup on page 2

See merge request crafty-controller/crafty-4!382
 2022-06-24 01:50:09 +00:00
Zedifus
6ae87ca2af Update changelog !382 2022-06-24 02:46:53 +01:00
Zedifus
cf25249a9d Fix path issue with update-alternatives 
Sometimes it can be in /sbin,
if it is we return `None` which broke upstream frontend.
Returning an empty list to resolve this.
 2022-06-24 02:28:05 +01:00
Andrew
b4749f8caf Fix 2 bugs: Stats startup after backup 
Server java version path bug
 2022-06-23 19:34:27 -04:00
Silversthorn
8fab04878a Update Changelog Status Page 2022-06-23 18:16:17 +02:00
Silversthorn
db839252ac Better Display 2022-06-23 18:07:25 +02:00
Silversthorn
ae73165423 smaller Server icon 2022-06-23 18:02:54 +02:00
Matze
d3164c564e corrected a misunderstood translation in string "javaversionDesc" 2022-06-22 23:24:07 +02:00
Matze
6328ef4a74 reviewed the german translation, fixed some spelling issues and added some missing strings 2022-06-22 22:54:57 +02:00
Silversthorn
b3993d1072 First try to add a better display for Status Page 2022-06-22 21:36:05 +02:00
Andrew
b359685392 Add clone server confirmation. 2022-06-22 14:51:10 -04:00
amcmanu3
b1b04e536e Fix cannot delete backup on page 2 2022-06-21 23:18:17 -04:00
Iain Powrie
a252444c52 Merge branch 'dev' into 'master' 
4.0.4-hotfix2

See merge request crafty-controller/crafty-4!381
 2022-06-21 22:49:26 +00:00
Zedifus
81bc228e40 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-06-21 23:43:24 +01:00
Zedifus
f2023ec06a Update changelog !381 2022-06-21 23:43:10 +01:00
amcmanu3
d09bc8a9aa Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-06-21 18:40:18 -04:00
amcmanu3
205bbf356f Fix traceback on server schedule creation page 2022-06-21 18:40:16 -04:00
Iain Powrie
0c562d4979 Merge branch 'dev' into 'master' 
4.0.4-hotfix

See merge request crafty-controller/crafty-4!380
 2022-06-21 22:06:18 +00:00
Zedifus
05a84eb9cb Update changelog !380 2022-06-21 22:44:23 +01:00
amcmanu3
d8d80bbb42 Remove bad check for backup path 2022-06-21 17:41:52 -04:00
amcmanu3
b725054dcd Appease the linter 2022-06-21 17:36:50 -04:00
amcmanu3
97900cd283 Fix issue on path transversal backups linux 2022-06-21 17:35:34 -04:00
Iain Powrie
abeec0871c Merge branch 'dev' into 'master' 
4.0.4

See merge request crafty-controller/crafty-4!379
 2022-06-21 21:24:20 +00:00
amcmanu3
7074dd18fb Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-06-21 17:14:55 -04:00
Iain Powrie
3c0e23fc2f Merge branch 'enhancement/file-editor-large' into 'dev' 
File-editor size toggle

See merge request crafty-controller/crafty-4!378
 2022-06-21 21:14:38 +00:00
amcmanu3
fdfec80a39 Fix bug with sec logic 2022-06-21 17:14:35 -04:00
Zedifus
d549043fec Update changelog !378 2022-06-21 22:03:33 +01:00
Zedifus
7107713666 Merge branch 'dev' into enhancement/file-editor-large 2022-06-21 22:01:36 +01:00
amcmanu3
950cbce27c Fix java logic issue 2022-06-21 17:00:51 -04:00
amcmanu3
d1af950c46 Update translation 2022-06-21 16:55:42 -04:00
Iain Powrie
4cef251a1c Merge branch 'enhancement/backup-failure-alert' into 'dev' 
Enhancement/backup failure alert

See merge request crafty-controller/crafty-4!377
 2022-06-21 20:49:11 +00:00
amcmanu3
c2bcc82cc0 Fix save button bug 2022-06-21 16:44:30 -04:00
amcmanu3
6e1eaf595c Allow file-editor increase size 2022-06-21 16:41:06 -04:00
Zedifus
544548d2a1 Update CHANGELOG 2022-06-21 21:37:10 +01:00
Zedifus
ffba1fb438 Merge branch 'dev' into enhancement/backup-failure-alert 2022-06-21 21:34:51 +01:00
amcmanu3
d3b1095867 Disable backups directory from changing bad paths 2022-06-21 16:14:29 -04:00
Iain Powrie
b7099c308f Merge branch 'tweak/file-enhancements' into 'dev' 
File enhancements

See merge request crafty-controller/crafty-4!362
 2022-06-21 20:02:18 +00:00
amcmanu3
177d99e002 Add mobile menu to pages without it 2022-06-21 15:59:34 -04:00
amcmanu3
6c360d1ff1 Make backup failed alert 2022-06-21 15:59:08 -04:00
Zedifus
610b94dd59 Merge branch 'dev' into tweak/file-enhancements 2022-06-21 20:41:09 +01:00
Andrew
0fc3dc2196 Merge branch 'dev-ImprovingMobileDisplay' into 'dev' 
Improving Mobile Display

See merge request crafty-controller/crafty-4!372
 2022-06-21 19:31:09 +00:00
Zedifus
70e9290627 Merge branch 'dev' into dev-ImprovingMobileDisplay 2022-06-21 20:23:48 +01:00
Andrew
e727e6662a Merge branch 'tweak/java-version-retention' into 'dev' 
Fix sec bug with server creation roles/Java Version Select improvements

See merge request crafty-controller/crafty-4!376
 2022-06-21 19:17:35 +00:00
Zedifus
e5b0c93de7 Update changelog 2022-06-21 20:13:30 +01:00
Zedifus
a6d9b81775 Add execution cmd -display only- for non supers 2022-06-21 20:11:01 +01:00
Zedifus
28e313ee1d Revert back to 'Do not override' as default 2022-06-21 19:53:23 +01:00
Zedifus
7379545186 Strip empty entry in update-alternatives output 
Catch ValueError on missing end quote in java execution command
 2022-06-21 19:28:53 +01:00
Zedifus
6fe5d16ded Remove java selection from bedrock 2022-06-21 19:05:56 +01:00
Zedifus
176f5a4004 Add java selection POST check 
Protect against tampered post requests to front end

Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
 2022-06-21 18:39:20 +01:00