tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-19 08:48:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,526 Commits 34 Branches 30 Tags
Commit Graph

15166 Commits

Author SHA1 Message Date
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
alejandro.campos@artica.es
fc6fb36293 Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports 2021-09-29 13:29:20 +02:00
Daniel Rodriguez
04d683286f Merge branch 'ent-5193-IPAM-Supernet-Map-Tree-View' into 'develop' 
implemented supernet treeview

See merge request artica/pandorafms!4431
 2021-09-29 10:10:26 +00:00
Daniel Maya
fb449910c9 #7963 Fixed netflow view 2 2021-09-29 10:57:57 +02:00
Daniel Rodriguez
56c197e4a5 Merge branch 'ent-7867-Error-al-listar-las-interfaces-en-Interface-View' into 'develop' 
Ent 7867 error al listar las interfaces en interface view

See merge request artica/pandorafms!4379
 2021-09-29 08:33:10 +00:00
artica
06c42a051d Auto-updated build strings. 2021-09-29 01:00:20 +02:00
Jose Gonzalez
d68328c777 Fix issue with encrypted password 2021-09-28 16:39:22 +02:00
Daniel Rodriguez
08fe77ddaa Merge branch 'ent-7766-query-extra-fields-componentes-remotos-wmi' into 'develop' 
WMI remote componente add text _field_wmi_n_

See merge request artica/pandorafms!4286
 2021-09-28 12:57:50 +00:00
Daniel Rodriguez
ddd550ce42 Merge branch 'ent-8022-12445-duplicacion-de-politicas-con-mergeador-de-metaconsola' into 'develop' 
Entity dynamic method calling improved

See merge request artica/pandorafms!4415
 2021-09-28 12:56:00 +00:00
alejandro.campos@artica.es
87ec5970a1 implemented supernet treeview 2021-09-28 13:44:12 +02:00
Daniel Maya
d237fab6a6 #8024 fixed router ip 2021-09-28 13:42:30 +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
Daniel Maya
af4e49e156 #7963 Fixed netflow view 2021-09-28 09:42:05 +02:00
artica
201fea9378 Auto-updated build strings. 2021-09-28 01:00:21 +02:00
Daniel Rodriguez
894cd0974f Merge branch 'ent-3407-Informes-en-IPAM' into 'develop' 
Ent 3407 informes en ipam

See merge request artica/pandorafms!4424
 2021-09-27 12:06:00 +00:00
Daniel Rodriguez
c57c901e55 Merge branch 'ent-7068-funcionamiento-de-alertas-en-politicas' into 'develop' 
Added unlinked icon to alerts in unlinked module

See merge request artica/pandorafms!4426
 2021-09-27 10:09:30 +00:00
Calvo
91cd12c715 fix networkmap node group recursion 2021-09-27 11:25:54 +02:00
Calvo
46136a66ca Merge remote-tracking branch 'origin/develop' into ent-7651-anadir-nodos-filtrando-por-grupo-en-un-mapa-de-red-no-es-recursivo 2021-09-27 10:40:50 +02:00
artica
b09febeee0 Auto-updated build strings. 2021-09-27 01:00:15 +02:00
artica
17ba73ad36 Auto-updated build strings. 2021-09-26 01:00:11 +02:00
artica
2cbe307a6f Auto-updated build strings. 2021-09-25 01:00:21 +02:00
alejandro.campos@artica.es
9e0729574e Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports 2021-09-24 11:40:25 +02:00
Daniel Rodriguez
49961ed261 Merge branch 'ent-6296-10650-Añadir-widget-de-lista-de-servicios' into 'develop' 
Ent 6296 10650 añadir widget de lista de servicios

See merge request artica/pandorafms!4355
 2021-09-24 09:09:28 +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
artica
bc516889bf Auto-updated build strings. 2021-09-24 01:00:21 +02:00
Calvo
4a9f523468 Added unlinked icon to alerts in unlinked module 2021-09-23 19:02:31 +02:00
Jose Gonzalez
de1bf03976 Clean logs 2021-09-23 17:19:47 +02:00
Jose Gonzalez
7bfe699802 Fixes minor issues 2021-09-23 17:01:22 +02:00
Daniel Rodriguez
9852c711eb Merge branch 'ent-7330-nombre-alias-de-agentes-largos-se-ven-mal-en-sql-vertical-graph' into 'develop' 
fixed agent name flot-x-axis in sql vertical graph

