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

4593 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 5757d4a933 implement csv export of events in meta and minor fixes 2022-03-23 14:24:39 +01:00
Daniel Barbero Martin 76d8918a4e fixed CV in console mobile metaconsole #8676 2022-03-21 10:04:11 +01:00
alejandro.campos@artica.es e1ec4ce40e change storage format of custom data field in DB 2022-03-18 11:23:29 +01:00
Daniel Rodriguez 59b51ea606 Merge branch 'ent-8624-command-snapshow-view-debe-mostrar-fuentes-monoespacio' into 'develop' 
Command snapshot monospaced font

See merge request artica/pandorafms!4762
 2022-03-17 08:55:29 +00:00
Daniel Rodriguez b582fff47e Merge branch 'ent-8679-Vulnerabilidad-File-Manager' into 'develop' 
Fix upload of not wanted files in File Manager

See merge request artica/pandorafms!4754
 2022-03-15 10:08:48 +00:00
Daniel Rodriguez d7598cefa5 Merge branch 'ent-8662-modulos-modulo-padre-no-se-ven-en-tree-view' into 'develop' 
Clean filtered references for parent modules

See merge request artica/pandorafms!4744
 2022-03-15 10:06:18 +00:00
Calvo 6067f356e9 Command snapshot monospaced font 2022-03-15 09:21:34 +01:00
Daniel Rodriguez 185be2ddb8 Merge branch 'ent-8374-12855-giss-agentes-deshabilitados-en-meta' into 'develop' 
Addedd metaconsole tree view filter for disabled agents

See merge request artica/pandorafms!4725
 2022-03-11 11:38:05 +00:00
Daniel Rodriguez a67b6647f7 Merge branch 'ent-2152-Operaciones-masivas-de-grupos-secundarios' into 'develop' 
bulk operation edit agents add secundary groups pandora_enterprise#2152

See merge request artica/pandorafms!4677
 2022-03-11 08:51:33 +00:00
José González 73838ef843 Fix upload of not wanted files in File Manager 2022-03-09 17:27:08 +01:00
Daniel Barbero Martin 0d6570ea24 fixed error massive operation agents #2152 2022-03-09 15:12:26 +01:00
Daniel Rodriguez c1dd265085 Merge branch 'ent-8381-Bug-interfaces-view' into 'develop' 
Fixed issues with interfaces view and limited to show only agents with ifaces

See merge request artica/pandorafms!4712
 2022-03-09 12:54:04 +00:00
Daniel Maya 04f6cfc94f added heatmap 2022-03-07 12:50:36 +01:00
José González 89d5b490bf Clean filtered references for parent modules 2022-03-07 10:45:11 +01:00
Daniel Maya f34e8fead7 Merge branch 'develop' into ent-8458-heatmap-view 2022-03-07 10:35:26 +01:00
Calvo 05c283642f Addedd metaconsole tree view filter for disabled agents 2022-02-25 15:37:08 +01:00
Daniel Maya 74996e3cc0 WIP heatmap 2 2022-02-25 09:41:32 +01:00
fbsanchez deb46436d3 Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 
Conflicts:
	pandora_console/extras/mr/52.sql
 2022-02-23 12:11:44 +01:00
José González 604633dd35 Fixed issues with interfaces view and limited to show only agents with ifaces 2022-02-22 12:37:01 +01:00
Daniel Maya d73fd0450d Merge branch 'develop' into ent-8458-heatmap-view 2022-02-21 10:18:15 +01:00
Daniel Rodriguez 45b97be611 Merge branch 'ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad' into 'develop' 
Added token local user to allow enabling local auth  at user level

See merge request artica/pandorafms!4668
 2022-02-18 11:04:06 +00:00
Calvo 5ba7b47b85 Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad 2022-02-18 09:26:55 +01:00
Daniel Maya 3c50164270 WIP heatmap 2022-02-11 14:50:57 +01:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
José González fc4b702db0 Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' 
# Conflicts:
#   pandora_console/godmode/alerts/configure_alert_template.php
 2022-02-08 11:35:01 +00:00
