Commit Graph

3992 Commits

Author SHA1 Message Date
Zedifus
08f7218a64 Bump Jinja2 to resolve CVE-2024-34064
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-34064
2024-05-09 21:59:29 +01:00
Zedifus
5774744e49 Fix temporary event_data object
Or dictionary, whatever you want to call it ;)
2024-05-09 21:43:25 +01:00
Zedifus
95bb4bddfe Merge branch 'dev' into feature/jinja2-for-webhooks 2024-05-09 21:26:52 +01:00
Iain Powrie
5bc1d74d13 Merge branch 'bugfix/childschedule' into 'dev'
Fix child schedule failing to load after del parent

See merge request crafty-controller/crafty-4!753
2024-05-09 20:16:59 +00:00
Zedifus
8f16b57b48 Update changelog !753 2024-05-09 21:11:14 +01:00
Zedifus
4227fc8339 Merge branch 'dev' into bugfix/childschedule 2024-05-09 21:09:51 +01:00
Iain Powrie
28ac3d9915 Merge branch 'tweak/json-audit-log' into 'dev'
Set audit logging to logfile instead of DB

See merge request crafty-controller/crafty-4!751
2024-05-09 20:07:54 +00:00
Zedifus
367e77765c Update changelog !751 2024-05-09 21:04:34 +01:00
Zedifus
39a98f2b5e Merge branch 'dev' into tweak/json-audit-log 2024-05-09 21:03:26 +01:00
Iain Powrie
4842d5c505 Merge branch 'bugfix/login-query' into 'dev'
Reset query arguments on login if ?next is not available

See merge request crafty-controller/crafty-4!750
2024-05-09 20:01:28 +00:00
Zedifus
4cd3bf17ae Update changelog !750 2024-05-09 20:58:26 +01:00
Zedifus
6257ea9c43 Merge branch 'dev' into bugfix/login-query 2024-05-09 20:56:19 +01:00
Iain Powrie
4799aad38c Merge branch 'lang/czech-updates' into 'dev'
Update to Czech translations

See merge request crafty-controller/crafty-4!749
2024-05-09 19:54:47 +00:00
Zedifus
100872966d Update changelog !749 2024-05-09 20:51:19 +01:00
Zedifus
31f7d88c3a Merge branch 'dev' into lang/czech-updates 2024-05-09 20:48:42 +01:00
Iain Powrie
8496ac91ef Merge branch 'tweak/error-return' into 'dev'
Add link to go back to dashboard on error page

See merge request crafty-controller/crafty-4!743
2024-05-09 19:47:20 +00:00
Zedifus
27eeb2fa0f Update changelog !743 2024-05-09 20:43:56 +01:00
Zedifus
c8c843a551 Merge branch 'dev' into tweak/error-return 2024-05-09 20:42:25 +01:00
Iain Powrie
5c9f2c25d7 Merge branch 'refactor/api-key-su' into 'dev'
Refactor API keys "super user" to "full access"

See merge request crafty-controller/crafty-4!731
2024-05-09 19:40:57 +00:00
Zedifus
6bcdb21bb8 Update changelog !731 2024-05-09 20:30:38 +01:00
Zedifus
4a466fbf6c Merge branch 'dev' into refactor/api-key-su 2024-05-09 20:28:38 +01:00
Iain Powrie
2d73382c1e Merge branch 'devops/re-tag-test-jobs-gl17' into 'dev'
Re-tag test jobs to new shared runner standard (GL17)

See merge request crafty-controller/crafty-4!756
2024-05-09 19:22:01 +00:00
Zedifus
1655a16ba0 Re-tag test jobs to new shared runner standard (GL17) 2024-05-09 20:11:46 +01:00
Zedifus
d5ae2c606b Implement Jinja into callback function and discord provider
Will add to the other providers later after testing
2024-04-21 18:04:32 +01:00
Zedifus
915245bbff Refactor get_monitored_events to dict to incl supported variables
Update panel_handler to account for type change to get_monitored_events
2024-04-21 17:53:27 +01:00
Zedifus
ae4f806bac Instantiate Jinja environment and create renderer in base webhook 2024-04-21 17:40:26 +01:00
amcmanu3
d998d82de0 Fix code quaity issues 2024-04-20 17:04:30 -04:00
amcmanu3
2134c4226d Fix audit log raw 2024-04-20 16:54:33 -04:00
amcmanu3
3fac1a39a8 Setup drop table migrations 2024-04-20 16:21:06 -04:00
amcmanu3
038f275388 Restructure translation json 2024-04-20 16:08:16 -04:00
amcmanu3
37373733d9 Add loading splash screen 2024-04-20 16:07:58 -04:00
amcmanu3
be2e6f5e6c Update acttivity log page to use new format 2024-04-20 15:47:50 -04:00
amcmanu3
92dfd18dbd Refactor API for new activity log format 2024-04-20 15:47:34 -04:00
amcmanu3
a76a2722db Fix child schedule failing to load after del parent 2024-04-19 16:05:35 -04:00
Zedifus
438b7cc6ab Add jinja2 @latest
Sort requirements alphabetically
2024-04-19 01:57:48 +01:00
--unset
227d642546 Set audit logging to logfile instead of DB 2024-04-17 18:03:10 -04:00
--unset
89b552a880 Redirect to /login if garbage is in query args 2024-04-16 10:26:32 -04:00
--unset
92bd7b80c8 Remove console log on login 2024-04-16 10:26:09 -04:00
Analicia Abernathy
6c28ef6327 Update cs_CS.json 2024-04-15 17:48:53 -05:00
Analicia Abernathy
2a601c9f31 update translations for refactor/api-key-su 2024-04-11 09:16:03 -05:00
Analicia Abernathy
ab18daebe7 Merge branch 'refactor/api-key-su' of gitlab.com:crafty-controller/crafty-4 into refactor/api-key-su 2024-04-10 18:19:11 -05:00
Analicia Abernathy
ed37387fbf updated translations for branch refactor/api-key-su 2024-04-10 18:18:44 -05:00
amcmanu3
400f42ba26 Merge branch 'dev' into refactor/api-key-su 2024-04-08 13:42:16 -04:00
Analicia Abernathy
ba39480c51 Merge branch 'tweak/error-return' of gitlab.com:crafty-controller/crafty-4 into tweak/error-return 2024-04-07 18:25:15 -05:00
Analicia Abernathy
36f2256273 Update languages for merge 743 2024-04-07 18:25:05 -05:00
Zedifus
0fbf14063c Fix CL 4.3.3
Duplicate head
2024-04-07 02:33:34 +01:00
Zedifus
8106966146 Prepare 4.3.3 release base 2024-04-07 01:58:29 +01:00
Zedifus
56d098ef86 Update changelog 3c7c05b4 2024-04-07 01:04:56 +01:00
Zedifus
77b0c2c9d2 Add openjdk-21 to docker img 2024-04-07 00:36:10 +01:00
Zedifus
3c7c05b405 Close changelog v4.3.2 2024-04-07 00:17:16 +01:00