Iain Powrie
cdd7a9e388
Merge branch 'dev' into 'master'
...
v4.6.1
See merge request crafty-controller/crafty-4!920
2025-11-23 16:42:50 +00:00
Zedifus
ebc8f729f9
Close changelog 4.6.1
2025-11-23 02:38:07 +00:00
Iain Powrie
3ae5350c53
Merge branch 'bugfix/bedrock-build-update' into 'dev'
...
Fix bedrock builder bug created when fixing bedrock updates
See merge request crafty-controller/crafty-4!919
2025-11-23 02:34:54 +00:00
Zedifus
c8376186e3
Update changelog !919
2025-11-23 02:27:45 +00:00
Zedifus
7197b89b14
Merge branch 'dev' into bugfix/bedrock-build-update
2025-11-23 02:25:26 +00:00
Iain Powrie
edd56190dc
Merge branch 'feature/jinja2-for-webhooks' into 'dev'
...
Jinja2 for rendering Webhook dynamic variables
See merge request crafty-controller/crafty-4!757
2025-11-23 02:05:36 +00:00
Andrew
9228b95557
Make translation more clear
2025-11-22 19:42:38 -06:00
Andrew
45af9ac26c
Add jinja 2 doc link to body
2025-11-22 19:37:55 -06:00
Andrew
d81fe6f2a7
Fix bedrock builder bug created when fixing bedrock updates
2025-11-22 16:39:47 -06:00
Zedifus
8825eb87b0
Update changelog !757
...
Drop py 3.9
Bump release minor (Retag)
2025-11-22 21:04:24 +00:00
Zedifus
5eb004dc8a
Merge branch 'dev' into feature/jinja2-for-webhooks
2025-11-22 20:56:12 +00:00
Zedifus
2cd5179abe
Merge combinable if statements well preserving original logic for SQ- python:S1066
2025-11-22 18:45:07 +00:00
Zedifus
afd5c5861d
Make snapshot/archive suffix definitions class constants, fixes SQ- python:S1192
2025-11-22 18:29:10 +00:00
Zedifus
e2d53939ab
Remove TODO and fix erroneous import
...
TODO has been tested and is fine, `logging.config` was causing the import to appear as unused, where `import logging` is the correct use case in this instance
2025-11-22 18:08:54 +00:00
Zedifus
8238307102
Set autoescape on jinja_env, fixes SQ:- python:S5247
...
Even though the rendered string is not being dispatched to any web page/HTML/JavaScript processing, Auto escaping is probably best as we may make a provider in the future that could be affected by this.
2025-11-22 18:04:15 +00:00
Zedifus
b9c88c0db4
Update pylint analysis version to min supported (3.10)
...
Tweak readme compose example
2025-11-22 17:48:16 +00:00
Zedifus
751afc1b20
Fix C0411
2025-11-22 17:38:17 +00:00
Iain Powrie
914754a6fd
Merge branch 'weblate-crafty-controller-crafty-controller' into 'dev'
...
Translations update from Weblate
See merge request crafty-controller/crafty-4!912
2025-11-22 17:25:54 +00:00
Zedifus
89df743efc
Add Crafty version to quick info on bug template
...
Thanks @fseesink ;)
2025-11-22 17:17:40 +00:00
Iain Powrie
9ee40a5773
Merge branch 'bugfix/backup-download' into 'dev'
...
Fix bug where backups download would always be the most recent
See merge request crafty-controller/crafty-4!913
2025-11-22 17:09:28 +00:00
Zedifus
b53a962a18
Update changelog !913
2025-11-22 17:05:38 +00:00
Zedifus
0250b51fbc
Merge branch 'dev' into bugfix/backup-download
2025-11-22 17:01:59 +00:00
Iain Powrie
75161d2b3e
Merge branch 'bugfix/restore-feedback' into 'dev'
...
Provide better feedback on restore failures
See merge request crafty-controller/crafty-4!914
2025-11-22 16:57:17 +00:00
Zedifus
c6f72ba12a
Update changelog !914
2025-11-22 16:52:24 +00:00
Zedifus
b9066f385e
Merge branch 'dev' into bugfix/restore-feedback
2025-11-22 16:50:21 +00:00
Iain Powrie
3f9b10b249
Merge branch 'bugfix/bedrock-update' into 'dev'
...
Fix server.properties overwritten in bedrock update
See merge request crafty-controller/crafty-4!915
2025-11-22 16:44:44 +00:00
Zedifus
0c1ed6e77b
Update changelog !915
2025-11-22 16:31:45 +00:00
Zedifus
d6409c13de
Merge branch 'dev' into bugfix/bedrock-update
2025-11-22 16:30:18 +00:00
Iain Powrie
d2a88fcb56
Merge branch 'bugfix/delete-server' into 'dev'
...
Fix delete file call when deleting server
See merge request crafty-controller/crafty-4!916
2025-11-22 16:28:23 +00:00
Zedifus
a0b1021fd9
Update changelog !916
2025-11-22 16:24:57 +00:00
Zedifus
2206b7f662
Merge branch 'dev' into bugfix/delete-server
2025-11-22 16:21:51 +00:00
Iain Powrie
f5a423964b
Merge branch 'bugfix/first-survey' into 'dev'
...
Fix survey not appearing on first login
See merge request crafty-controller/crafty-4!917
2025-11-22 16:20:22 +00:00
Zedifus
23e796c288
Update changelog !917
2025-11-22 16:16:58 +00:00
Zedifus
9bebb27856
Merge branch 'dev' into bugfix/first-survey
2025-11-22 16:15:31 +00:00
Iain Powrie
7866ec741e
Merge branch 'bugfix/import-cleanup' into 'dev'
...
Fix import dir cleanup
See merge request crafty-controller/crafty-4!918
2025-11-22 15:46:00 +00:00
Zedifus
f40e772eeb
Update changelog !918
2025-11-22 15:42:05 +00:00
Andrew
20d6a2a1da
Modify variable useage
2025-11-21 14:05:32 -04:00
Andrew
c63db67b04
Fix bad parameter in delete call on import dir cleanup
2025-11-21 14:02:02 -04:00
=
c0fbd60cdf
Add backup error and backup status to webhooks
2025-11-19 17:35:44 -05:00
=
878e315ac6
Add backup attributes to webhooks
2025-11-19 17:35:32 -05:00
=
662248a587
Set baseurl for Crafty
2025-11-19 17:35:16 -05:00
=
7ab8159fda
Return backup status, size, etc for webhooks
2025-11-19 17:34:47 -05:00
Zedifus
167ab4555f
Normalise backup related jinja var names
2025-11-19 20:48:20 +00:00
Zedifus
1333ba04c0
Fix black formatting
2025-11-19 20:05:19 +00:00
Zedifus
931f42ec37
Add baseline for sources to available event_data
2025-11-16 19:41:31 +00:00
Zedifus
2f7b340a4c
Add event_type to available event_data
2025-11-16 19:23:40 +00:00
Zedifus
d137cbf4ef
Remove legacy timestamp and tidy up supported monitored events List
2025-11-16 18:30:14 +00:00
Zedifus
20c04a824b
Add formatted to time variables to available event_data
2025-11-16 18:05:28 +00:00
Zedifus
92bc8971e1
Replicate jinja2 rendering over all providers
2025-11-16 16:58:44 +00:00
Zedifus
ca008b7e98
Merge branch 'dev' into feature/jinja2-for-webhooks
2025-11-16 16:42:51 +00:00
