Commit Graph

4935 Commits

Author SHA1 Message Date
artica e695a3f5b5 Auto-updated build strings. 2020-04-15 01:00:17 +02:00
fbsanchez 7024863fd7 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
Conflicts:
	pandora_console/extras/mr/37.sql
2020-04-14 16:06:17 +02:00
fbsanchez 36daf76cc5 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
Conflicts:
	pandora_console/extras/mr/37.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2020-04-14 12:00:15 +02:00
fbsanchez 3b71297d56 escaped single quotes (wmi) + refresh button 2020-04-14 11:57:18 +02:00
fbsanchez 0282dae05a Tools.pm definition retrieved from 5575 2020-04-14 09:57:01 +02:00
artica 60ee065f8b Auto-updated build strings. 2020-04-14 01:00:15 +02:00
fbsanchez 1057f76e5e undo changes, maintain classic ATF calculation 2020-04-13 17:50:18 +02:00
fbsanchez cf67dda2eb prioritize AFT relationships 2020-04-13 17:26:49 +02:00
fbsanchez f6746ba9d8 parent calculation 2020-04-13 17:16:47 +02:00
fbsanchez 189d85d659 minor fix 2020-04-13 15:30:13 +02:00
fbsanchez 7395410831 fix parent-connection 2020-04-13 15:04:03 +02:00
fbsanchez 9c74306e95 minor change 2020-04-13 14:11:43 +02:00
fbsanchez 32538e659a Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-04-13 10:36:47 +02:00
artica 8d27ff9350 Auto-updated build strings. 2020-04-13 01:00:08 +02:00
artica 8b609e2d26 Auto-updated build strings. 2020-04-11 01:00:15 +02:00
artica 017fdea2c7 Auto-updated build strings. 2020-04-10 01:00:14 +02:00
artica 6425d4d86d Auto-updated build strings. 2020-04-09 01:00:18 +02:00
fbsanchez a75964fcba minor fix 2020-04-08 16:06:39 +02:00
fbsanchez 8a0215dcc9 minor fixes 2020-04-08 14:14:03 +02:00
fbsanchez bb11403c4b Fixes - default module 2020-04-08 13:01:11 +02:00
fbsanchez 5c405b1d32 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-04-08 10:18:13 +02:00
fbsanchez ce5868bbc4 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-08 10:03:51 +02:00
artica 987d8f4c75 Auto-updated build strings. 2020-04-08 01:00:21 +02:00
fbsanchez f88dceb4ec Some missing functions 2020-04-07 19:03:10 +02:00
fbsanchez 762ad3106d Improvements and fixes H&D with review 2020-04-07 18:50:56 +02:00
fbsanchez 72d20a6e57 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
Conflicts:
	pandora_console/godmode/wizards/DiscoveryTaskList.class.php
2020-04-07 12:55:27 +02:00
Daniel Rodriguez 18622f4d0a Merge branch 'ent-5517-9676-correlacion-nueva-hace-que-salten-mil-alertas-en-poco-tiempo' into 'develop'
Minor change

See merge request artica/pandorafms!3125
2020-04-07 10:58:47 +02:00
artica 77b267c596 Auto-updated build strings. 2020-04-07 01:00:15 +02:00
fbsanchez 890cfe68aa multiple fixes 2020-04-06 18:04:53 +02:00
fbsanchez eb64fd8758 minor fixes 2020-04-06 16:10:37 +02:00
fbsanchez 5205e0e06f minor update 2020-04-06 12:05:03 +02:00
fbsanchez 2d4b977d26 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-06 11:05:18 +02:00
fbsanchez 72f026f152 Minor fixes, group and review while exceeded license 2020-04-06 11:04:53 +02:00
artica a8043e98f9 Auto-updated build strings. 2020-04-06 01:00:14 +02:00
artica e013e26892 Auto-updated build strings. 2020-04-05 01:00:14 +02:00
artica d18dbc10e7 Auto-updated build strings. 2020-04-04 01:00:20 +02:00
Daniel Rodriguez a901e91274 Merge branch 'ent-5652-Grafica-de-modulo-en-los-email-gigante' into 'develop'
Ent 5652 grafica de modulo en los email gigante

See merge request artica/pandorafms!3135
2020-04-03 12:28:28 +02:00
artica 297693a9d3 Auto-updated build strings. 2020-04-03 01:00:18 +02:00
fbsanchez 79378994b4 schema minor fixes 2020-04-02 17:56:17 +02:00
Daniel Maya 9b1d8a52de Fixed graph height when send email by alert 2020-04-02 14:58:03 +02:00
Daniel Rodriguez 1c596ea8af Merge branch 'ent-5640-9818-Alertas-SNMP-no-inserta-grupo-en-creacion-de-eventos' into 'develop'
Ent 5640 9818 alertas snmp no inserta grupo en creacion de eventos

See merge request artica/pandorafms!3127
2020-04-02 14:33:00 +02:00
artica e30b9a32d8 Auto-updated build strings. 2020-04-02 01:00:16 +02:00
fbsanchez bb1ad4d2a9 Updates sat. compatibility 2020-04-01 18:16:57 +02:00
fbsanchez e249233205 minor fixes 2020-04-01 16:43:04 +02:00
artica f68d84940c Auto-updated build strings. 2020-04-01 01:00:19 +02:00
Daniel Maya 3f8948bc21 Added id_group in snmp alert 2020-03-31 15:26:41 +02:00
fbsanchez fec4f37cf4 Minor change 2020-03-31 12:02:53 +02:00
fbsanchez 3ad3a07d93 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-03-31 10:02:52 +02:00
artica a2106a2056 Auto-updated build strings. 2020-03-31 01:00:18 +02:00
fbsanchez acabe543c4 csv recon0 2020-03-30 19:44:44 +02:00