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
4,206 Commits 12 Branches 45 Tags 104 MiB
d9b9f00e9a
Commit Graph

2834 Commits

Author SHA1 Message Date
Zedifus
0fab5cd0f3 Refactor for temporary hardcoded types, use new health check response. 
api.serverjars.com not providing fetchTypes route currently,
Will revert when available.
NOTE: New api does not incl Spigot / Bukkit. Announce this.
 2024-04-05 20:01:37 +01:00
Zedifus
0c1b81faca Merge branch 'dev' into tweak/error-return 2024-04-03 00:56:50 +01:00
Zedifus
a8503748e2 Merge branch 'lang/italian-updates' of gitlab.com:crafty-controller/crafty-4 into lang/italian-updates 2024-04-03 00:30:48 +01:00
Iain Powrie
286151a01b Merge branch 'lang/czech-updates' into 'lang/italian-updates' 
update czech language

See merge request crafty-controller/crafty-4!742
 2024-04-02 23:30:42 +00:00
Zedifus
34c30f7552 Merge branch 'dev' into lang/italian-updates 2024-04-03 00:25:41 +01:00
Iain Powrie
221afabe78 Merge branch 'tweak/remove-version-disclosure' into 'dev' 
tweak/remove version disclosure

See merge request crafty-controller/crafty-4!737
 2024-04-02 23:13:51 +00:00
amcmanu3
39cfd40fad Add link to go back to dashboard on error page 2024-04-01 19:09:26 -04:00
Analicia Abernathy
50ccac8ea5 update czech language 2024-04-01 16:58:37 -05:00
amcmanu3
432421f362 Fix server clones following uuid migration 2024-04-01 17:02:27 -04:00
Analicia Abernathy
95490d5067 Updating Italian translation 2024-03-31 13:25:17 -05:00
amcmanu3
089b49c85e Disable crafty perms user does not have access to 2024-03-25 13:04:09 -04:00
amcmanu3
c13ac6a53c Merge branch 'dev' into refactor/api-key-su 2024-03-25 12:36:43 -04:00
Dylan Oonk
4a134278ae remove version disclosure from login 2024-03-24 22:49:47 +00:00
amcmanu3
3639ab9260 Catch more specific exception 2024-03-24 17:56:10 -04:00
amcmanu3
25b64e353c Fix backup restores after uuid server IDs 2024-03-24 17:55:58 -04:00
Silversthorn
3edfd4320d Replacing server_id=0 to server_id=None for AuditLog 2024-03-24 20:39:10 +01:00
Silversthorn
a87daa6ef3 Format with Black for lint apeasing 2024-03-23 14:32:39 +01:00
Silversthorn
7a7f237187 appease lint 2024-03-23 14:30:48 +01:00
Silversthorn
9aad5e3d8f trying something to works form differents update version 2024-03-23 14:20:31 +01:00
Silversthorn
2bb8e185de Checking if the column is already deleted 2024-03-23 14:13:45 +01:00
Silversthorn
f71aaeb870 Adding back the Servers Model 2024-03-23 13:47:57 +01:00
Silversthorn
d30b335637 renaming the file to run part 1 before part 2 2024-03-23 13:32:54 +01:00
Silversthorn
8ff83fa045 appease black lint 2024-03-23 13:14:47 +01:00
Silversthorn
3a4037a332 trying to add rollback methods 2024-03-23 12:57:41 +01:00
Silversthorn
f0086c70f7 importing class instead of copy pasting it 2024-03-23 12:37:46 +01:00
Silversthorn
64a1defb95 Removing logging and console to prevent unnecessary messages 2024-03-23 12:29:16 +01:00
Silversthorn
5e4dbb1902 Disabling code if already updated to prevent unnecessary errors messages 2024-03-23 12:28:22 +01:00
Silversthorn
8f8feef6de Solution is disabling update if already done 2024-03-23 12:11:43 +01:00
Silversthorn
c00cb1a61d Splitting migration in 2 files to remove migrator.run from it 2024-03-23 11:30:24 +01:00
Silversthorn
d39f93bfa5 trying loading only the diff migrations at constructor 2024-03-23 11:25:05 +01:00
amcmanu3
912785b280 Remove http references from codebase 2024-03-21 18:10:39 -04:00
Zedifus
9dffc25cc8 Prepare 4.3.2 release base 2024-03-19 00:08:55 +00:00
Zedifus
1a58ccd45a Merge branch 'dev' into remove/http-handler 2024-03-18 23:35:50 +00:00
amcmanu3
0a572fba92 Refactor API keys "super user" to "full access" 2024-03-17 12:50:11 -04:00
amcmanu3
6eea6a15d7 Remove http port from config 2024-03-15 14:49:31 -04:00
amcmanu3
c9a46a1f9b Remove http handler from codebase 2024-03-15 14:47:30 -04:00
amcmanu3
9704016c54 Update schema for str uuid 2024-03-13 17:47:07 -04:00
Zedifus
dbe5581e5a Appease Black 2024-03-10 22:52:23 +00:00
Silversthorn
36de32e5b1 Trying to appease lint one more time 2024-03-10 13:15:17 +00:00
Silversthorn
ae7d0991e4 Fixint lint issue 2024-03-10 12:59:04 +00:00
Silversthorn
1e2ec6b643 Removing the up_one in the constructor to prevent running all migration each time we got a new one. It's handled by migration.up() function. This function was not creating fake migrations. 2024-03-10 12:49:35 +00:00
Silversthorn
986576f243 Adding migration to fix the rework servers uuid issue 2024-03-10 12:43:52 +00:00
amcmanu3
a4da773d25 Remove print statements 2024-03-09 12:49:59 -05:00
amcmanu3
1381cf77ef Fix most translations 2024-03-09 12:49:51 -05:00
amcmanu3
99ccaa925f Add backups to page 2024-03-08 23:23:36 -05:00
amcmanu3
eec9432118 Update migration 
Add backup return function
 2024-03-08 23:22:54 -05:00
