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,237 Commits 12 Branches 45 Tags 104 MiB
44b5f2a809
Commit Graph

1072 Commits

Author SHA1 Message Date
amcmanu3
9704016c54 Update schema for str uuid 2024-03-13 17:47:07 -04:00
amcmanu3
a4da773d25 Remove print statements 2024-03-09 12:49:59 -05:00
amcmanu3
99ccaa925f Add backups to page 2024-03-08 23:23:36 -05:00
Zedifus
e0bb2eaaa0 Merge branch 'dev' into refactor/server_ids 2024-03-03 01:32:44 +00:00
Zedifus
f98dbb9332 Merge branch 'dev' into bugfix/password-encode 2024-03-02 23:16:40 +00:00
Silversthorn
303de39226 Merge branch 'dev' into refactor/server_ids 2024-02-21 23:00:21 +01: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
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
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
amcmanu3
fcb8b02907 Black codebase 2024-02-19 21:14:28 -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
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
2eb0eb59ef Merge branch 'dev' into refactor/server_ids 2024-02-03 21:12:39 +01:00
Zedifus
c49258d573 Merge branch 'dev' into tweak/anti-lockout 2024-02-02 22:07:30 +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
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
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
computergeek125
a26159f510 Added timeout to http calls, switched get to head 2024-01-31 01:33:39 -06:00
Silversthorn
56d37989e5 Merge branch 'dev' into refactor/server_ids 2024-01-30 21:19:07 +01: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
amcmanu3
02fbc5056d Redirect 404 on non-existant page 2024-01-28 17:15:20 -05:00
amcmanu3
ec5e291a98 Fix bug where del fail would give no feedback 2024-01-28 16:21:27 -05:00
amcmanu3
e399d57f47 Fix no server id in audit log 2024-01-28 16:20:08 -05: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
6e776d6383 Allow http to be disabled by config.json 2024-01-28 12:15:00 -05:00
amcmanu3
9fed45d147 Only allow access to panel config 2024-01-26 15:29:12 -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
3d4153f941 Add lockout user for forgot password 
Hide lockout user from users list
 2024-01-16 15:36:14 -05:00
Andrew
589a11f43c Allow omission of player stats from total 2024-01-13 16:43:16 -05:00
Zedifus
a564fac8cd Merge branch 'dev' into refactor/server_ids 2023-12-13 02:52:02 +00:00
Zedifus
53b12e245f Merge branch 'dev' into sec/admin-creation 2023-12-07 15:09:11 +00:00
Zedifus
342a4f6599 Merge branch 'dev' into tweak/backup-delete 2023-12-07 13:45:15 +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
amcmanu3
42e4bb7e3c Give better feedback when backup delete fails 2023-12-04 11:01:01 -05:00
amcmanu3
fb41bc2443 Prevent stack for general user on boot 2023-11-30 01:05:00 -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
Zedifus
06c18169f1 Merge branch 'dev' into sec/admin-creation 2023-11-25 20:59:26 +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
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
JonathanAlKass
62b095c38f removed ".decoder" from orjson in line 113 2023-11-21 06:30:45 +00:00
amcmanu3
63d84ed1bb Remove clean from password input 2023-11-13 17:23:15 -05: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
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
ecb40ee2ec Retain tab when navigating back to server_details 2023-11-05 11:09:57 -05:00
amcmanu3
28b3a4f8f3 Add loading screen while servers init 2023-11-03 16:41:23 -04:00
Silversthorn
aa7f47a4f4 Reworking id to use uuid 2023-11-01 18:44:56 +01: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
Andrew
9710d64072 Fix logical issue with get files perms check 2023-10-20 15:41:39 -05:00
amcmanu3
44c2aaada3 Remove external references from front end deps 
use secure transfer for jsonschema reference
 2023-10-18 14:55:16 -04:00
Zedifus
ec5236c250 Add https to adaptive card 
python:S5332
 2023-10-18 19:10:53 +01:00
