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,052 Commits 12 Branches 45 Tags 104 MiB
79adf29c62
Commit Graph

988 Commits

Author SHA1 Message Date
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
Andrew
5c37b0e0fd Add auth logging 2024-02-01 00:08:34 -05:00
Silversthorn
56d37989e5 Merge branch 'dev' into refactor/server_ids 2024-01-30 21:19:07 +01:00
amcmanu3
ec5e291a98 Fix bug where del fail would give no feedback 2024-01-28 16:21:27 -05:00
Zedifus
94a63767f7 Merge branch 'dev' into bugfix/unicode-terminal 2024-01-16 19:46:31 +00:00
Zedifus
c72b209070 Merge branch 'dev' into feature/proxy-stats 2024-01-16 19:24:39 +00:00
amcmanu3
0b520aae80 Fix misc sonarcube finding 2024-01-16 13:53:50 -05:00
Zedifus
01a7c2e238 Merge branch 'dev' into feature/paper-builds 2024-01-16 18:23:18 +00:00
Andrew
589a11f43c Allow omission of player stats from total 2024-01-13 16:43:16 -05:00
amcmanu3
78b2feab01 Remove update url for paper builds 2024-01-12 14:46:25 -05:00
amcmanu3
96d5ce58d2 Get jars direct frrom paper 2024-01-12 11:23:35 -05:00
amcmanu3
cd3b8d4d9c Fix update urls 2024-01-11 19:35:08 -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
Zedifus
a564fac8cd Merge branch 'dev' into refactor/server_ids 2023-12-13 02:52:02 +00: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
b2035eef60 Fix sonar findings 2023-12-07 11:29:18 +00:00
amcmanu3
621afb4eec Fix bug where servers are created without bu dir 2023-12-04 23:37:53 -05:00
amcmanu3
b60e6933dd Add broadcast to non-admin function 2023-11-30 12:12:16 -05:00
amcmanu3
9e98c97eb8 Merge branch 'dev' into enhancement/crafty-loading 2023-11-29 21:24:05 -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
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
amcmanu3
131337c7d0 Appease the linter 2023-11-13 18:16:08 -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
Silversthorn
586b2038b6 Fixing warnings 2023-11-10 23:16:04 +01:00
amcmanu3
7e18cc8d1b Schedule json dump to logfile every 5 minutes 2023-11-05 14:17:50 -05:00
amcmanu3
e9105ffbe4 Log authentication attempts 2023-11-05 13:26:27 -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
Silversthorn
aa7f47a4f4 Reworking id to use uuid 2023-11-01 18:44:56 +01:00
amcmanu3
76e8b01335 Fix notifications not showing up/being reset 2023-10-29 18:37:30 -04:00
amcmanu3
761936a308 Fix creation bug 2023-10-18 16:40:38 -04:00
amcmanu3
4f507f0cda Use more definied error 2023-10-18 16:25:28 -04:00
amcmanu3
f06d297ecd Fix task quick edit 2023-10-18 16:24:42 -04:00
amcmanu3
312ed5295b Fix quick disable button on schedules list 2023-10-18 16:03:43 -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
amcmanu3
89b0e1ed02 fix typo for upload dir 2023-10-08 10:57:59 -04: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
49914c7f14 Improve OpenMetrics Registries Work 2023-10-07 23:50:56 +02:00
amcmanu3
882f241181 Appease black 2023-10-07 13:13:35 -04:00
amcmanu3
42bdf2994d Move callback to unbound 2023-10-07 13:06:26 -04:00
amcmanu3
60ae98ef97 Merge branch 'dev' into maintenance/bump-dependencies 2023-10-07 12:02:46 -04:00
amcmanu3
f42f4cf2b6 Bump multiple dep versions 
Refactor zoneinfonotfounderror
 2023-10-07 11:59:46 -04:00
