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

25583 Commits

Author SHA1 Message Date
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 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
Daniel Rodriguez 4f3e09c6c3 Merge branch 'ent-6488-URL-creación-de-agentes-sin-redireccionar-se-crea-agente-con-grupo-0' into 'develop' 
Ent 6488 url creación de agentes sin redireccionar se crea agente con grupo 0

See merge request artica/pandorafms!3541
 2020-10-29 13:43:10 +01:00
Daniel Rodriguez d5a57156dc Merge branch 'ent-6487-visual-console-favourites-page-constantly-reloads' into 'develop' 
Fix continous reload page cased by automatic form submit

See merge request artica/pandorafms!3561
 2020-10-29 13:22:10 +01:00
fbsanchez 98a04bfcf8 omg... what a file 2020-10-29 12:55:44 +01:00
Daniel Rodriguez 13fe65b06b Merge branch 'ent-6482-Fallo-en-la-agrupación-de-eventos' into 'develop' 
Ent 6482 fallo en la agrupación de eventos

See merge request artica/pandorafms!3567
 2020-10-29 12:53:09 +01:00
Daniel Maya 43ca5e4972 Ent 6482 fallo en la agrupación de eventos 2020-10-29 12:53:09 +01:00
fbsanchez 2748f0ac29 Merge remote-tracking branch 'origin/develop' into ent-6599-errores-en-filtro-de-monitor-detail 2020-10-29 12:41:24 +01:00
Daniel Rodriguez 8144d3bc95 Merge branch 'ent-6497-bug-en-item-group-alert-report-seleccionando-el-grupo-all' into 'develop' 
Forced recursion while selecting All group - group_alert_report

See merge request artica/pandorafms!3543
 2020-10-29 12:40:43 +01:00
Daniel Rodriguez 83233b6192 Merge branch 'ent-6485-bug-en-la-recursion-de-grupos-del-item-agents-modules-de-informes' into 'develop' 
groups_get_children and propagate update

See merge request artica/pandorafms!3545
 2020-10-29 12:36:49 +01:00
marcos cf108c0a17 se cambia el valor del modulo y marca en el filtro usado 2020-10-29 12:30:54 +01:00
fbsanchez 79c927628d Merge remote-tracking branch 'origin/develop' into ent-6599-errores-en-filtro-de-monitor-detail 2020-10-29 12:24:39 +01:00
Daniel Rodriguez 5ae4330121 Merge branch 'ent-6555-No-hay-mensaje-de-aviso-al-eliminar-perfil-del-usuario-en-metaconsola-da-error' into 'develop' 
Ent 6555 no hay mensaje de aviso al eliminar perfil del usuario en metaconsola da error

See merge request artica/pandorafms!3551
 2020-10-29 12:21:57 +01:00
Daniel Rodriguez 97148271bf Merge branch 'ent-6533-module-groups-error-sql-en-paginacion' into 'develop' 
Ent 6533 module groups error sql en paginacion

See merge request artica/pandorafms!3536
 2020-10-29 12:21:22 +01:00
Daniel Rodriguez 4ed68fee56 Merge branch 'ent-6477-error-en-la-seleccion-de-grupos-de-dashboards' into 'develop' 
Minor fix all group empty label

See merge request artica/pandorafms!3542
 2020-10-29 12:20:35 +01:00
fbsanchez 24ba5f2615 Merge remote-tracking branch 'origin/develop' into ent-6599-errores-en-filtro-de-monitor-detail 2020-10-29 12:13:21 +01:00
fbsanchez fe681ba9d7 minor style added 2020-10-29 12:13:15 +01:00
fbsanchez 3e1a89dab7 groups_get_cChildren 2020-10-29 11:21:56 +01:00
fbsanchez 6112b3e932 minor fix 2020-10-29 10:55:07 +01:00
marcos edc9038783 Primeras modificaciones del filtro de eventos 2020-10-29 10:24:37 +01:00
Daniel Rodriguez a8cadc6d5c Merge branch 'ent-6496-Bug-en-leyenda-de-la-grafica-del-item-Network-interfaces-de-informes' into 'develop' 
fixed legend avg network interfaces