amcmanu3
1a8d351fbd Remove print statements 2024-03-08 22:45:08 -05:00
amcmanu3
548a439f14 Initial commit for backup migration. 
Kind of broken :/
 2024-03-08 22:06:33 -05:00
amcmanu3
5c8cca6fda Merge branch 'dev' into refactor/backups 2024-03-08 21:56:03 -05:00
Zedifus
128be0a352 Prepare 4.3.1 release base 2024-03-08 21:32:25 +00:00
amcmanu3
0c517868b4 Merge branch 'dev' into refactor/backups 2024-03-08 16:23:45 -05:00
Iain Powrie
ff9654266c Merge branch 'bugfix/backup-webhook' into 'dev' 
Alert webhook AFTER backup has finished

See merge request crafty-controller/crafty-4!727
 2024-03-08 00:33:57 +00:00
Iain Powrie
d9311455eb Merge branch 'bugfix/fix-def-pass-len-check' into 'dev' 
Fix default password min length check, crashing crafty on fresh install

See merge request crafty-controller/crafty-4!725
 2024-03-07 23:49:26 +00:00
amcmanu3
0cd3acca13 Alert webhook AFTER backup has finished 2024-03-07 11:06:39 -05:00
Silversthorn
bdefa69e32 Merge branch 'refactor/server_ids' of gitlab.com:crafty-controller/crafty-4 into refactor/server_ids 2024-03-03 10:00:25 +01:00
Silversthorn
2c289133f5 Fixing logging errors to info to display properly logs 
Remove return true/false values as the function shouldn't return values
 2024-03-03 10:00:18 +01:00
Zedifus
c20c6b35b8 Re-tag release to 4.3.0 
BREAKING: Contains db changes w/ no avail rollback
 2024-03-03 01:36:53 +00:00
Zedifus
e0bb2eaaa0 Merge branch 'dev' into refactor/server_ids 2024-03-03 01:32:44 +00:00
Zedifus
8d08084ac2 Change target of min pass length check to 'int' of pass length 
Fixes default password min length check, crashing crafty on fresh install
 2024-03-03 01:10:48 +00:00