Zedifus
66e74b6c04 Merge branch 'dev' into bugfix/reaction-of-reaction 2023-10-07 16:09:32 +01:00
Zedifus
ecba6f1bf0 Merge branch 'dev' into tweak/logging 2023-10-07 15:42:15 +01:00
amcmanu3
7a410a2b0e Fix bug reaction schedule could be child of parent 2023-10-05 17:48:55 -04:00
amcmanu3
447e04cb8e Add log message on restart 2023-10-05 16:22:42 -04:00
amcmanu3
6d938cabc8 Set some stats logging to debug 
Add stop server logging
 2023-10-04 12:45:23 -04:00
amcmanu3
345bffbab6 Add logging statements to callbacks 2023-10-04 11:45:53 -04:00
Andrew
bfad335495 Comment callback 2023-09-28 20:03:39 -04:00
Andrew
197818c4ac Fix general exception 2023-09-28 20:00:48 -04:00
Andrew
e51b2bd0de Add bot_name to send call 2023-09-28 19:26:32 -04:00
Andrew
6a81a5b337 Add accent color option 2023-09-28 19:07:03 -04:00
Andrew
4bf77d2e7a Only fire when enabled 2023-09-28 17:47:19 -04:00
Andrew
5cdf114fd5 Add callbacks to method calls 2023-09-28 17:18:07 -04:00
Zedifus
f9218ae157 Merge branch 'dev' into feature/discord-webhooks 2023-09-27 21:57:13 +01:00
Andrew
6c396fdf11 Fix backup restore 2023-09-26 21:08:11 -04:00
Andrew
f74194f0e5 Fix backups status not showing up 2023-09-26 21:07:56 -04:00
Zedifus
65bea2a11a Merge branch 'dev' into feature/discord-webhooks 2023-09-21 23:42:04 +01:00
Silversthorn
e9439ca154 Changing history units to hours 2023-09-19 21:46:31 +02:00
Andrew
096de18c2c Merge branch 'dev' into feature/discord-webhooks 2023-09-05 20:39:20 -04: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
2d77c456ca Merge branch 'dev' into bugfix/issue_255_status_page_update 2023-09-05 20:05:12 +02:00
amcmanu3
3c5560d3e2 Merge branch 'dev' into feature/arcadia-notifications 2023-09-04 20:38:33 -04:00
Zedifus
e543389ead Merge branch 'dev' into refactor/remote-comms-patch-2 2023-09-05 01:13:50 +01:00
amcmanu3
e716198af4 Appease the linter 2023-09-04 18:19:29 -04:00
amcmanu3
4cd8e540f7 Revert "Poll notifications on an hourly schedule" 
This reverts commit 98720aa072.
 2023-09-04 17:46:22 -04:00
amcmanu3
98720aa072 Poll notifications on an hourly schedule 2023-09-04 17:30:47 -04:00
amcmanu3
adaaff3d23 Add master server dir to API v2 2023-09-04 12:34:39 -04:00
Andrew
92a9fffafc Make update notif point to release notes 2023-09-03 15:26:13 -04:00
Andrew
859a1737f3 Change link to json 2023-09-03 15:26:04 -04:00
amcmanu3
a983cc8868 Squash bugs in java imports/bedrock imports 2023-09-03 13:20:02 -04:00
Andrew
ff1ba23830 Add updates to notifs 2023-09-02 19:35:16 -04:00
Silversthorn
a63c2dcf00 Removing saving data realtime => from 5s to 30s 2023-09-02 22:19:17 +02:00
Silversthorn
af1fdb447a Merge branch 'dev' into bugfix/issue_255_status_page_update 2023-09-02 21:55:51 +02:00
Silversthorn
34fe9c1326 Using API Call for Status Page 2023-09-02 21:51:28 +02:00
Andrew
02df6de6d5 Remove prints. Remove test notif 2023-09-01 14:54:38 -04:00
Andrew
6c1e1b4737 Add Arcadia Notifications to Front end 2023-09-01 14:48:20 -04:00
amcmanu3
27f6c4c926 Add unzip/dir request handler to api v2 2023-08-31 21:35:30 -04:00
amcmanu3
18252fae0f Fix naming issues with import server 2023-08-27 14:55:10 -04:00
Silversthorn
58cdfe9ee5 Fixing Black issues 2023-08-27 14:10:20 +02:00