See merge request artica/pandorafms!4339
 2021-09-23 13:48:14 +00:00
Alejandro Campos
ca46285a0e Merge branch 'develop' into 'ent-3407-Informes-en-IPAM' 
# Conflicts:
#   pandora_console/extras/mr/50.sql
 2021-09-23 13:33:02 +00:00
Daniel Rodriguez
174f4cf5af Merge branch 'ent-8000bis-error-autenticacion-ldap' into 'develop' 
Fix LDAP authentication failure

Closes pandora_enterprise#8000

See merge request artica/pandorafms!4425
 2021-09-23 12:32:27 +00:00
Daniel Rodriguez
ad8382003b Merge branch 'ent-8014-entities-en-tags' into 'develop' 
Fix entities

Closes pandora_enterprise#8014

See merge request artica/pandorafms!4420
 2021-09-23 10:33:30 +00:00
Jose Gonzalez
dee81f85ba Fix LDAP authentication failure 2021-09-23 11:22:15 +02:00
fbsanchez
fe42a8782b Updated messages in centralised environment status check 2021-09-23 11:16:48 +02:00
Daniel Maya
3f91fda888 Fixed module_details_window 2021-09-23 10:59:24 +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
artica
0e34c1275a Auto-updated build strings. 2021-09-23 01:00:21 +02:00
Daniel Maya
8fa834fb9b resolved conflict 2021-09-22 17:27:18 +02:00
Daniel Rodriguez
731c293b50 Merge branch 'ent-8000-error-autenticacion-ldap' into 'develop' 
Fix io_safe_output for ldap admin pass

Closes pandora_enterprise#8000

See merge request artica/pandorafms!4414
 2021-09-22 13:56:48 +00:00
Daniel Rodriguez
ce286f2654 Merge branch 'ent-8003-bung-en-despliegue-de-tags-en-tree-view' into 'develop' 
Fix tag treeview level2

See merge request artica/pandorafms!4407
 2021-09-22 09:09:11 +00:00
Daniel Rodriguez
c6e2fd6aa9 Merge branch 'ent-7993-bug-en-llamada-api-crear-alert-template-meta' into 'develop' 
API set create alert template metaconsole support

See merge request artica/pandorafms!4401
 2021-09-22 09:08:34 +00:00
Daniel Rodriguez
68b3255143 Merge branch 'ent-7583-traduccion-traduccion-del-apartado-de-la-consola-alerts-alert-correlation' into 'develop' 
Css content moved to js to allow translation

See merge request artica/pandorafms!4400
 2021-09-22 09:07:42 +00:00
Daniel Rodriguez
3338165dc3 Merge branch 'ent-7924-api-group-id-by-mname-falla-al-usar-url-encode-separator' into 'develop' 
Fix api group_id_by_name with url enconde separator

See merge request artica/pandorafms!4391
 2021-09-22 09:00:27 +00:00
Daniel Rodriguez
c6da03316c Merge branch 'ent-7711-Fallo-al-mover-un-ítem-static-image-que-tuviera-vinculado-un-network-link' into 'develop' 
Ent 7711 fallo al mover un ítem static image que tuviera vinculado un network link

See merge request artica/pandorafms!4346
 2021-09-22 08:59:44 +00:00
Daniel Rodriguez
f78d2e8a4b Merge branch 'ent-7697-varios-bugs-visuales-en-modal-de-configuracion-de-widget-metaconsola' into 'develop' 
Fix widgets style bugs

See merge request artica/pandorafms!4272
 2021-09-22 08:58:51 +00:00
artica
61e2a3f21b Auto-updated build strings. 2021-09-22 01:00:21 +02:00
alejandro.campos@artica.es
fc959f0bc6 created report for ipam networks 2021-09-21 15:59:14 +02:00
Daniel Rodriguez
a252bbedac Merge branch 'ent-7371-comportamiento-extrano-editor-ace' into 'develop' 
Fixed monospaced

Closes pandora_enterprise#7371

See merge request artica/pandorafms!4273
 2021-09-21 13:18:43 +00:00
Daniel Rodriguez
b02ecc7cae Merge branch 'ent-7473-11796-mala-representacion-de-percentil-en-graficas-personalizadas' into 'develop' 
fixed error with percentiles in graphs

See merge request artica/pandorafms!4312
 2021-09-21 13:18:18 +00:00