fbsanchez 331f8e8906 php8 incompatibility fixes 2022-02-07 13:48:25 +01:00
fbsanchez ef01e19de9 php8 incompatibility fixes 2022-02-07 13:40:42 +01:00
fbsanchez 8b09c49871 minor errata fix 2022-02-07 11:56:00 +01:00
Daniel Barbero Martin dca70fa8ec Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-02-07 08:04:36 +01:00
fbsanchez 48ca83aa76 errata fix 2022-02-04 13:33:46 +01:00
fbsanchez e1776d7994 removed collation from filtering 2022-02-04 13:26:03 +01:00
fbsanchez a298b25a38 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-03 17:55:34 +01:00
Daniel Rodriguez 867dbc7d5c Merge branch 'ent-8518-Bug-en-link-a-graficas-en-Monitor-Detail' into 'develop' 
fix link pandora_enterprise#8518

See merge request artica/pandorafms!4674
 2022-02-03 10:21:15 +00:00
Daniel Rodriguez 9240533de5 Merge branch 'ent-7430-Fallos-visuales-en-Mapas-GIS' into 'develop' 
Ent 7430 fallos visuales en mapas gis

See merge request artica/pandorafms!4657
 2022-02-02 14:05:11 +00:00
Daniel Barbero Martin f342a218ba fix link pandora_enterprise#8518 2022-02-02 13:51:04 +01:00
fbsanchez 17be6f3ca5 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-02 11:36:14 +01:00
Daniel Rodriguez 110052a21f Merge branch 'ent-8428-12919-visualizacion-agentes-en-operaciones-masivas-de-modulos' into 'develop' 
Ent 8428 12919 visualizacion agentes en operaciones masivas de modulos

See merge request artica/pandorafms!4666
 2022-02-02 09:37:15 +00:00
fbsanchez 5b06942caf DANGER COMMIT, uses schema collation instead forced one 2022-02-01 15:18:45 +01:00
fbsanchez 592df1c3a7 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-01 15:16:21 +01:00
José González 36bef528ab Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' 
# Conflicts:
#   pandora_console/godmode/massive/massive_delete_agents.php
 2022-02-01 12:45:17 +00:00
Jose Gonzalez 40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
Daniel Barbero Martin 0a4d6cfd31 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-02-01 11:36:33 +01:00
Daniel Rodriguez d21d65a7ac Merge branch 'ent-8206-busqueda-de-modulos-en-graficas-personalizadas' into 'develop' 
Added select filtered modulo to custom graphs conf menu

See merge request artica/pandorafms!4647
 2022-02-01 09:38:12 +00:00
Daniel Rodriguez 8c01afafdb Merge branch 'ent-8170-busqueda-de-tree-view-metaconsola-se-descuadra-con-baja-resolucion' into 'develop' 
Fix tree view filter view on meta

See merge request artica/pandorafms!4649
 2022-02-01 09:36:20 +00:00
alejandro.campos@artica.es 2b6a9f0277 show agent and module name tip 2022-01-31 15:43:56 +01:00
alejandro.campos@artica.es d210390a3d truncate texts in module massive operations 2022-01-27 17:30:20 +01:00
Daniel Maya 8a868c9fde Fixed GIs map 2022-01-26 17:15:39 +01:00
Calvo 96d0194009 Merge remote-tracking branch 'origin/develop' into ent-8206-busqueda-de-modulos-en-graficas-personalizadas 2022-01-25 15:39:58 +01:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/include/class/HTML.class.php
 2022-01-25 14:16:47 +01:00
Calvo 926d3f5627 Fix tree view filter view on meta 2022-01-25 12:57:26 +01:00
vgilc f2d0ecc304 Merge branch 'ent-7485-12717-incluir-botones-de-generacion-de-informe-en-vista-html' into 'develop' 
Added combo with all export formats to report html view

See merge request artica/pandorafms!4638
 2022-01-25 10:29:00 +00:00
vgilc 4b85e93490 Merge branch 'ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma' into 'develop' 
Ent 8222 nueva grafica desde la vista de modulos histograma

See merge request artica/pandorafms!4637
 2022-01-25 10:28:18 +00:00
