tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,224 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

23224 Commits

Author SHA1 Message Date
Luis 41e818334e Ent 4954 urls documentacion soporte al fallar base datos 2019-11-21 11:14:50 +01:00
Daniel Maya 791454ee87 Added Group by in tree view 2019-11-21 10:22:51 +01:00
Daniel Rodriguez 775289fc20 Merge branch 'ent-4550-ACL-acceso-denegado-detalles-agente-icono-grupo' into 'develop' 
Changed definition of link in group icon

See merge request artica/pandorafms!2891
 2019-11-21 10:21:07 +01:00
Marcos Alconada 34cdcdfd6e Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' 
# Conflicts:
#   pandora_console/extras/mr/29.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
#   pandora_console/include/functions_events.php
 2019-11-21 10:13:00 +01:00
Daniel Barbero 17e7710f45 add datepicker alert correlation 2019-11-21 09:05:34 +01:00
artica 23e64ab781 Auto-updated build strings. 2019-11-21 00:01:18 +01:00
fbsanchez 6996969995 Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
 2019-11-20 18:23:17 +01:00
fbsanchez b02e22c8f2 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-20 18:21:30 +01:00
fbsanchez 624a1e0086 WIP alert correlation 2019-11-20 18:17:43 +01:00
marcos 294c160622 semifinal sap sap view agent 2019-11-20 18:01:07 +01:00
Daniel Rodriguez 3a3cd5c1c5 Merge branch 'ent-4769-modulos-ssh-php-perl' into 'develop' 
modulos ssh php perl

See merge request artica/pandorafms!2799
 2019-11-20 17:26:15 +01:00
Daniel Maya fad70cfdc0 fixed secondary group in events 2019-11-20 16:34:56 +01:00
Daniel Barbero Martin fb6013bd62 Wip alert correlation 2019-11-20 15:55:08 +01:00
fbsanchez 3b636a12ce Merge remote-tracking branch 'origin/ent-4769-modulos-ssh-php-perl' into ent-EDF 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-11-20 15:53:00 +01:00
fbsanchez e9432aaaa5 Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-11-20 15:51:47 +01:00
Daniel Barbero Martin 61568ee3b7 Add button diagnostic 2019-11-20 13:26:02 +01:00
Daniel Barbero Martin 4d7f92e3f0 Add button diagnostic 2019-11-20 13:25:16 +01:00
Alejandro Fraguas 2469b65192 Merge branch 'ent-4841-8948-Errores-migrate_pandora-6-a-7' into 'develop' 
fix migrate missing content

See merge request artica/pandorafms!2840
 2019-11-20 13:17:45 +01:00
alejandro-campos 4d332f2bef fix duplicated operation in migrate file 2019-11-20 12:43:08 +01:00
fbsanchez 446d6c3507 Fix windows commands 2019-11-20 12:35:55 +01:00
fbsanchez 79a135b077 Fix errata DESC => COMMENT 2019-11-20 11:36:15 +01:00
alejandro-campos 33b11af3c1 fix missing line in migrate 2019-11-20 11:26:28 +01:00
alejandro-campos 8295f70ae0 Merge remote-tracking branch 'origin/develop' into ent-4841-8948-Errores-migrate_pandora-6-a-7 2019-11-20 11:23:16 +01:00
fbsanchez 35bd29d222 Merge branch 'ent-4610-Alertas-de-logs' of brutus.artica.lan:artica/pandorafms into ent-4610-Alertas-de-logs 2019-11-20 10:40:57 +01:00
fbsanchez 43ecba3bbb operator fields for event_rule 2019-11-20 10:40:52 +01:00
Daniel Barbero Martin 9db7bd37f2 Merge remote-tracking branch 'origin/ent-4769-modulos-ssh-php-perl' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
 2019-11-20 10:12:23 +01:00
Daniel Barbero Martin 556d6e6d01 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-20 10:10:34 +01:00
Daniel Barbero Martin 6bf9ceac3e fixed minor error 2019-11-20 10:00:57 +01:00
Daniel Barbero Martin 67fb2216d4 Fix 2019-11-20 09:48:35 +01:00
Daniel Barbero Martin cd8f52fd92 WIP alert correlations 2019-11-20 09:11:03 +01:00
artica 12123d68df Auto-updated build strings. 2019-11-20 00:01:37 +01:00
fbsanchez 9cea131378 WIP CorrelatedAlerts 2019-11-19 23:35:29 +01:00
fbsanchez 471389a72a Merge branch 'develop' into 'ent-4769-modulos-ssh-php-perl' 
Conflicts:
   pandora_console/extras/mr/33.sql
 2019-11-19 14:11:38 +01:00
Daniel Barbero Martin 1b5dcc3e28 Fixed errors in remote command 2019-11-19 12:35:52 +01:00
Alejandro Fraguas aa4ae996d2 Merge branch 'ent-4986-La-vista-Module-Groups-se-ve-con-cualquier-grupo-asignado-al-usuario' into 'develop' 
Ent 4986 la vista module groups se ve con cualquier grupo asignado al usuario

See merge request artica/pandorafms!2894
 2019-11-19 12:22:01 +01:00
fbsanchez be1e4324d2 missed port 2019-11-19 12:02:10 +01:00
fbsanchez 0fd95647ea log_window 2019-11-19 11:56:11 +01:00
artica 04076a04b1 Auto-updated build strings. 2019-11-19 00:01:12 +01:00
fbsanchez 83e7d5a701 Minor fixes 2019-11-18 19:32:57 +01:00
marcos 76b7e52107 update branch 2019-11-18 18:46:57 +01:00
manuel fe1e7da0ed Adjusted margin on static image item 2019-11-18 17:36:16 +01:00
Tatiana Llorente 15aaf0cae6 Added acl checks to module groups view 2019-11-18 17:18:40 +01:00
alejandro-campos 070fe32d1e Merge remote-tracking branch 'origin/develop' into ent-4841-8948-Errores-migrate_pandora-6-a-7 2019-11-18 16:27:12 +01:00
fbsanchez 6a3db40d56 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-18 16:12:01 +01:00
Daniel Barbero 8811095a3e WIP ALerts 2019-11-18 15:25:35 +01:00
Daniel Barbero 79f5e879cc WIP Alerts 2019-11-18 13:37:10 +01:00
fbsanchez 443eb1168c Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs 2019-11-18 12:48:31 +01:00
fbsanchez 6126503285 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-18 12:30:51 +01:00
fbsanchez 61ccd5bdbc help_link omnishell 2019-11-18 12:30:12 +01:00
Alejandro Fraguas 0c30047da5 Merge branch 'ent-4930-create_event-no-anade-comentarios-evento' into 'develop' 
Solution for lost comments in the events section modal window

See merge request artica/pandorafms!2884
 2019-11-18 12:29:32 +01:00