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

5982 Commits

Author SHA1 Message Date
Daniel Rodriguez 5b49372e99 Merge branch 'ent-7839-revision-acl-enterprise-parte-2-introduccion-opciones' into 'develop' 
Added missing sec related to GET params  to ACL enterprise

See merge request artica/pandorafms!4345
 2021-11-18 12:14:12 +00:00
Calvo 2562a44d94 Fix duplicated ACL setup update manager 2021-11-18 12:25:14 +01:00
Calvo 06fe1552bf Enterprise ACL step 2: Add options fix merge 2021-11-17 17:31:43 +01:00
Daniel Rodriguez 495d8d8db8 Merge branch 'ent-8163-bug-en-item-alert-report-metaconsola' into 'develop' 
Fix server name item on reporting buider

See merge request artica/pandorafms!4525
 2021-11-17 15:15:42 +00:00
Daniel Rodriguez 54ef63f6d3 Merge branch 'ent-7918-Cambio-texto-informe-availability-graph' into 'develop' 
changed text

See merge request artica/pandorafms!4490
 2021-11-17 15:12:24 +00:00
Daniel Rodriguez 38468ff1f2 Merge branch 'ent-8215-perfiles-usuario-puede-crear-agentes-de-otros-grupos' into 'develop' 
Fix ACL grous AW creation

See merge request artica/pandorafms!4523
 2021-11-16 17:03:17 +00:00
Daniel Rodriguez cb3bba0a0d Merge branch 'ent-8125-Usuarios-globales-se-borran-si-les-borras-todos-los-perfiles' into 'develop' 
prevent from deleting global admin users when removing all of their profiles

See merge request artica/pandorafms!4493
 2021-11-16 14:55:05 +00:00
Daniel Rodriguez 1fb78c169e Merge branch 'ent-8257-no-aparecen-tokns-de-consola-visual-en-perfil' into 'develop' 
Ent 8257 no aparecen tokns de consola visual en perfil

See merge request artica/pandorafms!4533
 2021-11-16 13:17:15 +00:00
Daniel Rodriguez 09202cebc4 Merge branch 'ent-8088-Alertas-SNMP-no-mantienen-el-valor-en-dropdowns' into 'develop' 
Ent 8088 alertas snmp no mantienen el valor en dropdowns

See merge request artica/pandorafms!4458
 2021-11-16 09:15:02 +00:00
Calvo c47799a4f1 Fix missing visual console profile tokens 2021-11-15 18:58:54 +01:00
Calvo 7e36a678e9 Fix file erorrs and warns 2021-11-15 18:54:28 +01:00
Calvo b6e34a2697 erge remote-tracking branch 'origin/develop' into ent-7839-revision-acl-enterprise-parte-2-introduccion-opciones 2021-11-15 18:14:18 +01:00
Daniel Maya efd8c8cab2 #8040 resolved conflict 2021-11-15 13:20:43 +01: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 ff31a347c4 Merge branch 'ent-7947-Bug-en-integración-de-Integria-en-nodo-centralizado' into 'develop' 
Ent 7947 bug en integración de integria en nodo centralizado

See merge request artica/pandorafms!4492
 2021-11-15 11:22:25 +00:00
Daniel Rodriguez bec244e9b7 Merge branch 'ent-7593-fallo-en-boton-busqueda-libre-componente-remotos' into 'develop' 
Fix search component group passing invalid get params

See merge request artica/pandorafms!4293
 2021-11-15 10:18:20 +00:00
Daniel Rodriguez e573e79bcd Merge branch 'ent-7784-12114-en-las-templates-de-informes-en-metaconsola-no-busca-por-grupos-secundarios' into 'develop' 
Fix list agent with secondaty grouos on selec

See merge request artica/pandorafms!4303
 2021-11-15 10:16:24 +00:00
Daniel Rodriguez 09af86fbeb Merge branch 'ent-8105-Revision-de-lista-de-item-en-consolas-visuales' into 'develop' 
Ent 8105 revision de lista de item en consolas visuales

See merge request artica/pandorafms!4468
 2021-11-15 10:15:24 +00:00
Daniel Rodriguez 504411d7d2 Merge branch 'ent-8039-Bug-en-item-Network-link-CV' into 'develop' 
Ent 8039 bug en item network link cv

See merge request artica/pandorafms!4453
 2021-11-15 10:13:44 +00:00
Calvo 94d1964166 Fix server name item on reporting buider 2021-11-08 13:27:32 +01:00
Calvo 61bdc1f4e0 Fix ACL grous AW creation 2021-11-05 15:21:04 +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
Jose Gonzalez 932d42e8da Fixed colours 2021-11-04 15:44:40 +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
alejandro.campos@artica.es b4c21cfdca fixed several bugs in AD authentication in metaconsole 2021-10-29 16:12:23 +02:00
Daniel Rodriguez 3883c99804 Merge branch 'ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card' into 'develop' 
CorrelationServer

See merge request artica/pandorafms!4377
 2021-10-29 10:07:25 +00:00
fbsanchez 77bee9f3ca UM replicated 2021-10-27 22:28:37 +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 05a2db88a3 menu fix 2021-10-25 17:01:26 +02:00
fbsanchez dabd7f53fe minor fixes 2021-10-25 14:05:11 +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
fbsanchez 925fa8b819 Errata fix 2021-10-22 10:54:41 +02:00
alejandro.campos@artica.es 07c7c7a387 prevent from deleting global admin users when removing all of their profiles 2021-10-22 09:48:00 +02:00
fbsanchez bb8dbc9332 NCM 2021-10-21 02:17:17 +02:00
Daniel Maya 6520f95fcf #7947 Fixed integria IMS ticket in metaconsole 2021-10-20 17:06:24 +02:00
alejandro.campos@artica.es 3e1dcbb554 changed text 2021-10-20 13:30:24 +02:00
Jose Gonzalez 5b4043d9ea Fix delete files issue 2021-10-15 13:31:19 +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
Daniel Maya 4579d2b8c6 #8105 Fixed list of elements 2021-10-13 15:20:20 +02: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
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 d4108c4e8b show only events fetch with user groups 2021-10-07 16:11:23 +02:00
Daniel Maya c61c39f45f #8088 Fixed selected option with select2 2021-10-07 15:45:17 +02:00
marcos f55a6685bd show only events filter in acl groups 2021-10-07 14:09:02 +02:00
marcos 030b45af8e add new filter fot litghbulb_off 2021-10-07 12:50:10 +02:00
marcos afb9cea67f add new filter fot litghbulb_off 2021-10-07 12:42:58 +02:00
Daniel Maya 49ffdf822b #8040 Fixed module graph 2021-10-07 11:50:27 +02:00
Daniel Maya e9b6acc1a8 #8039 Fixed network link 2021-10-07 10:27:31 +02:00