vgilc b547278930 Merge branch 'ent-7988-no-se-puede-cambiar-la-skin-de-pandora-en-entorno-meta-nodo-sincronizados' into 'develop' 
Ent 7988 no se puede cambiar la skin de pandora en entorno meta nodo sincronizados

See merge request artica/pandorafms!4633
 2022-01-25 10:27:25 +00:00
vgilc fa0e3c4abb Merge branch 'ent-8208-bug-filtros-en-vista-de-alertas' into 'develop' 
Fix monitoring alert detail filter for defautl actions

See merge request artica/pandorafms!4558
 2022-01-25 10:24:42 +00:00
vgilc 4f57e0b560 Merge branch 'ent-8230-header-desalineado-con-resultados-en-buscador-general' into 'develop' 
Fix search result header alignment

See merge request artica/pandorafms!4641
 2022-01-25 10:24:04 +00:00
vgilc e8f07aa0d0 Merge branch 'ent-8389-12803-Desajuste-horas-en-consola' into 'develop' 
fixed footer timezone

See merge request artica/pandorafms!4644
 2022-01-25 09:56:50 +00:00
vgilc 26ef59d3b6 Merge branch 'ent-8426-Bug-al-editar-relación-en-mapa-de-red' into 'develop' 
Ent 8426 bug al editar relación en mapa de red

See merge request artica/pandorafms!4636
 2022-01-25 09:26:53 +00:00
fbsanchez 35184c4eb6 ws php8 2022-01-21 17:39:11 +01:00
alejandro.campos@artica.es e1e866a441 fixed footer timezone 2022-01-20 12:53:40 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
alejandro.campos@artica.es 5a19e071e9 fixed visualization of vertical bars graph when switching values on graph viewer 2022-01-19 13:34:58 +01:00
alejandro.campos@artica.es a0391e3ef2 fixed visualization of vertical bars graph when switching values on graph viewer 2022-01-19 13:33:49 +01:00
fbsanchez 28743dcb5d sizeof => count 2022-01-19 12:40:52 +01:00
Daniel Barbero Martin 6be6b1a95d add new macros #3763 2022-01-19 12:18:23 +01:00
Calvo 38ddcc4746 Fix search result header alignment 2022-01-19 11:36:54 +01:00
Calvo 891c88f458 Fix meta alert action filter counter 2022-01-18 15:34:56 +01:00
Calvo c16499720e Added combo with all export formats to report html view 2022-01-18 14:54:10 +01:00
Daniel Barbero Martin a0a74cf7bb add new chart histogram 2022-01-18 13:01:49 +01:00
Daniel Maya b2fe6780ac Fixed links in networkmaps 2022-01-18 11:39:37 +01:00
Daniel Barbero Martin 4f46da6633 Merge remote-tracking branch 'origin/develop' into ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-01-18 10:17:19 +01:00
Daniel Maya 5ae7afccfc Fixed pandora_black in metaconsole 2 2022-01-17 11:32:51 +01:00
Daniel Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
Calvo 8c86dbbc50 Fix meta alerts list action filter 2022-01-17 09:17:39 +01:00
fbsanchez fee3f4ab96 php8 review + mdpf update 2022-01-12 14:22:16 +01:00
fbsanchez c3639a22fb vc php8 2022-01-11 14:36:05 +01:00
Daniel Rodriguez 7d51176641 Merge branch 'ent-7076-11432-Forzar-chequeos-remotos-en-Consolas-Visuales' into 'develop' 
Ent 7076 11432 forzar chequeos remotos en consolas visuales

See merge request artica/pandorafms!4598
 2022-01-11 10:09:35 +00:00
Jose Gonzalez f072585d5a Clean undefined messages for tree view 2022-01-07 10:39:03 +01:00
Daniel Rodriguez 6ff9c43f34 Merge branch 'ent-8085-cambio-de-skin-muestra-error' into 'develop' 
Fix error message when update skin

See merge request artica/pandorafms!4609
 2022-01-05 12:34:25 +00:00
Daniel Rodriguez 1612b5d063 Merge branch 'ent-7903-colores-distintos-en-estado-not-init-agentes-modulos-vista-tactical-view' into 'develop' 
Fix not init color

See merge request artica/pandorafms!4604
 2022-01-04 11:47:46 +00:00
