Commit Graph

2711 Commits

Author SHA1 Message Date
Andrew
491415c7fa Re-black codebase with new standard 2023-02-15 18:01:21 -05: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
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
Zedifus
454f73c63e Merge branch 'dev' into refactor/cleanup-authentication-helpers 2023-02-11 18:03:08 +00:00
Iain Powrie
77d3421778 Merge branch 'bugfix/404-startup' into 'dev'
Fix exception related to page data on server start

See merge request crafty-controller/crafty-4!544
2023-02-11 18:00:56 +00:00
Zedifus
3e3d9b6872 Update changelog !544 2023-02-11 17:48:08 +00:00
Zedifus
c8ea77c81a Merge branch 'dev' into bugfix/404-startup 2023-02-11 17:45:02 +00:00
Iain Powrie
2dd75606b2 Merge branch 'translation/backups' into 'dev'
Translate additions to backups page

See merge request crafty-controller/crafty-4!543
2023-02-11 17:42:22 +00:00
Zedifus
4ad96d0970 Update changelog !543 2023-02-11 17:37:56 +00:00
amcmanu3
52833d8126 Appease the linter 2023-02-10 18:03:49 -05:00
amcmanu3
923082b58d Pass tz object instead of text for tz fallback 2023-02-10 16:36:20 -05:00
amcmanu3
3714d2393d Fix logical issue with uploading dynamic files 2023-02-10 16:07:59 -05:00
amcmanu3
9d2164a1b3 Bump Cryptography/pyOpenSSL for CVE-2020-36242 2023-02-10 15:36:46 -05:00
amcmanu3
6d0ec12a6f Fix typos in server-config form. Fix whitespace 2023-02-10 14:48:19 -05:00
amcmanu3
87fdb1627c Add feature - ignore exit codes on crash detection 2023-02-10 14:02:26 -05:00
amcmanu3
dd69ad066c Trunkate sidebar servers to a max of 10 2023-02-10 13:35:22 -05:00
amcmanu3
edddfca8bc Fix spacing on moble server controls 2023-02-03 18:24:42 -05:00
amcmanu3
ca0a53b326 Add translations to Crafty Config Page and wizard 2023-02-03 16:00:13 -05:00
amcmanu3
6b5ec51887 Upgrade to fontawesome6 2023-02-03 15:59:52 -05:00
amcmanu3
c22a073f2f Add space after gear 2023-02-01 17:34:07 -05:00
amcmanu3
42b564de1c Fix error codes 2023-02-01 17:16:08 -05:00
amcmanu3
bb482b8381 Use response text for errors on uploads.
Overhaul
2023-02-01 17:09:39 -05:00
amcmanu3
20ce8996d7 Add better upload feedback for users 2023-02-01 15:43:17 -05:00
amcmanu3
238b8da4d9 Add upload progress bar for file uploads 2023-02-01 15:31:43 -05:00
amcmanu3
5bccfab7b6 add ignored names in conditional 2023-01-31 13:53:27 -05:00
amcmanu3
750e4f40c0 Remove "my secret" from authentication 2023-01-31 13:30:41 -05:00
amcmanu3
6e0805a8a1 Lol uncomment the fix 2023-01-31 13:14:01 -05:00
amcmanu3
ed30cbd4cb Refactor public handler keys 2023-01-31 13:11:28 -05:00
amcmanu3
683c9cecba Add background key to server_handler page_data 2023-01-31 13:11:03 -05:00