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
3,590 Commits 12 Branches 45 Tags 104 MiB
56044456d9
Commit Graph

3590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zedifus
56044456d9 Update changelog !682 2023-12-07 13:53:30 +00:00
Zedifus
2d07dbbd9c Merge branch 'dev' into bugfix/backup-dir 2023-12-07 13:52:17 +00:00
Iain Powrie
64152c6192 Merge branch 'tweak/backup-delete' into 'dev' 
Give better feedback when backup delete fails

See merge request crafty-controller/crafty-4!681
 2023-12-07 13:50:54 +00:00
Zedifus
f16e95acd9 Update changelog !681 2023-12-07 13:47:04 +00:00
Zedifus
342a4f6599 Merge branch 'dev' into tweak/backup-delete 2023-12-07 13:45:15 +00:00
Iain Powrie
c8206468ab Merge branch 'bugfix/support-log-x' into 'dev' 
Fix support log x button still downloading

See merge request crafty-controller/crafty-4!679
 2023-12-07 13:40:48 +00:00
Zedifus
eab376420d Update changelog !679 2023-12-07 13:34:08 +00:00
Zedifus
cca4f8314b Fix bootbox close function call 2023-12-07 13:31:50 +00:00
Zedifus
c045ded7b5 Merge branch 'dev' into bugfix/support-log-x 2023-12-07 13:28:04 +00:00
Iain Powrie
2eb012e61d Merge branch 'bugfix/config-empty-mounts' into 'dev' 
Fix bug where you cannot select "do not monitor mounts" from config.json

See merge request crafty-controller/crafty-4!678
 2023-12-07 13:14:31 +00:00
Zedifus
e2eb5c62f4 Update changelog !678 2023-12-07 13:07:35 +00:00
Zedifus
1383accefd Merge branch 'dev' into bugfix/config-empty-mounts 2023-12-07 13:05:40 +00:00
Iain Powrie
804a39afad Merge branch 'bugfix/no-file-error' into 'dev' 
Fix bug where no file error

See merge request crafty-controller/crafty-4!677
 2023-12-07 13:01:33 +00:00
Zedifus
fb7b78abb7 Fix incorrect changelog order 2023-12-07 12:57:51 +00:00
Zedifus
66f6786597 Update changelog !677 2023-12-07 12:56:55 +00:00
Zedifus
ba187374d4 Merge branch 'dev' into bugfix/no-file-error 2023-12-07 12:55:20 +00:00
Iain Powrie
a2fefcf23f Merge branch 'bugfix/superuser-password-edit' into 'dev' 
Fix bug where su cannot edit general user password

See merge request crafty-controller/crafty-4!676
 2023-12-07 12:44:33 +00:00
Zedifus
af3ca7aec4 Update changelog !676 2023-12-07 12:36:07 +00:00
Zedifus
7879baff75 Merge branch 'dev' into bugfix/superuser-password-edit 2023-12-07 12:34:56 +00:00
Iain Powrie
40bf180eb9 Merge branch 'lang/pl-pl-lang-update' into 'dev' 
Update lang pl_PL with minor fixes

See merge request crafty-controller/crafty-4!675
 2023-12-07 12:20:50 +00:00
Iain Powrie
25123bf9ec Merge branch 'sec/bump-cryptography' into 'dev' 
Bump cryptography for CVE-2023-49083

See merge request crafty-controller/crafty-4!680
 2023-12-07 12:11:01 +00:00
Zedifus
e37bd47806 Update changelog !680 2023-12-07 11:57:56 +00:00
Zedifus
cda2929052 Merge branch 'dev' into sec/bump-cryptography 2023-12-07 11:46:29 +00:00
Iain Powrie
bef16270fe Merge branch 'enhancement/crafty-loading' into 'dev' 
Add Crafty loading screen. Refactor main.py

See merge request crafty-controller/crafty-4!668
 2023-12-07 11:44:37 +00:00
Zedifus
b2035eef60 Fix sonar findings 2023-12-07 11:29:18 +00:00
Zedifus
9e54eafd50 Update changelog !668 2023-12-07 11:16:50 +00:00
amcmanu3
3df2f23658 Fix bug with backup exclusion save 2023-12-04 23:44:51 -05:00
amcmanu3
621afb4eec Fix bug where servers are created without bu dir 2023-12-04 23:37:53 -05:00
amcmanu3
42e4bb7e3c Give better feedback when backup delete fails 2023-12-04 11:01:01 -05:00
amcmanu3
0d6cd5c42e Bump openSSL 2023-11-30 13:11:37 -05:00
amcmanu3
a91c3257f7 Bump cryptography for CVE-2023-49083 2023-11-30 13:04:18 -05:00
amcmanu3
c5c025ca8c Fix support log x button still downloading 2023-11-30 12:50:50 -05:00
amcmanu3
304da0da8a Add storage translation to dash 
Remote "storage" label if no mounts selected
 2023-11-30 12:33:11 -05:00
amcmanu3
52f90f1ee3 Fix monitored mounts when non selected 2023-11-30 12:32:48 -05:00
amcmanu3
09241bdc54 Appease the linter 2023-11-30 12:22:40 -05:00
amcmanu3
ca02c9d575 Add user-based translation to startup 2023-11-30 12:14:09 -05:00
amcmanu3
b60e6933dd Add broadcast to non-admin function 2023-11-30 12:12:16 -05:00
amcmanu3
fb41bc2443 Prevent stack for general user on boot 2023-11-30 01:05:00 -05:00
amcmanu3
90ed32738f Add translations 2023-11-30 00:55:26 -05:00
amcmanu3
999460f95e Del redundant statements (webserver not started) 
appease the linter
 2023-11-30 00:55:19 -05:00
amcmanu3
3840cc3863 Fix bug where no file error doesn't show up 2023-11-29 22:28:18 -05:00
amcmanu3
74c0e8b23a Fix bug where su cannot edit general user password 2023-11-29 21:30:29 -05:00
amcmanu3
9e98c97eb8 Merge branch 'dev' into enhancement/crafty-loading 2023-11-29 21:24:05 -05:00
amcmanu3
aa0eee68e3 Remove border line on loadup 2023-11-29 21:21:28 -05:00
amcmanu3
c13ebeaf51 Use constant variables for run mode and app path 2023-11-29 21:04:02 -05:00
amcmanu3
151f77589b Restructure main.py to be more comprehensive 2023-11-29 18:15:11 -05:00
Zedifus
7db259eb98 Update changelog !675 2023-11-25 21:26:34 +00:00
Zedifus
16f8df20ac Update lang pl_PL with minor fixes 
Thanks Terrariadlc
 2023-11-25 21:20:39 +00:00
Zedifus
8bad0fb0a9 Update changelog !674 2023-11-25 20:33:21 +00:00
Iain Powrie
67ed35a6b0 Merge branch 'JonathanAlKass-master-patch-25467' into 'dev' 
removed ".decoder" from orjson in crafty-4/app/classes/web/routes/api/roles/index.py: line 113

See merge request crafty-controller/crafty-4!674
 2023-11-25 20:20:38 +00:00