Zedifus
3d5a370040 Merge branch 'dev' into bugfix/bedrock-download 2024-03-02 23:59:48 +00:00
Zedifus
03a5871c79 Merge branch 'dev' into bugfix/select-root 2024-03-02 23:44:03 +00:00
Zedifus
f98dbb9332 Merge branch 'dev' into bugfix/password-encode 2024-03-02 23:16:40 +00:00
Zedifus
49fce1b5c4 Merge branch 'dev' into bugfix/fix-forge-install 2024-03-02 22:51:44 +00:00
amcmanu3
9f524ff113 Too many www's 2024-03-02 17:00:52 -05:00
amcmanu3
6e28da4195 Fix bedrock url 2024-03-02 16:53:17 -05:00
Analicia Abernathy
440dee7ef5 really fixed polish translation 2024-02-23 09:01:40 -06:00
Analicia Abernathy
1ead20b9b5 updated Ukranian translation 2024-02-23 07:45:23 -06:00
Analicia Abernathy
5fc24f2253 updated thai translation 2024-02-23 07:45:00 -06:00
Analicia Abernathy
5a019c0f27 updated dutch translation 2024-02-23 07:44:41 -06:00
Analicia Abernathy
85a6fca65d updated polish translation 2024-02-23 07:44:10 -06:00
amcmanu3
fdf3221754 Fix bug where unix installs could not have a space in file name 2024-02-22 20:21:54 +00:00
amcmanu3
69dc7dfedb Update Hebrew translation 2024-02-22 13:06:49 -05:00
amcmanu3
f8f428a8d9 Update french and chinese translations 2024-02-21 20:19:47 -05:00
Silversthorn
303de39226 Merge branch 'dev' into refactor/server_ids 2024-02-21 23:00:21 +01:00
amcmanu3
fb22a753c1 Update de_DE, lol_EN, lv_LV, and tr_TR translations 2024-02-21 15:37:03 -05:00
amcmanu3
4df7858da6 Fix code quality issues 2024-02-21 00:04:07 -05:00
amcmanu3
900ec15e4c Fix bug where you cannot get to config with unloaded server 2024-02-20 22:30:32 -05:00
amcmanu3
62b55792e5 Update spanish translation 
Sort english translation
 2024-02-20 22:28:29 -05:00
amcmanu3
f4f4f9e0b6 Remove extraneous error messaging 2024-02-20 18:50:32 -05:00
amcmanu3
f6242d6507 Remove username regex 2024-02-20 18:47:00 -05:00
amcmanu3
647e3b1111 Remove encoding 2024-02-20 17:32:34 -05:00
Zedifus
9de08973b6 Fix minor lint issues (formatting) 2024-02-20 03:26:15 +00:00
Zedifus
5b2890ce9a Merge branch 'dev' into bugfix/clone-server 2024-02-20 03:08:33 +00:00
Zedifus
5e85707973 Merge branch 'dev' into bugfix/default-json 2024-02-20 02:58:09 +00:00
amcmanu3
db8ef6d382 Fix modal glitch 2024-02-19 21:45:11 -05:00
amcmanu3
975dd2f967 Allow super users to clone to their hearts desire 
Add same roles for cloned server
 2024-02-19 21:45:05 -05:00
Zedifus
25a46a250b Make paper url fetching more robust 
Resolves traceback:
build = self.get_paper_build(server, version).get("build")
AttributeError: 'NoneType' object has no attribute 'get'
 2024-02-20 02:27:54 +00:00
amcmanu3
fcb8b02907 Black codebase 2024-02-19 21:14:28 -05:00
amcmanu3
842e576b5c Refactor minimum password length 2024-02-19 21:14:15 -05:00
amcmanu3
bfa0c72412 Appease black 2024-02-19 20:52:35 -05:00
amcmanu3
d5c009960b Clean up forgot to purge 2024-02-19 20:46:19 -05:00
amcmanu3
5712d56e0e Needed to plunge some errors 2024-02-19 20:43:59 -05:00
amcmanu3
dfe9aeb212 Remove the stinky 2024-02-19 20:40:07 -05:00
amcmanu3
c2c10d4609 Separate errors for unicode/binascii 2024-02-19 20:39:24 -05:00
amcmanu3
1a7c76dca7 Add unicode except 2024-02-19 20:35:36 -05:00
amcmanu3
1cf773bd40 Update error message 2024-02-19 20:32:25 -05:00
Zedifus
aec58fdca3 Refactor Crafty remote file downloads 2024-02-20 01:19:39 +00:00
amcmanu3
aac35b14d9 Change login payload 2024-02-19 20:18:47 -05:00
amcmanu3
d168a7f8f0 Remove max password length 2024-02-19 19:19:30 -05:00
Silversthorn
c118ba7337 Merge branch 'dev' into refactor/server_ids 2024-02-20 00:32:38 +01:00
amcmanu3
e053f4a750 Check server creation for clone server call 2024-02-19 18:07:17 -05:00
Zedifus
0422a2ecdf Fix assorted black issues currently in dev 2024-02-19 20:02:09 +00:00
amcmanu3
166e3c5088 Black codebase 2024-02-19 12:03:02 -05:00
Andrew
f6bb6eafcd Add default path password check 
Change decode to utf-8
 2024-02-17 23:08:23 -05:00
