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

25623 Commits

Author SHA1 Message Date
Daniel Rodriguez 6a31a28679 Merge branch 'ent-6410-Wizard-SNMP-SNMP-Interfaces-y-WMI-no-autocompletan-Target-IP-con-IP-del-agente' into 'develop' 
Ent 6410 wizard snmp snmp interfaces y wmi no autocompletan target ip con ip del agente

See merge request artica/pandorafms!3588
 2020-11-03 10:26:24 +01:00
fbsanchez 8202839888 warn while updating user admin > standar 2020-11-03 10:14:17 +01:00
fbsanchez 5ddb3f4421 title for dialog (user form) 2020-11-03 10:11:18 +01:00
fbsanchez 8b01565948 Avoid confirm dialog while profiles are assigned to user 2020-11-03 10:08:23 +01:00
fbsanchez 95ed4c9665 Merge remote-tracking branch 'origin/develop' into ent-6577-creacion-de-usuario-con-global-profile-administrator-no-deberia-necesitar-anadirle-mas-perfiles 2020-11-03 10:02:45 +01:00
artica 58aa1d7a0e Auto-updated build strings. 2020-11-03 01:00:17 +01:00
artica d8fcfd0da4 Auto-updated build strings. 2020-11-02 01:00:16 +01:00
artica 4c298531a9 Auto-updated build strings. 2020-11-01 01:00:15 +01:00
artica 3e181c4b01 Auto-updated build strings. 2020-10-31 01:00:26 +01:00
Daniel Rodriguez d171d84595 Merge branch 'ent-6678-Bug-en-select-de-nodos-de-TODOS-los-items-en-metaconsola' into 'develop' 
Fix combo server in reports builder

See merge request artica/pandorafms!3589
 2020-10-30 14:43:38 +01:00
Daniel Rodriguez 4f1faf6a14 Merge branch 'ent-6677-error-sql-en-item-group-alert-report-metaconsola' into 'develop' 
fix group alert report

See merge request artica/pandorafms!3587
 2020-10-30 14:43:28 +01:00
Daniel Rodriguez 946c548244 Merge branch 'ent-6626filtros-de-eventos-personalizados-no-guardia-varios-apartados' into 'develop' 
Primeras modificaciones del filtro de eventos

See merge request artica/pandorafms!3585
 2020-10-30 14:42:41 +01:00
Daniel Rodriguez 4eb5a11877 Merge branch 'ent-6586-Al-realizar-una-accion-en-evento-no-cambia-el-owner-acknowledge-by-en-la-pestaña-general' into 'develop' 
fix events acknowledge-by

See merge request artica/pandorafms!3565
 2020-10-30 14:42:10 +01:00
daniel c4e7c6b5f1 fix events acknowledge-by 2020-10-30 14:42:10 +01:00
Daniel Rodriguez 0fad0d7f01 Merge branch 'ent-6336-ifHCXXXX-nuevo-wizard-snmp-interfaces-fix' into 'develop' 
Fixed oid for getting x64 interfaces module. Fixed visual (module order) bug

See merge request artica/pandorafms!3556
 2020-10-30 14:41:33 +01:00
Luis 25de1b686a Fixed oid for getting x64 interfaces module. Fixed visual (module order) bug 2020-10-30 14:41:33 +01:00
Daniel Rodriguez 4e67371967 Merge branch 'ent-6615-Authentication-bypass' into 'develop' 
fixed authentication bypass

See merge request artica/pandorafms!3576
 2020-10-30 14:40:27 +01:00
fbsanchez 6267af774b Merge branch 'develop' into 'ent-6677-error-sql-en-item-group-alert-report-metaconsola' 
Conflicts:
pandora_console/include/functions_alerts.php
 2020-10-30 13:33:52 +01:00
Daniel Barbero Martin f1080757a0 Fix combo server in reports builder 2020-10-30 13:30:59 +01:00
Daniel Rodriguez 55517ab53a Merge branch 'ent-6526-Error-SQL-en-la-vista-HTML-del-item-Group-Event-Report-de-templates' into 'develop' 
Fixed template events

See merge request artica/pandorafms!3535
 2020-10-30 13:29:50 +01:00
daniel b3043c2e01 Fixed template events 2020-10-30 13:29:50 +01:00
Daniel Rodriguez 2063849dd0 Merge branch 'ent-6569-Exportado/importado-de-informes' into 'develop' 
fix exportation/exportation

See merge request artica/pandorafms!3563
 2020-10-30 13:29:04 +01:00
Daniel Rodriguez 79db1c3236 Merge branch 'ent-6599-errores-en-filtro-de-monitor-detail' into 'develop' 
removed strict-user from monitor detail

See merge request artica/pandorafms!3568
 2020-10-30 13:28:35 +01:00
Daniel Maya bde52df2e8 Added datalist for target ip 2020-10-30 13:25:33 +01:00
Daniel Rodriguez 0a3c001127 Merge branch 'ent-6629-Tree-view-contador-de-grupos' into 'develop' 
fix counter groups child