See merge request artica/pandorafms!3537
 2020-10-29 09:48:49 +01:00
Daniel Rodriguez 5d4723ba15 Merge branch 'ent-6470-error-componentes-remotos' into 'develop' 
Ent 6470 error componentes remotos

Closes pandora_enterprise#6470

See merge request artica/pandorafms!3558
 2020-10-29 09:48:25 +01:00
artica 860024a11a Auto-updated build strings. 2020-10-29 01:00:21 +01:00
Daniel Rodriguez 7a776cd270 Merge branch 'ent-6469-entities-componentes-remotos' into 'develop' 
Ent 6469 entities componentes remotos

Closes pandora_enterprise#6469

See merge request artica/pandorafms!3569
 2020-10-28 17:15:59 +01:00
Daniel Barbero Martin 170ee5b9a5 fixed csv charts 2020-10-28 15:36:38 +01:00
Daniel Rodriguez 318094d758 Merge branch 'ent-6478-Bug-en-la-vista-HTML-y-PDF-de-los-items-AVG-MAX-MIN-Value-de-informes-y-templates' into 'develop' 
fixed report avg-min-max

See merge request artica/pandorafms!3540
 2020-10-28 15:19:32 +01:00
Daniel Rodriguez 57a4db6f68 Merge branch 'ent-6476-Bug-en-descarga-CSV-en-item-SLA-y-fallos-visuales' into 'develop' 
fixed error report SLA CSV and Visuals

See merge request artica/pandorafms!3546
 2020-10-28 15:18:51 +01:00
Daniel Rodriguez 8a47210dd5 Merge branch 'ent-6531-Bug-en-item-Simple-graph-de-informes-metaconsola' into 'develop' 
fixed error report selector modules in metaconsole

See merge request artica/pandorafms!3544
 2020-10-28 15:18:22 +01:00
Daniel Rodriguez 4a89a91899 Merge branch 'ent-6481-no-funciona-autovalidacion-eventos-meta' into 'develop' 
Fixed api create_event autovalidation on meta

See merge request artica/pandorafms!3552
 2020-10-28 13:09:01 +01:00
Daniel Barbero Martin 9b81da193b fix charts 2020-10-28 12:50:15 +01:00
Daniel Rodriguez 5278a80d4c Merge branch 'ent-6512-error-en-acls-de-alertas' into 'develop' 
Ent 6512 error en acls de alertas

See merge request artica/pandorafms!3538
 2020-10-28 11:41:30 +01:00
Marcos Alconada 94cfd51501 Ent 6512 error en acls de alertas 2020-10-28 11:41:30 +01:00
Daniel Rodriguez 0a24fedb5a Merge branch 'ent-6606-mostrar-descripcion-de-servicios-en-vista-de-arbol' into 'develop' 
Use service description instead of name in tree view

See merge request artica/pandorafms!3570
 2020-10-28 11:19:49 +01:00
Daniel Rodriguez fa9f4bca95 Merge branch 'ent-6580-bug-en-la-edicion-de-grupos-asignando-como-padre-a-si-mismo' into 'develop' 
exclude branch from select_for_Groups given group_id

See merge request artica/pandorafms!3550
 2020-10-28 11:19:05 +01:00
artica 288b81dcc4 Auto-updated build strings. 2020-10-28 01:00:18 +01:00
Daniel Rodriguez b3e6ef58bd Merge branch 'ent-6641-Recon-task-no-admite-SNMP' into 'develop' 
Snmp and WMI in recon task move open

See merge request artica/pandorafms!3579
 2020-10-27 17:37:12 +01:00
fbsanchez f744261821 minor fix 2020-10-27 16:03:35 +01:00
Daniel Rodriguez 8ea3a5a578 Merge branch 'ent-6604-Perdida-de-conexion-con-el-servidor-en-consolas-visuales-con-link-publico-y-autorefresco' into 'develop' 
fixed connection check in public link of visual consoles

See merge request artica/pandorafms!3573
 2020-10-27 15:58:13 +01:00