Andrew
d673908ce4 Encode password base64 to server 2024-02-17 22:33:50 -05:00
Silversthorn
3529c9f7fe Fixing loog messages 2024-02-16 20:27:30 +01:00
Silversthorn
b30d7b627c removing uuid from server model 2024-02-16 20:23:23 +01:00
Silversthorn
12627cec8e Fixed the why it was not working 2024-02-16 20:21:38 +01:00
Silversthorn
90e0777b9b try to revert back to old migrate history if failed 2024-02-16 20:04:12 +01:00
Silversthorn
875c9058b0 there were still use -_- 2024-02-16 19:46:22 +01:00
Silversthorn
ccec2a3400 rename migration file to have a more recent one 2024-02-16 19:32:23 +01:00
Silversthorn
ad6e53a5d1 Adding all migration steps to a migration.py file 2024-02-16 19:29:14 +01:00
Andrew
879aa8c54c Make sure default.json is read from correct loc 2024-02-15 07:15:53 -05:00
amcmanu3
e59b624025 Move backup path from servers to backup 
Add uuid field to backups
 2024-02-08 20:25:32 -05:00
Silversthorn
a7f7a50ae0 really fixing the bug 2024-02-09 00:22:42 +01:00
Silversthorn
1b05562a9e Fix Forge Install bug for 1.20, 1.20.1 and 1.20.2 2024-02-09 00:10:26 +01:00
Silversthorn
2eb0eb59ef Merge branch 'dev' into refactor/server_ids 2024-02-03 21:12:39 +01:00
Zedifus
8e199dcd67 Prepare 4.2.4 release base 2024-02-02 23:35:09 +00:00
Zedifus
50e65f6531 Fix hardcoded banner issue from !703 2024-02-02 22:41:07 +00:00
Zedifus
c49258d573 Merge branch 'dev' into tweak/anti-lockout 2024-02-02 22:07:30 +00:00
Zedifus
ed3b43705c Merge branch 'dev' into bugfix/fixing-motd-issue 2024-02-02 21:55:38 +00:00
Zedifus
1fe749d617 Merge branch 'dev' into enhancement/improve-minor-displays 2024-02-02 21:13:59 +00:00
Zedifus
559e5f44ee Merge branch 'dev' into tweak/http-timeout 2024-02-02 20:41:59 +00:00
Zedifus
a3236d72fd Correct nh3 no-member exemptions affected by black formatting 2024-02-02 20:36:04 +00:00
Zedifus
ef691eda5c Add exclude for E1101: Module 'nh3' has no 'clean' member 
--False Positive--
Issue tracking (fix planned for pylint 4.0.0)
https://github.com/messense/nh3/issues/18
https://github.com/pylint-dev/pylint/issues/8756
 2024-02-02 19:51:17 +00:00