Calvo 1d860420b8 Fix error message when update skin 2022-01-03 16:10:36 +01:00
Daniel Rodriguez be95c001ca Merge branch 'ent-8229-aparece-icono-de-politicas-en-buscador-general-open' into 'develop' 
Removed policies search in open gerneral search

See merge request artica/pandorafms!4603
 2021-12-28 13:31:25 +00:00
Daniel Rodriguez 10e282b76b Merge branch 'ent-8108-Error-en-la-vista-de-eventos-de-un-agente-concreto' into 'develop' 
fixed filter loaded from event graph on agent view

See merge request artica/pandorafms!4564
 2021-12-28 12:02:56 +00:00
Calvo f9dceb9e10 Fix not init color 2021-12-28 12:38:22 +01:00
Calvo daf0b4e6e9 Fix alert view with default actions node and meta 2021-12-27 19:01:53 +01:00
Daniel Rodriguez 0ed9406796 Merge branch 'ent-8171-Filtro-Server-type-limitado-en-vista-Monitores-metaconsola' into 'develop' 
Ent 8171 filtro server type limitado en vista monitores metaconsola

See merge request artica/pandorafms!4574
 2021-12-27 17:09:29 +00:00
Daniel Rodriguez eb3d36489c Merge branch 'ent-8270-Fallos-al-borrar-relaciones-en-mapas-de-red' into 'develop' 
Ent 8270 fallos al borrar relaciones en mapas de red

See merge request artica/pandorafms!4566
 2021-12-27 16:17:09 +00:00
Daniel Rodriguez e0a925c2c1 Merge branch 'ent-8384-error-sql-ordenar-agent-id' into 'develop' 
Added php8 function and solve issue with agent id sorting in events

Closes pandora_enterprise#8384

See merge request artica/pandorafms!4592
 2021-12-23 12:19:24 +00:00
Daniel Rodriguez 7c09ce1a6d Merge branch 'ent-8295-Meter-spinner-en-visualizador-de-graficas-combinadas' into 'develop' 
Ent 8295 meter spinner en visualizador de graficas combinadas

See merge request artica/pandorafms!4563
 2021-12-23 12:13:05 +00:00
Daniel Maya 7767e9aae2 #8295 Fixed data 2021-12-21 15:22:22 +01:00
Daniel Maya db72cba1d2 #7076 Added force remote check 2021-12-21 09:33:55 +01:00
Jose Gonzalez 37675e0fce Added php8 function and solve issue with agent id sorting in events 2021-12-16 16:35:31 +01:00
Daniel Barbero Martin f705cc0fba wip chart histogram list modules #8222 2021-12-14 13:21:34 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-14 11:03:04 +01:00
Daniel Maya 57cd3d7309 #8171 Fixed server type in metaconsole 2021-12-07 16:21:20 +01:00
Daniel Maya fb80350f99 #8270 Fixed delete links 2021-12-02 13:46:29 +01:00
fbsanchez cad0c6cea6 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-02 10:43:30 +01:00
Daniel Maya ae0e4e2826 #8295 Added ajax call and spinner 2 2021-12-02 08:52:33 +01:00
Daniel Barbero Martin a02c8a7988 wip reports alert actions 2021-12-01 15:15:45 +01:00
alejandro.campos@artica.es da22381044 fixed filter loaded from event graph on agent view 2021-12-01 11:13:28 +01:00
Daniel Maya cacaaa89ae #8295 Added ajax call and spinner 2021-11-30 15:56:40 +01:00
Daniel Barbero Martin 40d801a947 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-30 14:16:19 +01:00
Daniel Rodriguez 75699cb8fc Merge branch 'ent-7844-revision-acl-enterprise-parte-3-fallos-actuales' into 'develop' 
Ent 7844 revision acl enterprise parte 3 fallos actuales

See merge request artica/pandorafms!4356
 2021-11-29 11:36:52 +00:00
Daniel Rodriguez 198959f6cb Merge branch 'ent-7995-unificar-criterios-de-busqueda-que-no-sean-case-sensitive' into 'develop' 
Unify search criteria case insensitive

