Commit Graph

2700 Commits

Author SHA1 Message Date
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
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
amcmanu3
2fd66420c4 Add terminal message 2023-11-13 17:23:02 -05:00
amcmanu3
de39b041cb Fix comment 2023-11-13 16:03:53 -05:00
amcmanu3
623d6f5855 Use string library instead of monolithic arrays
up max length to 25
2023-11-13 16:02:50 -05:00
amcmanu3
91e62c647e Create text file in config folder with init creds 2023-11-13 14:14:13 -05:00
Wout Bouckaert
53b69fe0f6
Remove trailing space for pardon player command. 2023-11-11 12:21:59 -07:00
Silversthorn
586b2038b6 Fixing warnings 2023-11-10 23:16:04 +01:00
amcmanu3
98efec1417 Remove API v1 2023-11-05 15:48:43 -05:00
amcmanu3
7e18cc8d1b Schedule json dump to logfile every 5 minutes 2023-11-05 14:17:50 -05:00
amcmanu3
ca0546a5f4 Add auth log for sessions 2023-11-05 13:46:21 -05:00
amcmanu3
bfbb130db9 Add logs to API 2023-11-05 13:33:30 -05:00
amcmanu3
e9105ffbe4 Log authentication attempts 2023-11-05 13:26:27 -05:00
amcmanu3
5546118517 Remove password max length 2023-11-05 13:25:39 -05:00
amcmanu3
a5f4a68c49 Add badge to server detail pages 2023-11-05 12:06:57 -05:00
amcmanu3
ecb40ee2ec Retain tab when navigating back to server_details 2023-11-05 11:09:57 -05:00
amcmanu3
4152e2be69 Only show server inits to admins 2023-11-03 16:55:41 -04:00
amcmanu3
28b3a4f8f3 Add loading screen while servers init 2023-11-03 16:41:23 -04:00
Tinyblargon
c08795114e Recreate icons from crafty-logo-square.svg 2023-11-02 13:07:20 +00:00
Tinyblargon
99d5871827 Create svg icon from logo_long.svg 2023-11-02 13:03:36 +00:00
Silversthorn
aa7f47a4f4 Reworking id to use uuid 2023-11-01 18:44:56 +01:00
Andrew
d51e7e3c7d Fix webhook "custom" option appearing 2023-11-01 10:34:19 -04:00
Zedifus
ec4bcda31e Prepare 4.2.2 release base 2023-11-01 02:52:42 +00:00
Zedifus
9c0db7af3f Merge branch 'dev' into bugfix/websocket-warning 2023-11-01 02:20:23 +00:00
Zedifus
ee067af0f4 Merge branch 'dev' into bugfix/user-delete 2023-11-01 01:04:22 +00:00
amcmanu3
85225cbdce Fix duplicate function naming on dashboard 2023-10-31 13:26:28 -04:00
amcmanu3
bdb3e94f41 Fix userId reference const declaration 2023-10-30 12:13:14 -04:00
amcmanu3
645542b459 Move from 418 (i am a teapot) to 424 missing dep 2023-10-29 18:49:31 -04:00
amcmanu3
76e8b01335 Fix notifications not showing up/being reset 2023-10-29 18:37:30 -04:00
Zedifus
170750466c Remove Custom from WebhookFactory Registry
Wven when commented out, it's still present in front end selection
2023-10-29 13:45:03 +00:00
Iain Powrie
1d5965c1f5 Fix 'Sch'edule key naming in es_ES 2023-10-23 23:39:17 +00:00
Zedifus
d9dc16e1ec Update es_ES for !656 2023-10-23 23:21:21 +01:00
Iain Powrie
759191283d Merge branch 'enhancement/improve_webhook_page' into 'dev'
Improving Toggle buttons and Webhook page

See merge request crafty-controller/crafty-4!656
2023-10-23 20:43:41 +00:00
Zedifus
27ef42e9c4 Fix 'Sch'edule key typo in de_DE 2023-10-23 21:13:05 +01:00
Zedifus
a7556bd537 Add minor wording correction for de_DE !656 2023-10-23 20:28:38 +01:00
Iain Powrie
44f3145324 Merge branch 'lang/update_es_ES' into 'dev'
Update es_ES translation

See merge request crafty-controller/crafty-4!655
2023-10-23 19:25:21 +00:00