Silversthorn
0a3512a18e Merge branch 'dev' into refactor/server_ids 2024-02-02 20:50:08 +01:00
Silversthorn
23ba911686 Fixing same size text everywhere 2024-02-02 20:37:07 +01:00
Zedifus
dc13706a02 Merge branch 'dev' into tweak/unsupported-mc 2024-02-02 17:53:02 +00:00
Analicia A.
9a667b02a4 Updated for 4.2.3 2024-02-02 16:47:59 +00:00
Analicia Abernathy
7b598406be Added loadingMotd translation for 4.2.3 2024-02-01 18:17:34 -06:00
Andrew
5c37b0e0fd Add auth logging 2024-02-01 00:08:34 -05:00
Andrew
d53404285c Remove ability to move to create server 2024-01-31 23:06:37 -05:00
Andrew
ecee8b494c Raise exception for anti-lockout-username 2024-01-31 22:15:40 -05:00
Andrew
aec14a6713 Do not allow user to create anti-lockout-user 2024-01-31 22:01:04 -05:00
Andrew
68b0e611be Add new theme for lockout user 2024-01-31 22:00:45 -05:00
Analicia Abernathy
729f854a67 Added required translations for branch 2024-01-31 19:47:14 -06:00
Andrew
403ff47186 Merge branch 'dev' into tweak/http-timeout 2024-01-31 19:19:47 -05:00
Andrew
dc5490cdcb Merge branch 'dev' into feature/anti-lockout 2024-01-31 19:18:55 -05:00
Andrew
ccf67002cd Remove print statement 2024-01-31 19:17:13 -05:00
Silversthorn
d92d06e4b1 Fixing issue 322 2024-01-31 23:04:22 +01:00
computergeek125
a26159f510 Added timeout to http calls, switched get to head 2024-01-31 01:33:39 -06:00
amcmanu3
02de513f2f Merge branch 'dev' into tweak/unsupported-mc 2024-01-30 21:52:44 -05:00
Silversthorn
98bbf880d0 Fixing Fonts for th-TH 2024-01-30 22:58:19 +01:00
Silversthorn
856caf4a9a trying to improve display for th-TH lang 2024-01-30 22:44:00 +01:00
Silversthorn
1c0190d0ab Impriove display for wssErrors 2024-01-30 22:10:49 +01:00
Silversthorn
e48a3cc976 Improving Display for Buttons 2024-01-30 22:03:58 +01:00
Silversthorn
56d37989e5 Merge branch 'dev' into refactor/server_ids 2024-01-30 21:19:07 +01:00
Iain Powrie
522be7e4dc Retire Kornster in offline credits 2024-01-29 01:02:27 +00:00
Iain Powrie
7339181ce8 Retire Qube in offline credits 2024-01-29 00:24:53 +00:00
Zedifus
bc6da9ac87 Merge branch 'dev' into bugfix/audit-server-id 2024-01-28 23:47:30 +00:00
Zedifus
fffea68cba Merge branch 'dev' into bugfix/server-files-feedback 2024-01-28 23:28:36 +00:00
Iain Powrie
ad20d4bc95 Merge branch 'refactor/subpages' into 'dev' 
Refactor subpage perm checks

See merge request crafty-controller/crafty-4!695
 2024-01-28 23:26:55 +00:00
amcmanu3
fb32f64a13 Improve logic just in case minecraft 2.0 2024-01-28 18:22:41 -05:00
amcmanu3
06f59110fe Add warning to wizard for unsupported mc 2024-01-28 17:57:05 -05:00
amcmanu3
02fbc5056d Redirect 404 on non-existant page 2024-01-28 17:15:20 -05:00
Andrew
a112bc3e57 Set time to UTC for schedule 
remove prints
 2024-01-28 16:51:54 -05:00
amcmanu3
ec5e291a98 Fix bug where del fail would give no feedback 2024-01-28 16:21:27 -05:00
amcmanu3
00ff98c991 Fix server term command send 2024-01-28 16:20:58 -05:00
amcmanu3
e399d57f47 Fix no server id in audit log 2024-01-28 16:20:08 -05:00
Analicia A.
c591726782 Update translation for 4.2.3 2024-01-28 18:45:56 +00:00
amcmanu3
5422915335 Delete user on logout 2024-01-28 13:44:44 -05:00
amcmanu3
854a9643e5 Fix bug where panel_config would always be loaded 2024-01-28 12:58:18 -05:00
amcmanu3
0fa7b592cc Burn retinas - add warning banner 
Make warning system more robust
 2024-01-28 12:58:02 -05:00
