Commit Graph

2758 Commits

Author SHA1 Message Date
Zedifus
c27e1e667d Merge branch 'dev' into tweak/java-check 2023-02-17 00:19:27 +00:00
Iain Powrie
b4a54aaa63 Merge branch 'tweak/file-save-fa-6' into 'dev'
Fix file save status for fa 6

See merge request crafty-controller/crafty-4!558
2023-02-17 00:15:38 +00:00
Zedifus
17e6d43846 Update changelog !558 2023-02-17 00:12:06 +00:00
Zedifus
6e5138e736 Merge branch 'dev' into tweak/file-save-fa-6 2023-02-17 00:10:49 +00:00
Iain Powrie
206941e26e Merge branch 'enhancement/add-storage-to-dash' into 'dev'
Add host storage display to the dashboard

See merge request crafty-controller/crafty-4!551
2023-02-17 00:08:03 +00:00
Zedifus
cbcbdd4932 Update changelog !551 2023-02-17 00:02:37 +00:00
Zedifus
5dea17a7cb Merge branch 'dev' into enhancement/add-storage-to-dash 2023-02-17 00:00:00 +00:00
Iain Powrie
b53e7d6f50 Merge branch 'tweak/master-server-dir-config' into 'dev'
Allow users to change the directory where Crafty Stores Servers

See merge request crafty-controller/crafty-4!539
2023-02-16 23:44:33 +00:00
Zedifus
2b7f14ec3c Merge branch 'dev' into tweak/master-server-dir-config 2023-02-16 23:39:33 +00:00
Iain Powrie
d3097083a1 Merge branch 'refactor/black-update' into 'dev'
Resolve Updated Lint and Black Errors

See merge request crafty-controller/crafty-4!561
2023-02-16 23:31:14 +00:00
Zedifus
34f1acd3e2 Appease black 2023-02-16 23:29:06 +00:00
Zedifus
de17278255 Update changelog !539 2023-02-16 23:22:34 +00:00
Andrew
224e55429f appease the linter 2023-02-15 18:44:53 -05:00
Andrew
e52294dbb3 Appease the linter 2023-02-15 18:40:20 -05:00
Andrew
491415c7fa Re-black codebase with new standard 2023-02-15 18:01:21 -05:00
amcmanu3
a423cee40b Check for java on forge server creation 2023-02-14 13:59:53 -05:00
amcmanu3
49b412ff83 Implement helper in server start 2023-02-14 13:59:42 -05:00
amcmanu3
cefa6e8084 Add a helper to better detect if java is installed 2023-02-14 13:59:24 -05:00
amcmanu3
33ff921b45 Silently log no server dir setting 2023-02-13 14:08:02 -05:00
amcmanu3
4d02ef1fc3 Fix file save status for fa 6 2023-02-13 13:28:21 -05:00
amcmanu3
b3fba650e7 Put try catch around move block
Reset run command, executable, log path if abs
2023-02-13 13:05:54 -05:00
amcmanu3
b4e47151ce We'll wtol the path coming in 2023-02-13 11:48:06 -05:00
amcmanu3
dd317a3460 Only support changing server dir in non-docker env 2023-02-12 12:29:05 -05:00
amcmanu3
fdf7bd7621 Add helper to check docker environment 2023-02-12 12:28:37 -05:00
Andrew
1e7d035119 Appease the linter 2023-02-11 15:42:18 -08:00
Andrew
72a2ff4c40 Merge branch 'dev' into
enhancement/add-storage-to-dash
2023-02-11 15:36:33 -08:00
Iain Powrie
c434833208 Merge branch 'critical/bump-cryptography-openssl' into 'dev'
Bump Cryptography/pyOpenSSL for CVE-2023-23931

See merge request crafty-controller/crafty-4!554
2023-02-11 22:35:21 +00:00
Zedifus
1152e9881c Update changelog !554 2023-02-11 22:26:01 +00:00
Zedifus
821b602387 Merge branch 'dev' into critical/bump-cryptography-openssl 2023-02-11 22:10:23 +00:00
Iain Powrie
5fb5fc70b7 Merge branch 'tweak/front-end-translation-fa' into 'dev'
Upgrade to FA 6. Add Translations

See merge request crafty-controller/crafty-4!549
2023-02-11 22:02:29 +00:00
Zedifus
be17d7fded Update changelog !549 2023-02-11 21:58:43 +00:00
Zedifus
e39e87824d Merge branch 'dev' into tweak/front-end-translation-fa 2023-02-11 19:47:36 +00:00
Zedifus
c151e5f3a7 Merge branch 'dev' into tweak/master-server-dir-config 2023-02-11 19:47:01 +00:00
Iain Powrie
9abdb47d31 Merge branch 'bug/backup-tz' into 'dev'
Fix backups failing by correctly using tz objects

See merge request crafty-controller/crafty-4!556
2023-02-11 19:26:37 +00:00
Zedifus
43a5018013 Update changelog !556 2023-02-11 19:13:37 +00:00
Zedifus
91df6730cf Merge branch 'dev' into bug/backup-tz 2023-02-11 19:10:45 +00:00
Iain Powrie
f6a5d587a3 Merge branch 'enhancement/ignored-exits' into 'dev'
Add ignored exit codes for crash detection

See merge request crafty-controller/crafty-4!553
2023-02-11 19:07:37 +00:00
Iain Powrie
1c7d023964 Merge branch 'bug/dynamic-files-upload' into 'dev'
Fix logical issue with uploading dynamic files

See merge request crafty-controller/crafty-4!555
2023-02-11 18:57:56 +00:00
Zedifus
42682b7095 Update changelog !555 2023-02-11 18:53:24 +00:00
Zedifus
fb26b4eeaf Merge branch 'dev' into bug/dynamic-files-upload 2023-02-11 18:49:34 +00:00
Zedifus
9affc834a2 Update changelog !553 2023-02-11 18:35:02 +00:00
Zedifus
fa6f17e347 Merge branch 'dev' into enhancement/ignored-exits 2023-02-11 18:33:48 +00:00
Iain Powrie
a71c833038 Merge branch 'tweak/sidebar-server-limit' into 'dev'
Truncate sidebar servers to a max of 10

See merge request crafty-controller/crafty-4!552
2023-02-11 18:30:49 +00:00
Zedifus
7317b31e38 Update changelog !552 2023-02-11 18:27:07 +00:00
Zedifus
11af841d2b Merge branch 'dev' into tweak/sidebar-server-limit 2023-02-11 18:25:14 +00:00
Iain Powrie
70563f3554 Merge branch 'feature/upload-progress' into 'dev'
Upload progress bar improvements

See merge request crafty-controller/crafty-4!546
2023-02-11 18:19:19 +00:00
Zedifus
c92368c6c3 Update changelog !546 2023-02-11 18:14:25 +00:00
Zedifus
5b383d9fa9 Merge branch 'dev' into feature/upload-progress 2023-02-11 18:10:32 +00:00
Iain Powrie
65a1459451 Merge branch 'refactor/cleanup-authentication-helpers' into 'dev'
Cleanup authentication helpers

See merge request crafty-controller/crafty-4!545
2023-02-11 18:08:09 +00:00
Zedifus
1e8f70ae17 Update changelog !545 2023-02-11 18:04:05 +00:00