See merge request artica/pandorafms!4496
 2021-11-29 11:08:00 +00:00
Calvo 4eccc2b612 Removed policies search in open gerneral search 2021-11-29 11:36:13 +01:00
fbsanchez 5197d08aa3 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/install.php
 2021-11-29 09:54:55 +01:00
Daniel Barbero Martin 960c2de6c3 wip reports alert actions 2021-11-26 14:06:10 +01:00
Daniel Barbero Martin cb0039d7a7 wip reports alert actions 2021-11-26 13:52:15 +01:00
Daniel Rodriguez fff8f910f8 Merge branch 'ent-8015-palabras-conflictivas' into 'develop' 
Removed some cheerful words in the project

Closes pandora_enterprise#8015

See merge request artica/pandorafms!4460
 2021-11-24 17:18:38 +00:00
Daniel Rodriguez eb4666e2c2 Merge branch 'ent-8294-Graficos-de-area-se-ven-como-graficos-de-linea' into 'develop' 
fix chart area

See merge request artica/pandorafms!4546
 2021-11-24 14:45:39 +00:00
Calvo d7f590bacb Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-24 13:42:48 +01:00
Daniel Rodriguez 8ed3042f9a Merge branch 'ent-8247-Integracion-con-Integria-Bug-en-selector-de-status-en-creacion-edicion-de-tickets' into 'develop' 
added resolution field in creation and update operations

See merge request artica/pandorafms!4534
 2021-11-24 11:20:18 +00:00
fbsanchez a9485024f4 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-23 14:29:23 +01:00
Daniel Barbero Martin aae0016191 fix chart area 2021-11-23 13:14:56 +01:00
Jose Gonzalez 98f519958c Fix merge 2021-11-23 12:25:58 +01:00
Daniel Rodriguez 688ec5f7f9 Merge branch 'ent-8144-no-se-muestra-completo-el-nombre-de-dashboard-consola-visual-favorito-en-el-menu' into 'develop' 
Ent 8144 no se muestra completo el nombre de dashboard consola visual favorito en el menu

See merge request artica/pandorafms!4505
 2021-11-22 15:54:05 +00:00
Daniel Rodriguez 60f051dca3 Merge branch 'ent-8143-Buscador-general-Errores-en-resultados-mostrados' into 'develop' 
fixed general search

See merge request artica/pandorafms!4520
 2021-11-22 15:50:25 +00:00
Daniel Maya c3295b8fd2 #8191 Fixed filter 2021-11-19 11:38:11 +01:00
fbsanchez 582cb9a082 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 10:51:46 +01:00
Alejandro Campos fd01375efe Merge branch 'develop' into 'ent-8247-Integracion-con-Integria-Bug-en-selector-de-status-en-creacion-edicion-de-tickets' 
# Conflicts:
#   pandora_console/operation/incidents/configure_integriaims_incident.php
 2021-11-17 09:48:16 +00:00
alejandro.campos@artica.es a842381754 minor change 2021-11-17 10:32:04 +01:00
alejandro.campos@artica.es 3f0fd30eb8 added resolution field in creation and update operations 2021-11-16 14:13:45 +01:00
Daniel Rodriguez 3e5b34325b Merge branch 'ent-8169-No-funciona-recursión-de-grupos-en-vista-de-Monitores-de-Metaconsola' into 'develop' 
Ent 8169 no funciona recursión de grupos en vista de monitores de metaconsola

See merge request artica/pandorafms!4513
 2021-11-16 09:12:40 +00:00
Calvo 9d3c691ad1 Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-15 18:33:35 +01:00
Daniel Maya efd8c8cab2 #8040 resolved conflict 2021-11-15 13:20:43 +01:00
Daniel Rodriguez d094987eda Merge branch 'ent-8063-recursion-y-filtro-en-operaciones-masivas-de-modulos' into 'develop' 
Fix recursion and filter on modules massive operations

See merge request artica/pandorafms!4477
 2021-11-15 11:29:33 +00:00
Daniel Rodriguez eb9e73ecb0 Merge branch 'ent-7838-revision-acl-enterprise-parte-1-eliminacion-opciones' into 'develop' 
Deleted and reubicated acl options