amcmanu3
6e776d6383 Allow http to be disabled by config.json 2024-01-28 12:15:00 -05:00
Analicia Abernathy
1da483a289 Update translation for 4.2.3 2024-01-26 17:19:58 -06:00
amcmanu3
bb18400b90 Fix schedule firing too early 2024-01-26 15:29:25 -05:00
amcmanu3
9fed45d147 Only allow access to panel config 2024-01-26 15:29:12 -05:00
Analicia Abernathy
f28a211b66 Update translatiosn for 4.2.3 2024-01-26 13:19:07 -06:00
Analicia Abernathy
b3316a7d8c update translations for 4.2.3 2024-01-26 12:53:35 -06:00
amcmanu3
fc93b6f6a1 Add Thai, Turkish, Ukranian languages 2024-01-26 11:50:34 -05:00
amcmanu3
665997c34c Print to terminal not file 2024-01-22 19:51:57 -05:00
amcmanu3
f800933799 Fix typo 2024-01-16 23:09:04 -05:00
amcmanu3
ba8737f007 Refactor subpage perm checks 
Fix bug where subpages people don't still have access to are retained
 2024-01-16 19:21:00 -05:00
amcmanu3
d82ee0fa31 start schedule 2024-01-16 18:01:22 -05:00
amcmanu3
3d4153f941 Add lockout user for forgot password 
Hide lockout user from users list
 2024-01-16 15:36:14 -05:00
Andrew
c57d193a59 Merge branch 'bugfix/unicode-logs' into bugfix/unicode-terminal 2024-01-16 14:58:42 -05:00
Zedifus
94a63767f7 Merge branch 'dev' into bugfix/unicode-terminal 2024-01-16 19:46:31 +00:00
Zedifus
52533c6dfc Merge branch 'dev' into tweak/player-scroll-bar 2024-01-16 19:36:42 +00:00
Zedifus
c72b209070 Merge branch 'dev' into feature/proxy-stats 2024-01-16 19:24:39 +00:00
Zedifus
a8fc90d0f9 Merge branch 'dev' into tweak/server-config-check 2024-01-16 19:13:13 +00:00
Zedifus
3c5288abfc Merge branch 'dev' into bugfix/server-id-stack 2024-01-16 19:00:42 +00:00
amcmanu3
0b520aae80 Fix misc sonarcube finding 2024-01-16 13:53:50 -05:00
amcmanu3
7d7ae02beb Add parameter to version call 2024-01-16 13:50:05 -05:00
Zedifus
01a7c2e238 Merge branch 'dev' into feature/paper-builds 2024-01-16 18:23:18 +00:00
Zedifus
12bb29ac2d Merge branch 'dev' into tweak/forge-fix 2024-01-16 18:02:57 +00:00
amcmanu3
1b047b1733 Remove scroll bars from player management 2024-01-13 18:27:25 -05:00
Andrew
589a11f43c Allow omission of player stats from total 2024-01-13 16:43:16 -05:00
amcmanu3
90806b613c Fix log file output on page 2024-01-12 18:33:21 -05:00
amcmanu3
78b2feab01 Remove update url for paper builds 2024-01-12 14:46:25 -05:00
amcmanu3
e3dee7dcd6 Fix indent on checkbox on server config 2024-01-12 13:43:04 -05:00
amcmanu3
96d5ce58d2 Get jars direct frrom paper 2024-01-12 11:23:35 -05:00
amcmanu3
5f2236563b Fix bug where invalid server Id leads to stack 2024-01-11 19:53:22 -05:00
amcmanu3
cd3b8d4d9c Fix update urls 2024-01-11 19:35:08 -05:00
amcmanu3
e274b0c677 Implement paper builds using mineacademy API 
Big shoutout to zed for fnding this
 2024-01-11 19:20:50 -05:00
