Commit Graph

2397 Commits

Author SHA1 Message Date
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
Zedifus
ecba6f1bf0 Merge branch 'dev' into tweak/logging 2023-10-07 15:42:15 +01:00
Zedifus
7738103691 Add discord embed designer to payload construct docstring 2023-10-06 19:25:30 +01:00
amcmanu3
4f994ce211 Remove un-needed console log 2023-10-06 14:24:55 -04:00
Zedifus
d10de65c5a Add missing bot_name params in webhook docstrings 2023-10-06 19:20:53 +01:00
amcmanu3
5525413724 Set timeout before calling dir function 2023-10-06 13:33:56 -04: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
amcmanu3
aa5484e96b Retain provider selection on edit 2023-10-05 18:05:12 -04: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
6a6ca166bc Accurately display enabled webhook status 2023-09-28 20:00:38 -04:00
Andrew
e51b2bd0de Add bot_name to send call 2023-09-28 19:26:32 -04: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