amcmanu3
6bc45b86e5 Merge branch 'dev' into tweak/user-edit 2023-10-08 22:44:53 -04:00
amcmanu3
cd04b87705 Appease the linter 2023-10-08 22:39:05 -04:00
amcmanu3
2d32e3ad2a Fix user edits | retain crafty perms 
Move password/username edit to bootbox
 2023-10-08 22:13:55 -04:00
Iain Powrie
99f17c1532 Merge branch 'feature/openmetrics-implementation' into 'dev' 
Implementation of OpenMetrics

See merge request crafty-controller/crafty-4!624
 2023-10-08 22:11:27 +00:00
Silversthorn
bcbafe2278 Fixed the last one ? 2023-10-08 22:19:36 +02:00
Silversthorn
814aaeb1d2 Appease the linter 2023-10-08 22:02:13 +02:00
Zedifus
9ddd21da82 Merge branch 'dev' into bugfix/server-upload 2023-10-08 19:07:51 +01:00
amcmanu3
0296b09547 Move Crafty server upload to /import/upload 2023-10-08 10:54:28 -04:00
Silversthorn
5947d4ebbf Merge branch 'dev' into feature/openmetrics-implementation 2023-10-08 00:06:34 +02:00
Silversthorn
72a5f1661c Resolve Conflicts from Merge branch 'dev' into feature/openmetrics-implementation 2023-10-07 23:55:58 +02:00
Silversthorn
f49475c15a Removing unused imports 2023-10-07 23:52:06 +02:00
Silversthorn
49914c7f14 Improve OpenMetrics Registries Work 2023-10-07 23:50:56 +02:00
amcmanu3
4eb15db30f Use controller on update user call 2023-10-07 15:21:33 -04:00
amcmanu3
529b3a159c Appease the linter 2023-10-07 13:55:36 -04:00
amcmanu3
f42f4cf2b6 Bump multiple dep versions 
Refactor zoneinfonotfounderror
 2023-10-07 11:59:46 -04:00
Zedifus
7738103691 Add discord embed designer to payload construct docstring 2023-10-06 19:25:30 +01:00
Zedifus
d10de65c5a Add missing bot_name params in webhook docstrings 2023-10-06 19:20:53 +01:00
Zedifus
baf9b5baa4 Add teams adaptive card webhook provider 2023-10-06 00:22:34 +01:00
Zedifus
74386ad960 Add slack webhook provider 2023-10-05 23:12:38 +01:00
Andrew
19d72e5766 Refactor test webhooks with data 2023-09-28 19:26:21 -04:00
Andrew
a62252ed15 Allow custom bot naming 2023-09-28 19:15:01 -04:00
Andrew
6a81a5b337 Add accent color option 2023-09-28 19:07:03 -04:00
Andrew
c410650ae2 Add kill server watcher option 2023-09-28 17:47:36 -04:00
Andrew
c1b5dbc090 Add translations (english) 2023-09-28 17:47:03 -04:00
Andrew
89ffd40fd1 Merge branch 'feature/discord-webhooks' of gitlab.com:crafty-controller/crafty-4 into feature/discord-webhooks 2023-09-28 17:19:39 -04:00
Andrew
1b20520ac5 Add support for jar_update, send_command 2023-09-28 17:19:37 -04:00
Andrew
bd1b67e83b Make webhook edit page data method calls 2023-09-28 17:17:49 -04:00
Andrew
f742a5026c Refactor naming to match method calls 2023-09-28 17:17:27 -04:00
Zedifus
60e377a2e1 Refine Mattermost embed formatting 2023-09-28 21:30:48 +01:00
Andrew
9a88563916 Swap server ID for name in send. 2023-09-28 15:54:56 -04:00
Andrew
13214e9e86 Fix authentication issues on webhook get/post 2023-09-28 14:57:18 -04:00
Zedifus
409d7618dd Refactor Webhooks to WebhookFactory 
To save having a massive class lets go modular
 2023-09-28 19:17:47 +01:00