See merge request artica/pandorafms!4340
 2021-11-15 11:24:50 +00:00
Daniel Rodriguez eb39636c16 Merge branch 'ent-4710-Posibilidad-de-anadir-archivos-adjuntos-en-creacion-de-ticket-en-integracion-con-Integria' into 'develop' 
Ent 4710 posibilidad de anadir archivos adjuntos en creacion de ticket en integracion con integria

See merge request artica/pandorafms!4483
 2021-11-15 11:23:34 +00:00
Daniel Rodriguez e16a398c1a Merge branch 'ent-7900-trazas-en-estado-agente-y-pandora-alert' into 'develop' 
Deleted js traces

See merge request artica/pandorafms!4354
 2021-11-15 11:13:50 +00:00
Daniel Rodriguez 650607067e Merge branch 'ent-7688-conteo-monitores-vista-tactica' into 'develop' 
Include modules not init in total monitors count on tactical view

See merge request artica/pandorafms!4309
 2021-11-15 11:00:07 +00:00
Daniel Rodriguez b36318c450 Merge branch 'ent-7959-problemas-visualizacion-alertas-sonoras' into 'develop' 
Fixed visual issues and handle browser zoom

Closes pandora_enterprise#7959

See merge request artica/pandorafms!4484
 2021-11-15 10:12:37 +00:00
Daniel Rodriguez ddb156564d Merge branch 'ent-7962-bug-visual-monitor-detail' into 'develop' 
Fixed tip position and code style

Closes pandora_enterprise#7962

See merge request artica/pandorafms!4488
 2021-11-15 10:10:53 +00:00
Daniel Rodriguez 6b68203811 Merge branch 'ent-4711-Posibilidad-de-ordenar-tickets-en-integracion-con-Integria' into 'develop' 
add sorting capability to integriaims ticket list

See merge request artica/pandorafms!4474
 2021-11-15 10:04:01 +00:00
alejandro.campos@artica.es 406a8b702b visual fixes 2021-11-12 13:30:33 +01:00
alejandro.campos@artica.es 546fcaa28f fixed general search 2021-11-04 18:07:39 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Daniel Rodriguez 56ae68a034 Merge branch 'ent-7951-Bloqueo-auto-creacion-usuarios-desde-nodo-en-entornos-centralizado' into 'develop' 
Ent 7951 bloqueo auto creacion usuarios desde nodo en entornos centralizado

See merge request artica/pandorafms!4487
 2021-11-03 09:34:49 +00:00
Daniel Maya 031e0a2cd7 #8169 Fixed group recursion with standar user 2021-11-02 11:08:15 +01:00
Calvo 1e51197afb Fix menu favourite GIS maps. services and dashboards large title 2021-10-27 19:39:18 +02:00
fbsanchez a5bf72cca0 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Tools.pm
 2021-10-26 14:21:40 +02:00
fbsanchez 5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
Calvo f1f984614f Unify search criteria case insensitive 2021-10-22 12:02:31 +02:00
Jose Gonzalez 070c920e0e Fixed tip position and code style 2021-10-20 13:01:13 +02:00
alejandro.campos@artica.es e7d730ba0d fix bug with ldap login in metaconsole 2021-10-19 19:19:55 +02:00
Jose Gonzalez b61e7c6c58 Fixed visual with browsers with more zoom 2021-10-19 17:04:39 +02:00
Jose Gonzalez 9699b368ef Fixed visual issues and handle browser zoom 2021-10-19 16:56:54 +02:00
alejandro.campos@artica.es 0b033dae74 add capability to upload files in ticket creation and update on Integria integration system 2021-10-19 15:32:22 +02:00
Calvo 7daf138ef5 Fix recursion and filter on modules massive operations 2021-10-18 15:47:22 +02:00
alejandro.campos@artica.es 8db66c7e0e add sorting capability to integriaims ticket list 2021-10-18 11:45:48 +02:00
Daniel Rodriguez 92740cd86b Merge branch 'ent-8096-arreglos-black-theme' into 'develop' 
fixed visual black theme error

See merge request artica/pandorafms!4457
 2021-10-14 09:59:16 +00:00
