Commit Graph

15 Commits

Author SHA1 Message Date
Daniel Barbero Martin 39e603e908 fixed mr version and remove updates mr 2021-02-17 14:27:16 +01:00
Daniel Barbero Martin 234097320f fixed mr version and remove updates mr 2021-02-17 13:04:59 +01:00
Luis 905f8801b7 Update 44.sql 2021-01-27 13:37:20 +01:00
Luis Calvo f2addc837a Merge remote-tracking branch 'origin/develop' into ent-6126-add-csv-json-save-to-disk-console-task 2021-01-27 09:25:12 +01:00
Luis Calvo dc3ee2d553 Added task save report to disk changes to MR 2021-01-26 16:36:13 +01:00
Daniel Rodriguez 9b92c5ff34 Merge branch 'ent-6932-Tags-no-entran-en-base-de-datos' into 'develop'
Ent 6932 tags no entran en base de datos

See merge request artica/pandorafms!3776
2021-01-25 10:15:29 +01:00
alejandro-campos 9c924db8dc Merge branch 'develop' into ent-6855-Casca-netscan-custom-en-la-open 2021-01-18 10:29:06 +01:00
Daniel Maya ca17e9cfcb change in column name of ttag 2021-01-15 09:50:40 +01:00
daniel a470658543 remove IPAM to extension 2021-01-14 14:42:18 +01:00
Daniel Rodriguez 7bbecceacc Merge branch 'ent-6779-Cambio-label-en-campo-de-alertas-SNMP' into 'develop'
Ent 6779 cambio label en campo de alertas snmp

See merge request artica/pandorafms!3661
2021-01-11 14:58:14 +01:00
fbsanchez dd08b7937c Set default value for review_mode to 1 instead 0 2021-01-07 14:36:56 +01:00
Daniel Maya f2b673b62b merge conflict resolved 2021-01-04 09:16:14 +01:00
alejandro-campos f03b4e59f8 several fixes in netscan custom 2020-12-18 11:40:22 +01:00
Jose Gonzalez 279a4124f1 Database changes 2020-12-03 15:51:08 +01:00
Daniel Maya fc83121969 Changed event criticity 2020-11-26 13:22:59 +01:00