98f519958c
Fix merge
2021-11-23 12:25:58 +01:00
fee6b06a2a
Updated version and build strings.
2021-11-23 11:28:02 +01:00
3bfce928c4
#7902 Fixed add and update actions
2021-11-23 10:53:51 +01:00
c096a244f6
Merge branch 'ent-8254-filtro-select-grupo-no-busca-sin-permiso-directo' into 'develop'
...
Select group search filter working on groups' child
See merge request artica/pandorafms!4535
2021-11-23 09:38:22 +00:00
feedce5a61
Auto-updated build strings.
2021-11-23 01:00:18 +01:00
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
3efcc8d30f
Merge branch 'ent-8146-Bug-en-filtro-de-eventos-de-widget-List-of-latest-events-Dashboard' into 'develop'
...
Ent 8146 bug en filtro de eventos de widget list of latest events dashboard
See merge request artica/pandorafms!4504
2021-11-22 15:53:16 +00:00
131be55be1
#8277 Fixed search by agent
2021-11-22 16:18:53 +01:00
13835582d2
Merge branch 'ent-8210-Bug-al-editar-acciones-ya-configuradas-en-alertas' into 'develop'
...
Ent 8210 bug al editar acciones ya configuradas en alertas
See merge request artica/pandorafms!4536
2021-11-22 12:44:51 +00:00
79757d8f4b
#8278 Fixed graph
2021-11-22 12:12:32 +01:00
9474dc9dbc
Auto-updated build strings.
2021-11-22 01:00:09 +01:00
956e1bd82b
Auto-updated build strings.
2021-11-21 01:00:14 +01:00
1751faac96
Auto-updated build strings.
2021-11-20 01:00:24 +01:00
8ce1a500ea
#8210 Fixed dialog
2021-11-19 14:57:56 +01:00
7b4c6848f7
Merge branch 'ent-8200-Conteos-incorrectos-vista-tactica-en-FENIX-en-v758' into 'develop'
...
fixed several counts
See merge request artica/pandorafms!4527
2021-11-19 10:46:15 +00:00
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
6d1e7121d7
Merge branch 'develop' into 'ent-8200-Conteos-incorrectos-vista-tactica-en-FENIX-en-v758'
...
# Conflicts:
# pandora_console/include/functions_tactical.php
2021-11-19 08:59:19 +00:00
c52e11e91a
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-11-19 08:12:22 +01:00
f18a575b2a
Auto-updated build strings.
2021-11-19 01:00:17 +01:00
8346a233be
NCM2
2021-11-18 19:49:57 +01:00
04e6e875b3
Merge branch 'ent-8168-La-vista-tactica-de-metaconsola-no-tiene-en-cuenta-el-propagate-ACL-de-los-grupos' into 'develop'
...
fixed propagation in agents count
See merge request artica/pandorafms!4529
2021-11-18 16:36:55 +00:00
649fc829fb
included secondary groups in tactical count queries
2021-11-18 13:35:27 +01:00
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
3c71ecfec2
Merge branch 'ent-8069-command-center-anadir-una-notificacion-si-la-cola-de-tareas-de-los-nodos-tiene-un-fallo-o-es' into 'develop'
...
Notifications if syncqueue exceeds limits in MC
See merge request artica/pandorafms!4515
2021-11-18 12:09:06 +00:00
283dadc72d
Select group search filter working on groups' child
2021-11-18 11:33:34 +01:00
a5cfe3869c
Auto-updated build strings.
2021-11-18 01:00:18 +01:00
06fe1552bf
Enterprise ACL step 2: Add options fix merge
2021-11-17 17:31:43 +01:00
908bc22b33
Merge branch 'ent-8052-vista-de-datos-de-modulos-en-agente-tree-view-services-metaconsola' into 'develop'
...
Fix metaconsole services tree view agent module data popup
See merge request artica/pandorafms!4473
2021-11-17 15:15:13 +00:00
3fc8e0cf7f
Merge branch 'ent-7994-carrefour-anadir-filtro-en-la-vista-de-custom-field-view-metaconsola' into 'develop'
...
added search capacity to multiple select
See merge request artica/pandorafms!4459
2021-11-17 15:14:31 +00:00
9ba2169de3
Merge branch 'ent-8239-12653-GUARDIA-No-devuelve-valor-SNMP-Interface-wizard-cuando-se-ejecuta-a-traves-de-pandora-exec-proxy-satelite' into 'develop'
...
Ent 8239 12653 guardia no devuelve valor snmp interface wizard cuando se ejecuta a traves de pandora exec proxy satelite
See merge request artica/pandorafms!4530
2021-11-17 10:20:43 +00:00
7a290bfac6
Auto-updated build strings.
2021-11-17 01:00:19 +01:00
3054c2d028
Merge branch 'ent-8124-Administradores-globales-usan-autenticacion-remota' into 'develop'
...
prevent global admins to log in remotely
See merge request artica/pandorafms!4497
2021-11-16 15:36:36 +00:00
7c7402e5fb
Merge branch 'ent-8066-errores-ldap-con-simbolos-en-la-pass-PHP' into 'develop'
...
Fix ldap auth php function passwords with special chars
See merge request artica/pandorafms!4444
2021-11-16 14:12:27 +00:00
5782193a38
Merge branch 'ent-8266-Error-sql-en-vista-de-agentes-de-una-política-en-metaconsola' into 'develop'
...
Ent 8266 error sql en vista de agentes de una política en metaconsola
See merge request artica/pandorafms!4532
2021-11-16 13:17:41 +00:00
5264f39065
Merge branch 'ent-7912-12337-Fallo-filtrado-Tree-view-widget-en-Dashboards' into 'develop'
...
Ent 7912 12337 fallo filtrado tree view widget en dashboards
See merge request artica/pandorafms!4503
2021-11-16 13:15:47 +00:00
7e8782f56b
Merge branch 'ent-6757-Aumentar-numero-caracteres-en-custom-graphs' into 'develop'
...
title en ticks bullet charts
See merge request artica/pandorafms!4521
2021-11-16 13:15:20 +00:00
ed4f5845d7
some minor changes
2021-11-16 14:11:54 +01:00
75f4e86f9e
Code highlight
2021-11-16 14:05:02 +01:00
f2b9d1fbd2
Merge branch 'ent-8134-Tree-View-Tags-Falla-la-búsqueda-por-módulos' into 'develop'
...
Ent 8134 tree view tags falla la búsqueda por módulos
See merge request artica/pandorafms!4500
2021-11-16 09:14:02 +00:00
7b717bcc6d
Auto-updated build strings.
2021-11-16 01:00:20 +01:00
cc859f3978
Entity, allow to duplicate objects
2021-11-15 19:29:37 +01:00
9ff3c8eee1
wip ncm2
2021-11-15 18:58:57 +01:00
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
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
147b3c4bb2
#8266 Fixed agent view in policies
2021-11-15 17:12:56 +01:00
845753112e
Merge branch 'ent-8167-usuario-sin-permisos-de-nodo-accede-a-nodo-en-el-primer-enlace' into 'develop'
...
Fix user acces to node from treeview on meta
See merge request artica/pandorafms!4507
2021-11-15 13:13:34 +00:00
8b258f9b5c
Merge branch 'ent-8044-Inconsistencia-en-ID-de-eventos-agrupados' into 'develop'
...
fix wrong event id in grouped events
See merge request artica/pandorafms!4461
2021-11-15 12:24:47 +00:00
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
c5a86e2782
Merge branch 'ent-7916-Macro-de-agentgroup-en-label-de-informes' into 'develop'
...
Ent 7916 macro de agentgroup en label de informes
See merge request artica/pandorafms!4489
2021-11-15 11:28:44 +00:00
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
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
a6fc887613
Merge branch 'ent-8041-Bug-en-item-Module-graph-CV-creados-desde-wizard' into 'develop'
...
Ent 8041 bug en item module graph cv creados desde wizard
See merge request artica/pandorafms!4471
2021-11-15 11:21:44 +00:00
4eb40382dd
Merge branch 'ent-8049-Bug-en-widget-Visual-console-de-Dasboards-metaconsola' into 'develop'
...
Ent 8049 bug en widget visual console de dasboards metaconsola
See merge request artica/pandorafms!4450
2021-11-15 11:20:21 +00:00
cd2f3b8a54
Merge branch 'ent-8098-Bug-en-filtro-de-Agents/Alerts' into 'develop'
...
Ent 8098 bug en filtro de agents/alerts
See merge request artica/pandorafms!4470
2021-11-15 11:18:27 +00:00
c02c03df02
Merge branch 'ent-8099-Vulnerabilidad-JQuery-mobile' into 'develop'
...
Ent 8099 vulnerabilidad j query mobile
See merge request artica/pandorafms!4498
2021-11-15 11:13:07 +00:00
115c59d9e8
Merge branch 'ent-8172-no-se-añaden-comentarios-a-eventos-en-meta' into 'develop'
...
Fix missing parameter meta on event comments ajax
See merge request artica/pandorafms!4510
2021-11-15 11:04:57 +00:00
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
aedea71823
Merge branch 'ent-8184-12568-Fallo-conteo-tactical-view' into 'develop'
...
Ent 8184 12568 fallo conteo tactical view
See merge request artica/pandorafms!4509
2021-11-15 10:56:46 +00:00
c8a808936a
Merge branch 'ent-7895-12309-Fallo-visualizacion-item-Incremental-en-informes' into 'develop'
...
fix data representation
See merge request artica/pandorafms!4491
2021-11-15 10:37:40 +00:00
9b55ade1bb
Merge branch 'ent-7997-fallo-visualizacion-vista-de-arbol-de-servicios' into 'develop'
...
Fix services tree empty leaf visual bug
See merge request artica/pandorafms!4410
2021-11-15 10:24:57 +00:00
68d416626d
Merge branch 'ent-7351-Vista-Module-Library-sale-de-margenes' into 'develop'
...
Fix module library
Closes pandora_enterprise#7351
See merge request artica/pandorafms!4335
2021-11-15 10:17:38 +00:00
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
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
34a8633aae
Merge branch 'ent-7905-bug-visual-agents-alerts-black-theme' into 'develop'
...
Fixed issue with OK label
Closes pandora_enterprise#7905
See merge request artica/pandorafms!4480
2021-11-15 10:09:39 +00:00
07135a4174
Merge branch 'ent-7904-cabeceras-fondo-blanco-items-vista-tag' into 'develop'
...
Fixed issue with class
Closes pandora_enterprise#7904
See merge request artica/pandorafms!4481
2021-11-15 10:07:30 +00:00
203aa3ef8a
Auto-updated build strings.
2021-11-15 01:00:15 +01:00
bb771ec140
Auto-updated build strings.
2021-11-14 01:00:16 +01:00
94fadddc80
Auto-updated build strings.
2021-11-13 01:00:19 +01:00
ee09470962
wip ncm2
2021-11-12 16:55:35 +01:00
e70ecd461e
WIP new report alert fired actions
2021-11-12 13:11:49 +01:00
e3ba62b6b6
remove quotes from strings
2021-11-12 10:16:18 +01:00
bfa8dc4473
Auto-updated build strings.
2021-11-12 01:00:07 +01:00
5a341c1067
Remove sections from ACL enterprise setup
2021-11-11 17:29:16 +01:00
293cb43544
fixed missing name and current value in snmp interface wizard when using satellite
2021-11-11 15:32:48 +01:00
49d9271b4e
fixed missing name and current value in snmp interface wizard when using satellite
2021-11-11 15:25:44 +01:00
6b724b7747
fixed missing name and current value in snmp interface wizard when using satellite
2021-11-11 15:20:21 +01:00
1fe0523a6a
fixed propagation in agents count
2021-11-11 11:07:24 +01:00
b5cc63c159
Auto-updated build strings.
2021-11-11 01:00:19 +01:00
94e8a35613
minor change
2021-11-10 17:14:12 +01:00
3069c89e6e
Auto-updated build strings.
2021-11-10 01:00:15 +01:00
707bee66c1
Auto-updated build strings.
2021-11-09 01:01:01 +01:00
e83485ce8c
fixed several counts
2021-11-08 18:01:09 +01:00
2d4c949113
add metaconsole calendars special days alerts
2021-11-08 13:07:31 +01:00
900a37ad5d
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
2021-11-08 08:54:41 +01:00
df48e7f73d
Auto-updated build strings.
2021-11-08 01:00:17 +01:00
b2db6064bf
Auto-updated build strings.
2021-11-07 01:00:17 +01:00
3e9bc55e68
Auto-updated build strings.
2021-11-06 01:00:21 +01:00
72f2caacd9
title en ticks bullet charts
2021-11-05 11:22:25 +01:00
c3e2b4361f
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
2021-11-05 10:00:15 +01:00
9c290d917e
Auto-updated build strings.
2021-11-05 01:00:12 +01:00
bdc4d0a8b1
Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
...
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
c0abe5edb9
Fix merge
2021-11-04 16:00:05 +01:00
932d42e8da
Fixed colours
2021-11-04 15:44:40 +01:00
cd163a96ef
wip special days alerts
2021-11-04 13:07:17 +01:00
c3f4addb0e
wip special days alerts
2021-11-04 12:33:40 +01:00
f521dec4e2
wip special days alerts
2021-11-04 10:10:11 +01:00
bd75912a0d
wip special days alerts
2021-11-04 09:55:37 +01:00
e8c6342af4
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
2021-11-04 08:15:01 +01:00
4ebb817d90
Auto-updated build strings.
2021-11-04 01:00:54 +01:00
fdca5e4a78
wip special days alerts
2021-11-03 17:30:54 +01:00
89e1f4ed92
Merge branch 'ent-8218-Actualizar-cadenas-español' into 'develop'
...
Ent 8218 actualizar cadenas español
See merge request artica/pandorafms!4518
2021-11-03 13:04:12 +00:00
7b2cd564c4
#8218 Added mo and po fr
2021-11-03 13:33:29 +01:00
53361484fd
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
2021-11-03 11:16:46 +01:00
1e976a8605
alerts special days wip
2021-11-03 10:59:00 +01:00
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
3ccd97f50f
#8218 deleted mo and po
2021-11-03 09:18:58 +01:00
a1c7aebc2b
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
2021-11-03 08:04:15 +01:00
0be9abcdca
Auto-updated build strings.
2021-11-03 01:00:21 +01:00
25268ec9b4
color
2021-11-02 17:49:45 +01:00
4f6fa654b8
#8218 Added mo and po 2
2021-11-02 17:10:53 +01:00
8163f820a9
Merge branch 'ent-8218-Actualizar-cadenas-español' into 'develop'
...
Ent 8218 actualizar cadenas español
See merge request artica/pandorafms!4514
2021-11-02 14:36:24 +00:00
845275b947
Merge branch 'ent-8209-Problemas-Odometer-Consola-Visual' into 'develop'
...
Ent 8209 problemas odometer consola visual
See merge request artica/pandorafms!4512
2021-11-02 14:31:56 +00:00
3a74a6ea42
custom val
2021-11-02 13:59:17 +01:00
4f2bca1df4
Added sync status notifications
2021-11-02 13:51:30 +01:00
976e881cb9
Message update notif.syncqueue.length
2021-11-02 12:48:48 +01:00
7f35845944
Notifications if syncqueue exceeds limits in MC
2021-11-02 12:47:36 +01:00
fd03aff74b
#8218 Added mo and po
2021-11-02 12:11:07 +01:00
3ed3a14443
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
2021-11-02 08:08:19 +01:00
23566c9ef4
Auto-updated build strings.
2021-11-02 01:00:18 +01:00
f1734e56c3
Auto-updated build strings.
2021-11-01 01:00:17 +01:00
7b9234f392
Auto-updated build strings.
2021-10-31 01:00:19 +02:00
6c6c375702
Auto-updated build strings.
2021-10-30 01:00:24 +02:00
b4c21cfdca
fixed several bugs in AD authentication in metaconsole
2021-10-29 16:12:23 +02:00
9792e64ed5
#8209 Fixed odometer
2021-10-29 14:35:57 +02:00
89680907fd
wip special days
2021-10-29 13:45:18 +02:00
9b6f829171
Merge branch 'ent-8183-Bug-en-widget-Tree-view-Dashboard-metaconsola' into 'develop'
...
dashboard widget tree fix in metaconsole only groups type
See merge request artica/pandorafms!4511
2021-10-29 11:07:42 +00:00
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
9d776feb41
dashboard widget tree fix in metaconsole only groups type
2021-10-29 11:50:41 +02:00
b5e5294053
#8184 Fixed tactical get data with secondary group
2021-10-29 11:38:08 +02:00
6a2e249af7
Fix missing parameter meta on event comments ajax
2021-10-29 10:23:56 +02:00
c903942c7b
Auto-updated build strings.
2021-10-29 01:00:21 +02:00
c2cce3990a
special days template alerts
2021-10-28 17:30:03 +02:00
59c401d402
Fix user acces to node from treeview on meta
2021-10-28 14:35:20 +02:00
7cd429d9f8
Auto-updated build strings.
2021-10-28 01:00:22 +02:00
2d09e5bfb7
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
2021-10-27 22:59:19 +02:00
e1f38aed0d
Fix menu favourite GIS maps. services and dashboards large title
2021-10-27 19:41:29 +02:00
1e51197afb
Fix menu favourite GIS maps. services and dashboards large title
2021-10-27 19:39:18 +02:00
3b49b28d9e
#8146 Fixed max hours
2021-10-27 09:18:28 +02:00
945392b615
Auto-updated build strings.
2021-10-27 01:00:56 +02:00
2de38a915b
#7912 Hidden agents without modules
2021-10-26 15:36:12 +02:00
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
e2ae42dd89
Merge branch 'ent-7060-gestion-basica-de-configuracion-de-equipos-de-red' into 'develop'
...
NCM
See merge request artica/pandorafms!4434
2021-10-26 08:21:01 +00:00
24404d5078
Auto-updated build strings.
2021-10-26 01:01:06 +02:00
3436d80d09
Merge branch 'ent-8132-Bug-in-supernet-tree-view-IPAM' into 'develop'
...
fixed ipam supernet tree view when there is no data show
See merge request artica/pandorafms!4499
2021-10-25 15:15:13 +00:00
030938c78e
#8134 Fixed search module
2021-10-25 15:40:43 +02:00
aa24bf545c
fixed ipam supernet tree view when there is no data show
2021-10-25 12:14:21 +02:00
05bc15f74c
#8099 Added jquery mobile 1.4.5
2021-10-25 11:09:24 +02:00
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
56ca01112d
Auto-updated build strings.
2021-10-25 01:00:48 +02:00
ef41522899
Auto-updated build strings.
2021-10-24 01:00:45 +02:00
Jose Gonzalez
artica
Daniel Maya
Daniel Rodriguez
fbsanchez
Alejandro Campos
Daniel Barbero Martin
Calvo
José González
vgilc