fbsanchez 8652648824 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-08 15:51:05 +02:00
Jose Gonzalez 4331438765 Removed some cheerful words in the project 2021-10-08 11:13:28 +02:00
Daniel Rodriguez 16f2c776f2 Merge branch 'ent-8035-12446-fallos-filtros-personalizados-eventos' into 'develop' 
show only events filter in acl groups

See merge request artica/pandorafms!4451
 2021-10-08 08:09:19 +00:00
marcos 85037693b2 fixed visual black theme error 2021-10-07 16:45:56 +02:00
marcos 795d5c055a merge conflict 2021-10-07 09:56:17 +02:00
marcos f42e57efbe show only events filter in acl groups 2021-10-06 17:11:45 +02:00
fbsanchez dae8a9ba14 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-06 14:50:13 +02:00
Daniel Rodriguez 3ab921acbb Merge branch 'ent-7950-errores-en-log-viewer' into 'develop' 
Ent 7950 errores en log viewer

See merge request artica/pandorafms!4383
 2021-10-05 09:29:24 +00:00
Daniel Rodriguez a794f30141 Merge branch 'ent-8060-bug-modal-networkmaps' into 'develop' 
Fixed issue with node actions

Closes pandora_enterprise#8060

See merge request artica/pandorafms!4438
 2021-10-05 09:19:26 +00:00
Daniel Rodriguez d0e738e8fb Merge branch 'ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola' into 'develop' 
Ent 7937 mensaje this node is configured with centralized mode de nodo sale en metaconsola

See merge request artica/pandorafms!4409
 2021-10-05 09:18:41 +00:00
fbsanchez 31f329a833 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 
Conflicts:
	pandora_console/vendor/composer/autoload_classmap.php
	pandora_console/vendor/composer/autoload_static.php
 2021-10-05 10:57:00 +02:00
Jose Gonzalez 6deaee84ac Merge 2021-10-04 10:00:15 +02:00
Daniel Rodriguez 7904c61df5 Merge branch 'ent-7273-Consola-Visual-nuevo-elemento-Gráfica-básica' into 'develop' 
Ent 7273 consola visual nuevo elemento gráfica básica

See merge request artica/pandorafms!4304
 2021-10-01 12:48:09 +00:00
Jose Gonzalez 5eb66e5c6e Fixed issue with node actions 2021-10-01 14:05:41 +02:00
fbsanchez d322d23203 WIP NCM 2021-09-30 19:10:45 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
fbsanchez 8c1838abb7 Merge remote-tracking branch 'origin/develop' into ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola 
Conflicts:
	pandora_console/install.php
 2021-09-29 13:47:10 +02:00
Daniel Rodriguez 9beda8eada Merge branch 'ent-7651-anadir-nodos-filtrando-por-grupo-en-un-mapa-de-red-no-es-recursivo' into 'develop' 
Added checkbox for group recursion in network maps

See merge request artica/pandorafms!4297
 2021-09-28 10:18:19 +00:00
Luis 849ce30da5 Update pandora_networkmap.view.php 2021-09-28 08:50:00 +00:00
Calvo 90ac62c0cc Fix recursion on networkmap nodes 2021-09-27 16:14:07 +02:00
Daniel Rodriguez 4bd88e8afa Merge branch 'ent-7449-autorefresh-en-vistas-que-no-existen' into 'develop' 
Revomved autorefresh views than does not exists on meta

See merge request artica/pandorafms!4271
 2021-09-27 10:08:46 +00:00
Daniel Rodriguez 4420ecec2c Merge branch 'ent-7514-pasar-networkmaps-a-open' into 'develop' 
Ent 7514 pasar networkmaps a open

Closes pandora_enterprise#7514

See merge request artica/pandorafms!4416
 2021-09-24 07:14:14 +00:00
Daniel Rodriguez 7bdb730abd Merge branch 'ent-8018-estilos-campos-seleccion-metaconsola' into 'develop' 
Fix select fields size

Closes pandora_enterprise#8018

See merge request artica/pandorafms!4418
 2021-09-24 07:12:52 +00:00
