Commit Graph

2516 Commits

Author SHA1 Message Date
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
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
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
Zedifus
1ce9527029 Fix schedule translation spelling 2023-10-22 22:33:18 +01:00
Zedifus
e9fbce3f4e Add additional MR translations 2023-10-22 22:21:47 +01:00
Zedifus
4af37e8107 Add additional MR translations 2023-10-22 14:08:02 +01:00
Zedifus
2b5d2e73f6 Merge branch 'dev' into enhancement/improve_webhook_page 2023-10-22 13:58:46 +01:00
Silversthorn
6a2d1fa61a Improving Toggle buttons and Webhook page 2023-10-21 17:32:48 +02:00
Iain Powrie
37a79922ac Merge branch 'bugfix/get-files' into 'dev'
Fix logical issue with get files perms check

See merge request crafty-controller/crafty-4!654
2023-10-21 11:57:19 +00:00
Iain Powrie
d53b3fc0e2 Merge branch 'tweak/auto-notify' into 'dev'
Auto refresh annoucements every 30 minutes

See merge request crafty-controller/crafty-4!653
2023-10-21 11:45:13 +00:00
Zedifus
cab4754240 Correct accuracy of proc kill function land 2023-10-21 12:23:58 +01:00
Zedifus
9692a9d16b Add missing keys from es_ES 2023-10-21 12:22:44 +01:00
Zedifus
46e6d4b064 Enable es_ES file, remove incomplete suffix 2023-10-21 12:18:35 +01:00
Andrew
9710d64072 Fix logical issue with get files perms check 2023-10-20 15:41:39 -05:00
Andrew
9760ef6094 Fix console log 2023-10-20 15:38:48 -05:00
Andrew
2461c32641 Auto refresh annoucements every 30 minutes 2023-10-20 15:36:57 -05:00
amcmanu3
0dc7145517 Update zn_CH translations 2023-10-19 13:01:48 -04:00
Zedifus
c49159a0e5 Prepare 4.2.1 release base 2023-10-19 01:48:38 +01: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
amcmanu3
7542fb7f02 Merge branch 'sec/script-imports' of https://gitlab.com/crafty-controller/crafty-4 into sec/script-imports 2023-10-18 15:51:21 -04:00
amcmanu3
5f45d2d6a8 Remove internet references 2023-10-18 15:51:19 -04:00
Zedifus
a6783b407e Merge branch 'dev' into sec/script-imports 2023-10-18 20:38:16 +01:00
Zedifus
ca8998e932 Merge branch 'dev' into bugfix/info-icon 2023-10-18 20:26:28 +01:00
Iain Powrie
2065a01c14 Merge branch 'maintenance/update-translations' into 'dev'
Update Translations :)

See merge request crafty-controller/crafty-4!645
2023-10-18 19:21:54 +00:00
Zedifus
4481208bc0 Hide more incompletes 2023-10-18 20:06:36 +01: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
de8261b4ec Update id_ID lang 2023-10-18 19:43:46 +01:00
amcmanu3
afc6662825 Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-4 into dev 2023-10-18 14:13:05 -04:00
amcmanu3
bb47623b9b Comply with integrity check 2023-10-18 14:13:03 -04:00
Zedifus
80ded735d3 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2023-10-18 19:10:59 +01:00
Zedifus
ec5236c250 Add https to adaptive card
python:S5332
2023-10-18 19:10:53 +01:00
amcmanu3
ffb793a1b9 Fix sonar table description bug 2023-10-18 14:09:25 -04:00
amcmanu3
785334821a Fix info icon on server config page 2023-10-18 13:51:38 -04:00
Zedifus
e4a8b0d97b Mark pt_BR incomplete as translator 'Morse' missing 2023-10-18 14:17:40 +01:00
Zedifus
a7ece2344c Merge branch 'maintenance/update-translations' of gitlab.com:crafty-controller/crafty-4 into maintenance/update-translations 2023-10-18 14:06:11 +01:00
Zedifus
d557289cf3 Partial it_IT lang update from 21/01/2023 2023-10-18 14:06:06 +01:00
amcmanu3
847c7fd0d5 Update pl_PL 2023-10-17 19:08:55 -04:00
amcmanu3
9b205bfcfb Add de_DE translation updates.
Make es_ES as incomplete
2023-10-17 18:56:55 -04:00
Zedifus
24d712e30e Exclude incomplete lang files from sort and check
This will exempt them from the future pipeline tests
2023-10-17 18:41:43 +01:00
Zedifus
06898ab37a Sort nl_BE 2023-10-16 22:17:09 +01:00
Zedifus
2b2225cc1d Merge branch 'maintenance/update-translations' of gitlab.com:crafty-controller/crafty-4 into maintenance/update-translations 2023-10-16 22:15:50 +01:00
Zedifus
530e825757 Update lolcats lang
Add missing newline at end of en_en
2023-10-16 22:15:32 +01:00
Andrew
9036d7a073 Update nl_BE
jq is not working on this comp will sort later
2023-10-16 15:34:26 -05:00
Zedifus
bfdf31cbb5 Merge branch 'dev' into maintenance/update-translations 2023-10-16 21:25:25 +01:00
Zedifus
ec8928c821 Merge branch 'dev' into translation/update-FR 2023-10-16 20:49:22 +01:00
Zedifus
82eeacf11a Merge branch 'dev' into tweak/user-edit 2023-10-16 20:29:07 +01:00
Zedifus
9fa53c2c1a Merge branch 'dev' into enhancement/notify-display 2023-10-16 20:14:32 +01:00
Silversthorn
6eb16ed309 Update French translation file 2023-10-13 23:40:48 +02:00
amcmanu3
eac40ca6c8 Edit typo on english json 2023-10-11 16:44:49 -04:00
amcmanu3
c2ed57c880 Update Latvian translation.
Thank you Mednis!
2023-10-11 16:39:48 -04:00
Zedifus
c3fd3acb2c Sort all lang files 2023-10-09 19:12:35 +01:00
Silversthorn
2fe862f6a2 Fixing little issue when auto close 2023-10-09 18:57:11 +02: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
07db332f1c Add translations 2023-10-08 22:30:40 -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
amcmanu3
5547720a8f Fix js spacing 2023-10-08 17:02:31 -04:00
amcmanu3
b59262802c Fix spacing on functions 2023-10-08 17:02:27 -04:00
amcmanu3
700194df9f Merge branch 'dev' into tweak/user-edit 2023-10-08 16:40:30 -04:00
amcmanu3
6d9f930e71 Check for super user on user edit 2023-10-08 16:39:04 -04: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
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
d31a83a783 prettying Toast 2023-10-08 11:55:11 +02:00
Silversthorn
05ea1baa77 Improve Notifications with Toasts 2023-10-08 11:40:25 +02:00
amcmanu3
612cac4ed2 Fix dashboard to not use ajax 2023-10-07 22:10:24 -04:00
amcmanu3
39d78b92e6 Set password from bootbox 2023-10-07 22:10:15 -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
b1c5836b9b Create forms to username and password changes 2023-10-07 14:42:52 -04:00
amcmanu3
7a6bb657fe Add icons for user password and username 2023-10-07 14:14:46 -04:00
amcmanu3
529b3a159c Appease the linter 2023-10-07 13:55:36 -04: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
069ff28098 Update changelog !637 2023-10-07 16:50:14 +01:00
Zedifus
66e74b6c04 Merge branch 'dev' into bugfix/reaction-of-reaction 2023-10-07 16:09:32 +01:00