See merge request artica/pandorafms!3578
 2020-10-30 13:23:47 +01:00
daniel 4e2d5bdf2b fix counter groups child 2020-10-30 13:23:47 +01:00
Daniel Rodriguez 64df831302 Merge branch 'ent-6657-Se-quedan-bloqueados-zooms-en-las-graficas' into 'develop' 
fix charts

See merge request artica/pandorafms!3581
 2020-10-30 13:23:03 +01:00
Daniel Rodriguez 9a5291da5a Merge branch 'ent-6578-Bugs-eventos-sonoros-3' into 'develop' 
fixed sound events

See merge request artica/pandorafms!3566
 2020-10-30 12:16:54 +01:00
Daniel Rodriguez a047ca8181 Merge branch 'ent-6576-macros-de-respuestas-de-eventos-que-no-funcionan' into 'develop' 
fixes in event macros (responses)

See merge request artica/pandorafms!3560
 2020-10-30 11:32:09 +01:00
fbsanchez 2376ef408b Update functions_events.php resolve entities for group_name in event responses 2020-10-30 11:22:39 +01:00
Daniel Rodriguez fe90008d17 Merge branch 'ent-6587-bug-historico-comentarios-eventos' into 'develop' 
Handled comments for validated comments

Closes pandora_enterprise#6587

See merge request artica/pandorafms!3564
 2020-10-30 10:46:52 +01:00
artica 8c92e5420d Auto-updated build strings. 2020-10-30 01:00:21 +01:00
fbsanchez 45e8efa089 minor fix 2020-10-29 18:47:34 +01:00
Daniel Rodriguez 6772df70eb Merge branch 'ent-6557-postprocess-genera-lineas-repetidas-en-la-edicion-de-modulos-de-agente' into 'develop' 
fixed error

See merge request artica/pandorafms!3572
 2020-10-29 18:20:33 +01:00
Marcos Alconada 8e4c62a0e9 fixed error 2020-10-29 18:20:33 +01:00
Daniel Rodriguez 6161ba078f Merge branch 'ent-6658-Aparece-timestap-en-vez-de-timestamp-en-csv-exportado-de-graficas-y-faltan-labels' into 'develop' 
fixed csv charts

See merge request artica/pandorafms!3582
 2020-10-29 18:19:35 +01:00
Daniel Rodriguez e0b0ab8b42 Merge branch 'ent-6579-Faltan-macros-de-agente-en-respuestas-de-eventos' into 'develop' 
Ent 6579 faltan macros de agente en respuestas de eventos

See merge request artica/pandorafms!3562
 2020-10-29 18:17:22 +01:00
fbsanchez c4d9c0851a safe output in _event_date_ (custom responses) 2020-10-29 18:08:02 +01:00
fbsanchez b92cfc6c10 Merge remote-tracking branch 'origin/develop' into ent-6576-macros-de-respuestas-de-eventos-que-no-funcionan 2020-10-29 18:00:17 +01:00
fbsanchez 742cbcb5c5 fix group alert report 2020-10-29 17:54:40 +01:00
fbsanchez 26e809dc37 fix group alert report 2020-10-29 17:53:34 +01:00
fbsanchez 20fa959a0c Merge remote-tracking branch 'origin/develop' into ent-6577-creacion-de-usuario-con-global-profile-administrator-no-deberia-necesitar-anadirle-mas-perfiles 
Conflicts:
	pandora_console/godmode/users/configure_user.php
 2020-10-29 17:26:05 +01:00
Daniel Maya 785e187f5c Fixed special characters 2020-10-29 17:22:02 +01:00
Daniel Rodriguez 495decdf5f Merge branch 'ent-6495-campo-ip-de-servidores-se-limita-a-la-hora-de-guardarlo' into 'develop' 
fixed error 6495

See merge request artica/pandorafms!3539
 2020-10-29 16:39:00 +01:00
Marcos Alconada f8511de008 fixed error 6495 2020-10-29 16:39:00 +01:00
Daniel Rodriguez 12b36e7f5a Merge branch 'ent-6554-status-vacio-al-exportar-eventos-a-csv' into 'develop' 
fixed error with value status field

See merge request artica/pandorafms!3548
 2020-10-29 15:15:52 +01:00
Marcos Alconada b972bc627a Update event_edit_filter.php 2020-10-29 15:04:53 +01:00
marcos 765d37d4e9 formato funcion 2020-10-29 15:06:01 +01:00
marcos 6bcca915ba resuelto el error que vaciaba el module search 2020-10-29 14:57:54 +01:00
Daniel Rodriguez a7a2bdf831 Merge branch 'ent-6483-bug-en-la-recursion-de-grupos-del-item-group-report-de-informes' into 'develop' 
Ent 6483 bug en la recursion de grupos del item group report de informes

See merge request artica/pandorafms!3549
 2020-10-29 14:56:04 +01:00