Jose Gonzalez de1bf03976 Clean logs 2021-09-23 17:19:47 +02:00
fbsanchez fe42a8782b Updated messages in centralised environment status check 2021-09-23 11:16:48 +02:00
Jose Gonzalez 5b40a4f700 Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open 2021-09-23 08:50:50 +02:00
Calvo 8eababe2f6 Autorefresh changes on centralized node and metaconsole 2021-09-22 17:29:14 +02:00
Daniel Maya 8fa834fb9b resolved conflict 2021-09-22 17:27:18 +02:00
Daniel Maya 61fb2e102b #7950 Fixed last_contact 3 2021-09-22 16:39:34 +02:00
Calvo 641c42df91 Merge remote-tracking branch 'origin/develop' into ent-7449-autorefresh-en-vistas-que-no-existen 2021-09-22 11:39:44 +02:00
Daniel Rodriguez 126030261b Merge branch 'ent-7969-Etiquetas-HTML-en-módulos-de-wizard-Consolas-Visuales' into 'develop' 
Ent 7969 etiquetas html en módulos de wizard consolas visuales

See merge request artica/pandorafms!4394
 2021-09-22 09:01:17 +00:00
Daniel Rodriguez ce40b36923 Merge branch 'ent-7582-anadir-selector-horas-eventos' into 'develop' 
Ent 7582 anadir selector horas eventos

Closes pandora_enterprise#7582

See merge request artica/pandorafms!4266
 2021-09-21 13:17:30 +00:00
Jose Gonzalez cd1b7daa00 Fix select fields size 2021-09-20 12:16:08 +02:00
Jose Gonzalez 3af47c0e5f Open network maps 2021-09-17 10:45:01 +02:00
Calvo 0778952461 Merge remote-tracking branch 'origin/develop' into ent-7449-autorefresh-en-vistas-que-no-existen 2021-09-16 16:32:27 +02:00
Daniel Rodriguez 6599f80dff Merge branch 'ent-7444-Metaconsole-Triggered-alerts-report' into 'develop' 
Fixed forget metaconsole alerts

Closes pandora_enterprise#7444

See merge request artica/pandorafms!4388
 2021-09-08 10:14:22 +00:00
Daniel Maya 240caa3ad1 #7969 Fixed span with truncate 2021-09-08 12:14:03 +02:00
Daniel Maya 24670da399 #7950 Fixed last_contact 2 2021-09-07 14:47:54 +02:00
Jose Gonzalez bb743cb87f Fixed forget metaconsole alerts 2021-09-06 14:08:24 +02:00
Jose Gonzalez fa101db3b6 Fix vulnerability 2021-09-03 13:30:15 +02:00
Daniel Maya 5bf70f876c #7950 Fixed last_contact 2021-09-02 16:12:46 +02:00
Daniel Rodriguez b8e1391ffd Merge branch 'ent-7911-errores-file-manager' into 'develop' 
Fixed issues with files upload

Closes pandora_enterprise#7911

See merge request artica/pandorafms!4370
 2021-09-01 13:18:10 +00:00
Calvo 3204fdb71f Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-09-01 11:06:20 +02:00
Daniel Rodriguez 8397f778b3 Merge branch 'ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail' into 'develop' 
add not option in monitor detail filter

See merge request artica/pandorafms!4112
 2021-09-01 08:54:49 +00:00
marcos 80f4e25b92 change first option value when not_condition its enabled 2021-08-30 11:19:53 +02:00
Daniel Rodriguez a89faed47c Merge branch 'ent-7823-interfaces-view-no-calcula-bien-last-data' into 'develop' 
Fixed issue with last_data obtain

Closes pandora_enterprise#7823

See merge request artica/pandorafms!4338
 2021-08-27 10:46:39 +00:00
marcos 2ed657c166 updates 2021-08-26 12:42:16 +02:00
Jose Gonzalez 945c29d1bc Fix issues 2021-08-26 11:15:02 +02:00
Daniel Rodriguez 22587a0dde Merge branch 'ent-7036-11346-Introducir-el-campo-de-IP-del-agente-en-la-vista-de-eventos' into 'develop' 
Ent 7036 11346 introducir el campo de ip del agente en la vista de eventos

See merge request artica/pandorafms!4275
 2021-08-25 13:00:42 +00:00