Commit Graph

283 Commits

Author SHA1 Message Date
vcerenu
93812b3d07 Add changelog 2025-10-01 14:26:22 -03:00
Victor Ereñú
35af57be29 Merge branch 'main' into merge-4.14.1-into-main 2025-09-24 15:07:39 -03:00
Gonzalo Acuña
ed92382ff1 Merge pull request #2018 from wazuh/merge-4.14.0-into-4.14.1
Merge 4.14.0 into 4.14.1
2025-09-24 14:50:27 -03:00
vcerenu
9c58a48684 Resolving Conflicts 2025-09-24 14:06:30 -03:00
Gonzalo Acuña
180236e269 Merge branch 'main' into merge-4.14.1-into-main 2025-09-19 05:41:23 -03:00
Gonzalo Acuña
ee087c7ebf Merge branch '4.14.1' into merge-4.14.0-into-4.14.1 2025-09-19 05:24:26 -03:00
Jesus Garcia
0163675682 Merge branch '4.13.0' into 4.14.0 2025-09-18 17:20:22 -05:00
wazuhci
a9c6beaecd feat: bump 4.13.1 2025-09-18 11:15:00 +00:00
Gonzalo Acuña
434f99b182 Changelog update 2025-09-17 12:23:36 -03:00
Gonzalo Acuña
ac126173e3 Changelog update 2025-09-15 12:25:42 -03:00
Gonzalo Acuña
2dd0f3b7d2 Changelog update 2025-09-05 11:28:23 -03:00
Victor Ereñú
a990518208 Merge branch 'main' into merge-4.14.1-into-main 2025-09-05 09:29:24 -03:00
Victor Ereñú
75e09fcc19 Merge branch '4.14.1' into merge-4.14.0-into-4.14.1 2025-09-05 09:03:44 -03:00
vcerenu
b2420a5946 Resolving conflicts 2025-09-05 08:33:11 -03:00
vcerenu
ffe384be91 Add changelog 2025-08-29 08:01:37 -03:00
vcerenu
6c87ecf7f0 Resolving conflicts 2025-08-14 08:56:57 -03:00
vcerenu
54fe999414 Merge branch '4.14.1' of github.com:wazuh/wazuh-docker into 4.14.0 2025-08-14 08:22:00 -03:00
vcerenu
7bc871bde9 Resolving conflicts 2025-08-14 08:09:22 -03:00
vcerenu
ee599583eb Add changelog 2025-08-13 08:49:50 -03:00
vcerenu
fb5b4488de Revert version 2025-08-07 08:38:27 -03:00
vcerenu
82a967c0df Add changelog 2025-08-05 13:37:39 -03:00
vcerenu
f53f1930aa Add changelog 2025-08-01 13:11:48 -03:00
wazuhci
846ae52263 feat: bump 4.14.1 2025-07-29 16:11:09 +00:00
vcerenu
a1afcd2c40 Merge branch 'main' of github.com:wazuh/wazuh-docker into merge-4.14.0-into-main 2025-07-25 10:00:39 -03:00
vcerenu
5a1daaf4ce Merge branch '4.14.0' of github.com:wazuh/wazuh-docker into merge-4.13.1-into-4.14.0 2025-07-25 09:54:44 -03:00
vcerenu
191ef58a9b Resolving conflicts 2025-07-25 09:22:48 -03:00
fcaffieri
9cc135d05b Update CHANGELOG 2025-07-08 17:30:26 -03:00
Jesus Garcia
49594251a6 Set right ownership for malicious-ioc files on container start 2025-07-04 12:52:29 -05:00
vcerenu
8306a49967 Add Changelog 2025-07-04 12:04:31 -03:00
Carlos Anguita
a809b4b60b Merge pull request #1903 from wazuh/merge-4.14.0-into-main 2025-06-27 12:34:13 +02:00
fcaffieri
de11f97bf0 Update CHANGELOG 2025-06-23 13:41:56 -03:00
fcaffieri
f7cbdd4884 Update CHANGELOG 2025-06-23 13:33:22 -03:00
Enrique Araque
a5d961040a Update changelog 2025-06-20 13:18:05 +02:00
Gonzalo Acuña
6bac41a05d Merge pull request #1895 from wazuh/enhancement/1892-bumper-main
Bumper propagation to main
2025-06-19 11:44:56 -03:00
Gonzalo Acuña
1bfc4ff4c2 Merge pull request #1894 from wazuh/enhancement/1892-bumper-4.14.0
Bumper propagation to 4.14.0
2025-06-19 11:42:05 -03:00
Gonzalo Acuña
f5473f0004 Merge pull request #1893 from wazuh/enhancement/1892-bumper
Enhancement/1892 bumper
2025-06-19 11:35:49 -03:00
vcerenu
bbe5b5eb09 Add changelog 2025-06-17 15:05:52 -03:00
Carlos Anguita López
f57f0b33f2 Merge branch '4.14.0' into merge-4.14.0-into-main 2025-06-13 14:59:48 +02:00
Carlos Anguita López
b374f4ba2e merge 4.13.1 into 4.14.0 2025-06-13 14:52:26 +02:00
vcerenu
fb4a062f5a Bump 4.13.1 version 2025-06-13 08:26:34 -03:00
Carlos Anguita López
c6369f9463 update changelog 2025-06-11 12:31:24 +02:00
Carlos Bordon
4833f362ee Merge branch '4.13.0' into change/1860-integrate-bumper-script-via-github-action 2025-06-09 10:26:50 -03:00
Enrique Araque
b8bcf7687e Fix changelog 2025-06-09 15:14:17 +02:00
Enrique Araque
6df029fde7 Update changelog 2025-06-09 12:59:07 +02:00
c-bordon
c111f8497e Merge 4.14.0 into main 2025-06-05 16:17:18 -03:00
c-bordon
04f386e050 Merge 4.13.0 into 4.14.0 2025-06-05 16:09:20 -03:00
c-bordon
cfa6e9bf81 Merge 4.12.1 into 4.13.0 2025-06-05 15:52:11 -03:00
c-bordon
46edb16dbb Updated changelog 2025-06-05 10:34:09 -03:00
fcaffieri
cd69030b16 Remove 4.12.2 references from 4.14.0 branch 2025-05-29 09:30:11 -03:00
fcaffieri
b326241400 Remove 4.12.2 references from 4.14.0 branch 2025-05-29 09:28:09 -03:00