4255 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
JuanCarlos	2b0bcbfef3	Update	2019-01-28 13:37:40 +01:00
JuanCarlos	e0250f8712	Fix merge	2019-01-28 13:20:46 +01:00
JuanCarlos	eb78f7d24c	Merge issue-1163	2019-01-28 13:03:17 +01:00
JuanCarlos	f7fa75cb4c	Update	2019-01-28 12:58:31 +01:00
Pablo	316e3b3fba	Minor fix	2019-01-28 11:12:28 +01:00
Pablo	db3c3e65a4	Merge 3.9	2019-01-28 11:08:49 +01:00
Pablo	71fbd99adb	Merge 3.9	2019-01-28 11:07:50 +01:00
Pablo	27127b8654	Add save configuration service	2019-01-28 11:02:39 +01:00
Jesús Ángel	59b29df701	Replace Vega vis with standard vis for FIM	2019-01-28 11:01:49 +01:00
Pablo	54359b57ab	Edit manager configuration	2019-01-28 10:48:27 +01:00
JuanCarlos	75dd0055ae	Remove format in rules decoders calls	2019-01-25 17:04:35 +01:00
JuanCarlos	15022f527a	Fix return file saving message	2019-01-25 16:00:53 +01:00
Pablo	9f019cec64	Update calls	2019-01-25 14:00:07 +01:00
JuanCarlos	5fda1c9f93	Fix typo	2019-01-25 13:33:35 +01:00
JuanCarlos	1e9abb7bfe	Merge 3.9	2019-01-25 13:10:30 +01:00
JuanCarlos	c89e3b2ee7	Merge 3.9	2019-01-25 13:02:53 +01:00
JuanCarlos	27b4fbae05	Update calls	2019-01-25 12:59:59 +01:00
Jesús Ángel	663ec391b9	Merge branch '3.8-6.5' into 3.9-6.5	2019-01-25 12:11:12 +01:00
Pablo	80e988ca2d	Merge 3.9	2019-01-25 11:39:49 +01:00
Pablo	d23718289c	Edit node configuration	2019-01-25 11:21:23 +01:00
JuanCarlos	0bf6cc5dc7	Merge branch '3.9-6.5' of https://github.com/wazuh/wazuh-kibana-app into issue-1161	2019-01-25 08:45:08 +01:00
Jesús Ángel	a4d147f087	Merge branch 'master' into 3.8-6.5	2019-01-24 21:01:38 +01:00
Jesús Ángel	ad50833766	Updated CHANGELOG	2019-01-24 18:17:23 +01:00
Jesús Ángel	c8d12aefb0	Updated README	2019-01-24 18:01:03 +01:00
Jesús Ángel	f4f8144eef	Fix autoformat performance	2019-01-24 17:17:27 +01:00
JuanCarlos	ddd60ab20f	Close editor at detail view close	2019-01-24 16:43:39 +01:00
JuanCarlos	05923d5ee4	Fix typo	2019-01-24 16:23:34 +01:00
Jesús Ángel	1248b8db73	Bump code	2019-01-24 16:20:00 +01:00
JuanCarlos	7f91b50713	Api calls for read/save files in rules and decoders	2019-01-24 16:18:38 +01:00
Jesús Ángel	a02dc37e73	Merge pull request #1178 from wazuh/3.8.1-replace-amp ... Escape "&" character	2019-01-24 16:17:03 +01:00
Jesús Ángel	11b8084c75	Fix error toaster word breaking for URLs or paths	2019-01-24 16:15:50 +01:00
Jesús Ángel	d3aa56fa73	Escape "&" character	2019-01-24 16:15:24 +01:00
Jesús Ángel	5c1a3ef9bd	Don't hide editor	2019-01-24 16:12:12 +01:00
Pablo	5bba4dd07f	Fix wz-xml-file-editor	2019-01-24 13:15:39 +01:00
Jesús Ángel	d6bd1c8ebe	Updated CHANGELOG	2019-01-24 12:00:48 +01:00
Jesús Ángel	724eda6a9e	Merge pull request #1177 from wazuh/3.8.1-exclude-000-monitoring ... Excluding managers from wazuh-monitoring indices	2019-01-24 11:59:46 +01:00
Jesús Ángel	c88aa24bac	Excluding managers from wazuh-monitoring indices	2019-01-24 11:58:53 +01:00
Jesús Ángel	065ebe5701	Merge pull request #1176 from wazuh/3.8.1-6.5.4 ... Moved Windows registry entries to the right place	2019-01-24 10:50:20 +01:00
Jesús Ángel	1f10fdc080	Updated CHANGELOG	2019-01-24 10:47:50 +01:00
Jesús Ángel	3455c3ee44	Bump version (3.8.1)	2019-01-24 10:42:21 +01:00
Jesús Ángel	4ac247651e	Moved Windows registry entries to the right place	2019-01-24 10:41:47 +01:00
Pablo	0aa285c5b0	Edit config for master-worker	2019-01-24 10:37:14 +01:00
JuanCarlos	f56442aacd	Minor refactor	2019-01-24 10:35:29 +01:00
Jesús Ángel	1ed6fb068d	Updated CHANGELOG	2019-01-23 17:39:50 +01:00
Jesús Ángel	f558a28429	Merge pull request #1173 from wazuh/fix-json-xml-viewer ... Fix config viewer	2019-01-23 17:35:53 +01:00
Jesús Ángel	9c0de9426c	Merge branch 'fix-json-xml-viewer' into 3.9-6.5	2019-01-23 17:34:33 +01:00
JuanCarlos	ac28484efa	merge 3.9	2019-01-23 17:16:53 +01:00
JuanCarlos	0999d4fcf5	Some fixes	2019-01-23 17:15:20 +01:00
JuanCarlos	97b94cf468	CDB List	2019-01-23 16:40:53 +01:00
Jesús Ángel	28a6a9747c	Updated CHANGELOG	2019-01-23 15:04:11 +01:00