1668 Commits

Author	SHA1	Message	Date
Luis Calvo	860a4cdbf2	Updated pandoradb and migrate ... Former-commit-id: 59d37439046c18c4de72ac7e078ef75a61603958	2019-05-13 17:57:21 +02:00
Luis Calvo	8c1c337522	Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings ... Former-commit-id: 1eac76c75f311a20f402859cf7b9a47b70765f75	2019-05-13 17:36:32 +02:00
Alejandro Campos	9347fc17aa	Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta' ... # Conflicts: # pandora_console/extras/mr/28.sql Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd	2019-05-13 17:10:06 +02:00
manuel	20dace7de8	Merge branch 'develop' into ent-3468-Ayudas_online ... Conflicts: pandora_console/godmode/agentes/agent_manager.php Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3	2019-05-13 16:20:12 +02:00
marcos.alconada	17ba0e19cb	Added new min value for <code>InnoDB file per table( 0 to 1) ... Former-commit-id: ac389928deec2fdc8af9d965c049a66f0fe57839	2019-05-13 15:08:57 +02:00
Luis Calvo	27096276ec	agent view user acces ehorus ... Former-commit-id: 66739ce807d5bd5f2e46ce9fd1aa0cc72afbb4bc	2019-05-13 15:00:29 +02:00
marcos.alconada	ac60e296c1	Add new message to News board ... Former-commit-id: ad9170857d95fa2c211d09a5f59f6012739177c5	2019-05-10 11:17:46 +02:00
manuel	12c9952e4a	Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal ... Conflicts: pandora_console/extras/mr/28.sql Former-commit-id: 841526b8d92b3f5ea7e642a36829b1bc33c62c8a	2019-05-10 09:11:17 +02:00
Daniel Rodriguez	8027238dfd	Merge branch 'ent-3925-eliminar-custom-response-deprecated' into 'develop' ... Ent 3925 eliminar custom response deprecated See merge request artica/pandorafms!2390 Former-commit-id: aa92dfe86b9039f45db063cd1a711b26e8c36442	2019-05-09 17:52:46 +02:00
Marcos Alconada	5126c651f7	Changed '' of query	2019-05-09 17:38:40 +02:00
Daniel Maya	f186cd6201	Added cache_expiration in mr, pandoradb and migrate	2019-05-09 17:37:01 +02:00
marcos.alconada	ad00492ad6	se elimina la query del 27 ... Former-commit-id: 1756d296ad9c13c62c4eb46a854291dfc4200256	2019-05-06 18:23:12 +02:00
marcos.alconada	e1951c45a4	Se añade al 28 ... Former-commit-id: 1607d9cbc88fe0e029df46ada20046899558829e	2019-05-06 18:06:59 +02:00
Daniel Barbero	c5884f1ac9	add changes sql for mr 28 ... Former-commit-id: 0650b5ec91188a854fb756d7c2d8b1b8eccc3e0d	2019-05-03 14:09:23 +02:00
alejandro-campos	5b3dfcbf74	add feature to enable obfuscation on command fields when creating or updating commands ... Former-commit-id: ac5a1fb86e7e690bccc9c4f672678781acd1414d	2019-05-03 13:46:52 +02:00
marcos.alconada	1d4e8c9bed	Changed translations strings ... Former-commit-id: b802cc7a3650a1697ec0f192cbb374fce3ffea56	2019-04-29 15:17:59 +02:00
manuel	6bd8221bc0	changed helps ... Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4	2019-04-29 14:36:02 +02:00
marcos.alconada	c5c84d7421	Deleted row Integria IMS incident from event on tevent_responoses ... Former-commit-id: 76e41297003d537f8b0ea74394dd433e71ca2976	2019-04-29 12:32:06 +02:00
manuel	c075d5caad	Added condition type not normal in alert templates ... Former-commit-id: c2028e4c64e4126768f33f73edb93b39fdf6a79d	2019-04-24 10:51:55 +02:00
fbsanchez	bbedf36235	minor update ... Former-commit-id: da7ef108bd3b71ece515407fb932e6b9bef761fd	2019-04-23 16:28:22 +02:00
fbsanchez	cbdd8e7104	Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3 ... Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c	2019-04-22 09:01:24 +02:00
Marcos Alconada	d3d5312f40	Update 27.sql ... Former-commit-id: 4e027274bb9edeb51dc64f935ddd3ee2bfd62d0d	2019-04-15 11:14:41 +02:00
marcos.alconada	1b5786aedb	Merge remote-tracking branch 'origin/develop' into ent-3790-sobra-una-columna-de-tnetflow_filter ... Former-commit-id: 652770c2bad08caef82584fc440736ee36abd03d	2019-04-12 10:32:07 +02:00
fbsanchez	342e4b78c9	Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3 ... Former-commit-id: 3640f0730c8f44cfe865b5a2947b8d0ee5c56ad0	2019-04-11 15:12:46 +02:00
fbsanchez	79bd37ee5b	Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3 ... Former-commit-id: 8310dd36684192ea6e98d3a0c0a3e7ace69485d7	2019-04-08 16:28:26 +02:00
Daniel Barbero	49d925d96a	Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop ... Conflicts: pandora_console/extras/mr/27.sql Former-commit-id: 67c41a5bd6a4c95647b097171578c5af67b491fa	2019-04-05 16:48:58 +02:00
manuel	49c913c6de	Added custom fields to report templates ... Former-commit-id: 525d21d17835a3bb08f47df273128e658a35bcd9	2019-04-04 17:31:11 +02:00
fbsanchez	798a2aad16	WIP discovery F3 ... Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939	2019-04-03 18:13:19 +02:00
fbsanchez	11b2fbc245	WIP db ... Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9	2019-04-02 16:25:29 +02:00
manuel	1fd40447e1	Custom fields in availability report type ... Former-commit-id: 1f04e5728cf7d0ed5079c16488493188379d536c	2019-04-02 16:24:29 +02:00
daniel	431c807f61	Merge branch 'develop' into 'ent-3445-Solucionar_problematica_flip_flop' ... # Conflicts: # pandora_console/extras/mr/27.sql Former-commit-id: 4fcd03764bf959fb6b126df48e20bc29327105b2	2019-04-02 10:21:04 +02:00
Daniel Rodriguez	6733182b5d	Merge branch 'ent-3757-Errores-en-diagnostic-info' into 'develop' ... Fixed errors in Diagnostic tool See merge request artica/pandorafms!2292 Former-commit-id: 62fafd92e852c65136c50a3c0ff6d80a3edf72b8	2019-04-01 18:39:12 +02:00
Daniel Rodriguez	2afc16c8dc	Merge branch 'ent-1901-Enviar-reportes-por-mail-en-otros-formatos-que-no-sean-PDF' into 'develop' ... Ent 1901 enviar reportes por mail en otros formatos que no sean pdf See merge request artica/pandorafms!2272 Former-commit-id: 590eddf946623393d02a8c88db33fde2af022937	2019-04-01 17:51:37 +02:00
marcos.alconada	48c4eb9c01	Add changes in migrate and 27.sql file ... Former-commit-id: 60c2e2f2dc9a78ff9fb236efe7ac57a288d3717a	2019-03-29 13:58:53 +01:00
Daniel Barbero Martin	e3222626dc	fixed error in bbdd ... Former-commit-id: dddd4fc90a4d3847c04108ba4dcdd4988872066f	2019-03-28 09:49:16 +01:00
Daniel Barbero Martin	626aacbf43	Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop ... Former-commit-id: 26e21338ea5e7578a4247771d19df75d01e6234e	2019-03-28 08:49:08 +01:00
Daniel Barbero Martin	a3865a3181	flip flop keep counters ... Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626	2019-03-27 18:16:53 +01:00
fbsanchez	128a97d254	fix mr 26 ... Former-commit-id: 72c38dbc1bc8ac4973d6f19cf111ce107497e4ef	2019-03-27 17:38:08 +01:00
fbsanchez	66b2102052	Merge remote-tracking branch 'origin/develop' into fix/mr ... Former-commit-id: a95ef0c2110e1c0b7be3e9c6cd93543f79e0f230	2019-03-27 17:09:46 +01:00
fbsanchez	6ebbe54448	minor fix ... Former-commit-id: 252895bd6c64e5a1cb593ba705fb15a2ec6bed97	2019-03-27 17:06:14 +01:00
fbsanchez	160a72d780	Merge branch 'fix/delete' into 'develop' ... errata fix See merge request artica/pandorafms!2303 Former-commit-id: 2dc2834075b9491712dbd37ac087b9e20c274059	2019-03-27 16:51:19 +01:00
fbsanchez	2dd427100e	errata fix ... Former-commit-id: 3e4ce53635dc02387ec1d2d46698fa4a81372dd0	2019-03-27 16:44:08 +01:00
fermin831	b2f046e4d6	Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/extras/mr/26.sql pandora_console/include/class/ConsoleSupervisor.php pandora_console/include/class/NetworkMap.class.php pandora_console/include/styles/pandora.css pandora_console/operation/menu.php Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18	2019-03-27 12:11:23 +01:00
alejandro-campos	d1bd5fbb1a	Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2 ... Former-commit-id: 914a944b96af8bceb26bbb89dbac25452097e20a	2019-03-26 13:06:12 +01:00
samucarc	34b057befd	Fixed errors in Diagnostic tool ... Former-commit-id: a82e827df2266c0962df62ee44ad35dc1e0d04d6	2019-03-26 11:18:15 +01:00
fbsanchez	1238f15190	discovery task advanced summary support ... Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81	2019-03-25 17:32:18 +01:00
fermin831	2711eb59ea	Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/extras/mr/26.sql pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql pandora_console/pandoradb.sql Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395	2019-03-25 09:20:06 +01:00
fermin831	af9936c78f	Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/install.php Former-commit-id: 13c6146ea07be2c0d1bb571e70c644f1f68ae2bc	2019-03-21 13:26:55 +01:00
fbsanchez	6fb6963501	Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 ... Former-commit-id: 9df9a4c3a4a50e191af5167129df1352e712171e	2019-03-20 17:40:08 +01:00
fermin831	a0f4163c1d	Fix netflow filters on database ... Former-commit-id: ae1326117f0a78f2234485f1a260df2923e6ce6b	2019-03-20 17:19:56 +01:00