Zedifus
1ea0d692d0 Add mattermost webhook dispatcher 
Refactor common variables abit
 2023-09-28 04:00:49 +01:00
Zedifus
2bb5fa4fa2 Refine discord webhook post 
To better feedback dispatch outcome
 2023-09-28 02:48:22 +01:00
Zedifus
a387c12769 Rework discord webhook dispatcher 2023-09-28 02:08:11 +01:00
Andrew
628c234400 Refactor management classname 2023-09-27 17:35:44 -04:00
Zedifus
f9218ae157 Merge branch 'dev' into feature/discord-webhooks 2023-09-27 21:57:13 +01:00
Andrew
6af4f7b196 Remove print statement 2023-09-27 16:13:02 -04:00
Andrew
6c396fdf11 Fix backup restore 2023-09-26 21:08:11 -04:00
Zedifus
65bea2a11a Merge branch 'dev' into feature/discord-webhooks 2023-09-21 23:42:04 +01:00
Andrew
6c1508f061 Remove extra handler 2023-09-19 18:35:41 -04:00
Silversthorn
1bf8f3bf44 Merge branch 'dev' into bugfix/issue_255_status_page_update 2023-09-19 22:08:49 +02:00
Silversthorn
e9439ca154 Changing history units to hours 2023-09-19 21:46:31 +02:00
Zedifus
c0f07747a5 Merge branch 'dev' into tweak/refresh-handler 2023-09-19 19:24:55 +01:00
Andrew
8c2cfacb4e Use Jar naming schema for refresh 2023-09-08 20:27:47 -04:00
Silversthorn
99ef2db016 Adding host stats to the API 2023-09-06 23:28:46 +02:00
Andrew
096de18c2c Merge branch 'dev' into feature/discord-webhooks 2023-09-05 20:39:20 -04:00
Silversthorn
083e7b2f3f Fixing Little Rename Issue 2023-09-05 23:16:53 +02:00
Silversthorn
618094aa3e Removing useless BaseWebSocketHandler 2023-09-05 23:08:40 +02:00
Silversthorn
a0b069c9ef Reverting Public/Auth websocket 2023-09-05 23:00:52 +02:00
Silversthorn
c7ea7fbc6b Appease Black 2023-09-05 20:37:52 +02:00
Silversthorn
02b7cb8205 appease linter 2023-09-05 20:27:02 +02:00
Silversthorn
2d77c456ca Merge branch 'dev' into bugfix/issue_255_status_page_update 2023-09-05 20:05:12 +02:00
Wout Bouckaert
23ff88e013
🖤 Format 2023-09-04 21:59:24 -06:00
Wout Bouckaert
751beaa7eb
Replace all instances of bleach with nh3. 
Using latest version of nh3.
 2023-09-04 20:44:44 -06:00
amcmanu3
2c14a3fd2c Appease the linter 2023-09-04 21:39:40 -04:00
amcmanu3
514bf8453f Appease sonar 2023-09-04 21:21:59 -04:00
amcmanu3
3c5560d3e2 Merge branch 'dev' into feature/arcadia-notifications 2023-09-04 20:38:33 -04:00
amcmanu3
4051d98f8f Appease the linter 2023-09-04 20:28:55 -04:00
amcmanu3
84a24687d0 Appease the linter 2023-09-04 19:38:20 -04:00
amcmanu3
9d26a8ff8d Make sonar changes 2023-09-04 19:22:11 -04:00
amcmanu3
3cb18f2da4 Make if more comprehensive 2023-09-04 18:44:17 -04:00
amcmanu3
24f9b64d59 Add default photo variable to appease sonar 2023-09-04 18:42:29 -04:00
amcmanu3
73c4adbdbf Appease the linter 2023-09-04 18:24:10 -04:00
amcmanu3
e716198af4 Appease the linter 2023-09-04 18:19:29 -04:00
amcmanu3
6574a557ff Remove ajax handler references 2023-09-04 14:12:27 -04:00