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,006 Commits 12 Branches 45 Tags 104 MiB
d1bdb6198b
Commit Graph

2006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zedifus
e2d5e7cb69 Update changelog !376 2022-06-21 06:26:08 +01:00
amcmanu3
c4fb6482cc Fix sec bug with server creation roles 
Retain current java version in dropdown.
 2022-06-21 01:18:19 -04:00
Iain Powrie
44e5d27d88 Bump Version 2022-06-21 04:06:08 +00:00
Iain Powrie
5c1a9c5626 Add branch trigger back 
For windows updater to remain up-to-date with master
 2022-06-21 04:03:05 +00:00
Iain Powrie
b5331501ec Merge branch 'feature/java-selection' into 'dev' 
Java path dropdown select

See merge request crafty-controller/crafty-4!375
 2022-06-21 03:39:30 +00:00
Zedifus
481572be1e Add 4.0.4 date 2022-06-21 04:33:27 +01:00
Zedifus
bad7a8d625 Merge branch 'dev' into feature/java-selection 2022-06-21 04:29:37 +01:00
Iain Powrie
0bf74288ea Merge branch 'bug/ping-data' into 'dev' 
Check if ping result is boolean

See merge request crafty-controller/crafty-4!371
 2022-06-21 03:22:49 +00:00
Zedifus
8518cbbcd9 Update CHANGELOG.md !371 2022-06-21 04:18:24 +01:00
Zedifus
4bfbf9ea47 Merge branch 'dev' into bug/ping-data 2022-06-21 04:09:35 +01:00
Iain Powrie
96e4a07958 Merge branch 'feature/backup-shutdown' into 'dev' 
Add backup shutdown feature

See merge request crafty-controller/crafty-4!373
 2022-06-21 02:58:35 +00:00
Zedifus
a4ead62ea3 Add missing change !373 2022-06-21 03:54:42 +01:00
Zedifus
0ada8e40a9 Update CHANGELOG.md !373 2022-06-21 03:50:41 +01:00
Zedifus
69d1aa6c87 Appease linter 2022-06-21 03:31:40 +01:00
Zedifus
093058d01c Merge branch 'feature/java-selection' of gitlab.com:crafty-controller/crafty-4 into feature/java-selection 2022-06-21 03:16:46 +01:00
Zedifus
85f508dbc2 Remove debug log 2022-06-21 03:16:41 +01:00