amcmanu3
9d319b7460 Fix unicode chars in terminal w/ texitiowrapper 2024-01-11 16:11:08 -05:00
Silversthorn
dc09f47871 Fixing issues for forge installation for versions >= 1.20 2024-01-03 21:10:33 +01:00
Andrew
60ac3bf630 Check type in extra so we don't iterate thru str 2023-12-29 12:11:29 -05:00
Andrew
a67f53a4c9 Fix bukkit and downstream fork MOTD crash 2023-12-28 18:34:35 -05:00
Zedifus
a564fac8cd Merge branch 'dev' into refactor/server_ids 2023-12-13 02:52:02 +00:00
Zedifus
1d32afa09d Prepare 4.2.3 release base 2023-12-13 02:17:54 +00:00
Zedifus
f94c3720aa Merge branch 'dev' into maintenance/translations-12-11 2023-12-13 01:47:36 +00:00
amcmanu3
fb66e4fcda Update translations 2023-12-11 15:44:48 -05:00
amcmanu3
5fd3fbee26 Merge branch 'maintenance/translations-12-11' of https://gitlab.com/crafty-controller/crafty-4 into maintenance/translations-12-11 2023-12-11 15:28:39 -05:00
Andrew
69fcdfddf0 Add json sort script 2023-12-11 15:15:26 -05:00
Andrew
2cab7de6af Make watcher log debug 2023-12-07 18:03:31 -05:00
Andrew
d2b738f857 Add queue logging 2023-12-07 18:02:54 -05:00
Andrew
7037d857d7 Black codebase 2023-12-07 11:05:26 -05:00
Zedifus
e17af9dea5 Increase entropy of password 
With reduced symbols increasing length for better entropy
 2023-12-07 15:36:07 +00:00
Zedifus
1e68abac70 Reduce number of symbols to avoid issues 
Limit the symbols used in the character string to avoid potential
problems with certain characters.
 2023-12-07 15:32:18 +00:00
Zedifus
53b12e245f Merge branch 'dev' into sec/admin-creation 2023-12-07 15:09:11 +00:00
Zedifus
2d07dbbd9c Merge branch 'dev' into bugfix/backup-dir 2023-12-07 13:52:17 +00:00
Zedifus
342a4f6599 Merge branch 'dev' into tweak/backup-delete 2023-12-07 13:45:15 +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
Zedifus
1383accefd Merge branch 'dev' into bugfix/config-empty-mounts 2023-12-07 13:05:40 +00:00
Zedifus
ba187374d4 Merge branch 'dev' into bugfix/no-file-error 2023-12-07 12:55:20 +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
Zedifus
b2035eef60 Fix sonar findings 2023-12-07 11:29:18 +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
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
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
Zedifus
4b9c6cfd71 Fix sonar finding 
Use the opposite operator ("not in") instead.
Boolean checks should not be inverted python:S1940
 2023-11-28 02:22:25 +00:00
Zedifus
966d359a9a Remove unused imports from pass gen refactor 2023-11-26 21:45:48 +00:00
Andrew
e5cec247dc Remove class declaration in helpers 2023-11-26 14:48:36 -05:00
Zedifus
16f8df20ac Update lang pl_PL with minor fixes 
Thanks Terrariadlc
 2023-11-25 21:20:39 +00:00
Zedifus
06c18169f1 Merge branch 'dev' into sec/admin-creation 2023-11-25 20:59:26 +00:00
Zedifus
fb4adfb22e Fix black finding 2023-11-25 20:47:45 +00:00
Zedifus
7045118cd2 Refactor password generator to be OWASP compliant 2023-11-25 20:42:18 +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
Zedifus
27135d2c93 Merge branch 'dev' into bugfix/unban 2023-11-25 20:00:11 +00:00
Zedifus
f131ca62ff Merge branch 'dev' into refactor/remove-api-v1 2023-11-25 19:50:47 +00:00
Zedifus
911f373474 Merge branch 'dev' into critical/security 2023-11-25 19:29:46 +00:00
Zedifus
8f3dc4d6f2 Merge branch 'dev' into enhancement/server-details 2023-11-25 19:13:29 +00:00
Iain Powrie
05b9812e55 Merge branch 'tweak/homogenize-logo' into 'dev' 
Tweak/homogenize logo

See merge request crafty-controller/crafty-4!666
 2023-11-25 19:06:52 +00:00
JonathanAlKass
62b095c38f removed ".decoder" from orjson in line 113 2023-11-21 06:30:45 +00:00
amcmanu3
131337c7d0 Appease the linter 2023-11-13 18:16:08 -05:00
amcmanu3
63d84ed1bb Remove clean from password input 2023-11-13 17:23:15 -05:00