Commit Graph

2035 Commits

Author SHA1 Message Date
Zedifus
9a6625ccaa Merge branch 'dev' into bugfix/handle-none-java-return 2022-06-24 03:45:36 +01:00
Iain Powrie
fa01a4a528 Merge branch 'bug/server-startup' into 'dev'
Fix 2 bugs: Stats startup after backup

See merge request crafty-controller/crafty-4!386
2022-06-24 02:43:25 +00:00
Zedifus
509e51ebf3 Update changelog !386 2022-06-24 03:39:49 +01:00
Zedifus
459ca2d191 Merge branch 'dev' into bug/server-startup 2022-06-24 03:38:05 +01:00
Zedifus
0a8d338272 Update changelog !385 2022-06-24 03:34:10 +01:00
Iain Powrie
bf446e869d Merge branch 'tweak/german-lang-spelling' into 'dev'
reviewed the german translation, fixed some spelling issues and added some missing strings

See merge request crafty-controller/crafty-4!385
2022-06-24 02:30:46 +00:00
Iain Powrie
a6bed55218 Merge branch 'tweak/clone-confirmation' into 'dev'
Add clone server confirmation.

See merge request crafty-controller/crafty-4!384
2022-06-24 02:07:50 +00:00
Zedifus
163c05eee3 Update changelog !384 2022-06-24 03:04:07 +01:00
Zedifus
3b9f72beee Merge branch 'dev' into tweak/clone-confirmation 2022-06-24 03:02:48 +01:00
Iain Powrie
ae457c0207 Merge branch 'dev-BetterMobileDisplayStatusPage' into 'dev'
Improving Mobile Display for  Status Page

See merge request crafty-controller/crafty-4!383
2022-06-24 02:01:02 +00:00
Andrew
118924eeaa Fix one more stop where this as an issue 2022-06-23 21:57:50 -04:00
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
luukas
f951b49e2f
AJAX schedule enabled status
This is buggy in its current state
2022-06-23 01:58:06 +03:00
luukas
147f178c87
Add a basic API for modifying schedules.
THIS IS VERY UNTESTED AND WILL BE EXPANDED TO FULL CRUD FOR SCHEDULES
2022-06-23 01:57:29 +03: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