Commit Graph

23091 Commits

Author SHA1 Message Date
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 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
Daniel Rodriguez 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
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 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
Daniel Rodriguez 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
alejandro.campos@artica.es 3f0fd30eb8 added resolution field in creation and update operations 2021-11-16 14:13:45 +01:00
fbsanchez ed4f5845d7 some minor changes 2021-11-16 14:11:54 +01:00
fbsanchez 75f4e86f9e Code highlight 2021-11-16 14:05:02 +01: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
Daniel Rodriguez 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
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
Daniel Rodriguez 01246a7e68 Merge branch 'ent-8053-Header-en-public-view-dashboard-no-se-ve-correctamente-en-la-primera-carga' into 'develop'
Ent 8053 header en public view dashboard no se ve correctamente en la primera carga

See merge request artica/pandorafms!4448
2021-11-16 09:12:04 +00:00
artica 7b717bcc6d Auto-updated build strings. 2021-11-16 01:00:20 +01:00
fbsanchez cc859f3978 Entity, allow to duplicate objects 2021-11-15 19:29:37 +01:00
fbsanchez 9ff3c8eee1 wip ncm2 2021-11-15 18:58:57 +01: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 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
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 147b3c4bb2 #8266 Fixed agent view in policies 2021-11-15 17:12:56 +01:00
Daniel Rodriguez 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
Daniel Rodriguez 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
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 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
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 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 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
Daniel Rodriguez 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
Daniel Rodriguez 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
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 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
Daniel Rodriguez 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
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 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
Daniel Rodriguez 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
Daniel Rodriguez 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
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 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
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
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 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
Daniel Rodriguez 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
Daniel Rodriguez 0a93d93701 Merge branch 'ent-8111-12549-R-WORKS-X-Frame-Options-Header-en-php' into 'develop'
Ent 8111 12549 r works x frame options header en php

See merge request artica/pandorafms!4479
2021-11-15 10:05:30 +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
artica 203aa3ef8a Auto-updated build strings. 2021-11-15 01:00:15 +01:00
artica bb771ec140 Auto-updated build strings. 2021-11-14 01:00:16 +01:00
artica 94fadddc80 Auto-updated build strings. 2021-11-13 01:00:19 +01:00
fbsanchez ee09470962 wip ncm2 2021-11-12 16:55:35 +01:00
alejandro.campos@artica.es 406a8b702b visual fixes 2021-11-12 13:30:33 +01:00
Daniel Barbero Martin 0caeee185e WIP new report alert fired actions 2021-11-12 13:21:05 +01:00
Daniel Barbero Martin e70ecd461e WIP new report alert fired actions 2021-11-12 13:11:49 +01:00
alejandro.campos@artica.es e3ba62b6b6 remove quotes from strings 2021-11-12 10:16:18 +01:00
artica bfa8dc4473 Auto-updated build strings. 2021-11-12 01:00:07 +01:00
Calvo 5a341c1067 Remove sections from ACL enterprise setup 2021-11-11 17:29:16 +01:00
alejandro.campos@artica.es 293cb43544 fixed missing name and current value in snmp interface wizard when using satellite 2021-11-11 15:32:48 +01:00
alejandro.campos@artica.es 49d9271b4e fixed missing name and current value in snmp interface wizard when using satellite 2021-11-11 15:25:44 +01:00
alejandro.campos@artica.es 6b724b7747 fixed missing name and current value in snmp interface wizard when using satellite 2021-11-11 15:20:21 +01:00
alejandro.campos@artica.es 1fe0523a6a fixed propagation in agents count 2021-11-11 11:07:24 +01:00
artica b5cc63c159 Auto-updated build strings. 2021-11-11 01:00:19 +01:00
fbsanchez 0cca3a35d5 some icons 2021-11-10 17:14:23 +01:00
fbsanchez 94e8a35613 minor change 2021-11-10 17:14:12 +01:00
fbsanchez a96d5d68e3 MR updates for NCMv2 2021-11-10 17:13:17 +01:00
artica 3069c89e6e Auto-updated build strings. 2021-11-10 01:00:15 +01:00
artica 707bee66c1 Auto-updated build strings. 2021-11-09 01:01:01 +01:00
alejandro.campos@artica.es e83485ce8c fixed several counts 2021-11-08 18:01:09 +01:00
Calvo 94d1964166 Fix server name item on reporting buider 2021-11-08 13:27:32 +01:00
Daniel Barbero Martin 2d4c949113 add metaconsole calendars special days alerts 2021-11-08 13:07:31 +01:00
Daniel Barbero Martin 900a37ad5d Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-08 08:54:41 +01:00
artica df48e7f73d Auto-updated build strings. 2021-11-08 01:00:17 +01:00
artica b2db6064bf Auto-updated build strings. 2021-11-07 01:00:17 +01:00
artica 3e9bc55e68 Auto-updated build strings. 2021-11-06 01:00:21 +01:00
Calvo 61bdc1f4e0 Fix ACL grous AW creation 2021-11-05 15:21:04 +01:00
Daniel Barbero Martin ea747f25f3 Fix mr pandoradb migrate 2021-11-05 12:29:34 +01:00
Daniel Barbero Martin 72f2caacd9 title en ticks bullet charts 2021-11-05 11:22:25 +01:00
Daniel Barbero Martin c3e2b4361f Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-05 10:00:15 +01:00
artica 9c290d917e Auto-updated build strings. 2021-11-05 01:00:12 +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
Jose Gonzalez 932d42e8da Fixed colours 2021-11-04 15:44:40 +01:00
Daniel Barbero Martin cd163a96ef wip special days alerts 2021-11-04 13:07:17 +01:00
Daniel Barbero Martin c3f4addb0e wip special days alerts 2021-11-04 12:33:40 +01:00
Daniel Barbero Martin 93aad130cb wip special days alerts 2021-11-04 10:20:03 +01:00
Daniel Barbero Martin f521dec4e2 wip special days alerts 2021-11-04 10:10:11 +01:00
Daniel Barbero Martin bd75912a0d wip special days alerts 2021-11-04 09:55:37 +01:00
Daniel Barbero Martin e8c6342af4 Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-04 08:15:01 +01:00
artica 4ebb817d90 Auto-updated build strings. 2021-11-04 01:00:54 +01:00
Daniel Barbero Martin fdca5e4a78 wip special days alerts 2021-11-03 17:30:54 +01:00
vgilc 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
Daniel Maya 7b2cd564c4 #8218 Added mo and po fr 2021-11-03 13:33:29 +01:00
Daniel Barbero Martin 53361484fd Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-03 11:16:46 +01:00
Daniel Barbero Martin c73ee2d113 updated mr and version 2021-11-03 11:04:19 +01:00
Daniel Barbero Martin 1e976a8605 alerts special days wip 2021-11-03 10:59:00 +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 3ccd97f50f #8218 deleted mo and po 2021-11-03 09:18:58 +01:00
Daniel Barbero Martin a1c7aebc2b Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-03 08:04:15 +01:00
artica 0be9abcdca Auto-updated build strings. 2021-11-03 01:00:21 +01:00
Daniel Barbero Martin 25268ec9b4 color 2021-11-02 17:49:45 +01:00
fbsanchez 08d4323941 set deployment_timeout per agent installation file 2021-11-02 17:37:47 +01:00
Daniel Maya 4f6fa654b8 #8218 Added mo and po 2 2021-11-02 17:10:53 +01:00
Daniel Rodriguez 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
Daniel Rodriguez 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
fbsanchez 3a74a6ea42 custom val 2021-11-02 13:59:17 +01:00
fbsanchez 4f2bca1df4 Added sync status notifications 2021-11-02 13:51:30 +01:00
fbsanchez 976e881cb9 Message update notif.syncqueue.length 2021-11-02 12:48:48 +01:00
fbsanchez 7f35845944 Notifications if syncqueue exceeds limits in MC 2021-11-02 12:47:36 +01:00
Daniel Maya fd03aff74b #8218 Added mo and po 2021-11-02 12:11:07 +01:00
Daniel Maya 031e0a2cd7 #8169 Fixed group recursion with standar user 2021-11-02 11:08:15 +01:00
Daniel Barbero Martin 3ed3a14443 Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-02 08:08:19 +01:00
artica 23566c9ef4 Auto-updated build strings. 2021-11-02 01:00:18 +01:00
artica f1734e56c3 Auto-updated build strings. 2021-11-01 01:00:17 +01:00
artica 7b9234f392 Auto-updated build strings. 2021-10-31 01:00:19 +02:00
artica 6c6c375702 Auto-updated build strings. 2021-10-30 01:00:24 +02:00
alejandro.campos@artica.es b4c21cfdca fixed several bugs in AD authentication in metaconsole 2021-10-29 16:12:23 +02:00
Daniel Maya 9792e64ed5 #8209 Fixed odometer 2021-10-29 14:35:57 +02:00
Daniel Barbero Martin 89680907fd wip special days 2021-10-29 13:45:18 +02:00
Daniel Rodriguez 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
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
Daniel Barbero Martin 9d776feb41 dashboard widget tree fix in metaconsole only groups type 2021-10-29 11:50:41 +02:00
Daniel Maya b5e5294053 #8184 Fixed tactical get data with secondary group 2021-10-29 11:38:08 +02:00
Calvo 6a2e249af7 Fix missing parameter meta on event comments ajax 2021-10-29 10:23:56 +02:00
artica c903942c7b Auto-updated build strings. 2021-10-29 01:00:21 +02:00
Daniel Barbero Martin c2cce3990a special days template alerts 2021-10-28 17:30:03 +02:00
Calvo 59c401d402 Fix user acces to node from treeview on meta 2021-10-28 14:35:20 +02:00
Daniel Rodriguez dfede4de78 Merge branch 'ent-8181-umc-traer-cambios' into 'develop'
UM replicated

See merge request artica/pandorafms!4506
2021-10-28 09:41:41 +00:00
artica 7cd429d9f8 Auto-updated build strings. 2021-10-28 01:00:22 +02:00
fbsanchez 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
fbsanchez 77bee9f3ca UM replicated 2021-10-27 22:28:37 +02:00
Calvo e1f38aed0d Fix menu favourite GIS maps. services and dashboards large title 2021-10-27 19:41:29 +02:00
Calvo 1e51197afb Fix menu favourite GIS maps. services and dashboards large title 2021-10-27 19:39:18 +02:00
Daniel Maya 3b49b28d9e #8146 Fixed max hours 2021-10-27 09:18:28 +02:00
artica 945392b615 Auto-updated build strings. 2021-10-27 01:00:56 +02:00
Daniel Maya 2de38a915b #7912 Hidden agents without modules 2021-10-26 15:36:12 +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
alejandro.campos@artica.es 24e73ce420 fix count in module groups view 2021-10-26 12:57:01 +02:00
Daniel Rodriguez 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
artica 24404d5078 Auto-updated build strings. 2021-10-26 01:01:06 +02:00
Daniel Rodriguez 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
fbsanchez 05a2db88a3 menu fix 2021-10-25 17:01:26 +02:00
Daniel Maya 030938c78e #8134 Fixed search module 2021-10-25 15:40:43 +02:00
fbsanchez dabd7f53fe minor fixes 2021-10-25 14:05:11 +02:00
alejandro.campos@artica.es aa24bf545c fixed ipam supernet tree view when there is no data show 2021-10-25 12:14:21 +02:00
Daniel Maya 05bc15f74c #8099 Added jquery mobile 1.4.5 2021-10-25 11:09:24 +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
artica 56ca01112d Auto-updated build strings. 2021-10-25 01:00:48 +02:00
artica ef41522899 Auto-updated build strings. 2021-10-24 01:00:45 +02:00
artica 134f6ea2a5 Auto-updated build strings. 2021-10-23 01:00:54 +02:00
Calvo c6921efdce Unify search criteria case insensitive 2021-10-22 14:43:14 +02:00
alejandro.campos@artica.es 40aec564af prevent global admins to log in remotely 2021-10-22 14:38:20 +02:00
Calvo f1f984614f Unify search criteria case insensitive 2021-10-22 12:02:31 +02:00
Daniel Rodriguez 6e12e5363e Merge branch 'ent-8055-tareas-programadas-almacenadas-en-disco-rotas-fix-mr-48' into 'develop'
Fix mr 48 breaking tasks

See merge request artica/pandorafms!4478
2021-10-22 09:58:57 +00: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
artica 1218932b05 Auto-updated build strings. 2021-10-22 01:00:20 +02:00
fbsanchez 796a7125e1 Errata fix 2021-10-21 14:33:44 +02:00
Calvo a03e46ecea Fix parameters in cron_task_generate_report_by_template 2021-10-21 12:25:39 +02:00
fbsanchez df863c6057 minor fix NCM test script 2021-10-21 12:20:12 +02:00
fbsanchez 303d6632e1 NCM 2021-10-21 11:28:14 +02:00
fbsanchez bb8dbc9332 NCM 2021-10-21 02:17:17 +02:00
artica 80c7f106ad Auto-updated build strings. 2021-10-21 01:00:55 +02:00
Daniel Maya 6520f95fcf #7947 Fixed integria IMS ticket in metaconsole 2021-10-20 17:06:24 +02:00
artica 6ccf3a9ee9 Updated version and build strings. 2021-10-20 15:31:02 +02:00
alejandro.campos@artica.es 77aba53c7e fix data representation 2021-10-20 15:26:16 +02:00
alejandro.campos@artica.es 3e1dcbb554 changed text 2021-10-20 13:30:24 +02:00
Daniel Maya 30d1e3ec23 #7916 Fixed group name 2021-10-20 13:09:47 +02:00
Jose Gonzalez 070c920e0e Fixed tip position and code style 2021-10-20 13:01:13 +02:00
alejandro.campos@artica.es 14076efc69 minor fix 2021-10-20 12:48:42 +02:00
artica b70ca89af2 Auto-updated build strings. 2021-10-20 01:01:06 +02:00
fbsanchez 98c43ea1e7 WIP NCM 2021-10-19 21:11:09 +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 7931668021 add capability to upload files in ticket creation and update on Integria integration system 2021-10-19 15:34:17 +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
Jose Gonzalez 05e352e9cf Fixed issue with class 2021-10-19 11:11:58 +02:00
artica 65b0d839f9 Auto-updated build strings. 2021-10-19 01:00:50 +02:00
Jose Gonzalez dc3e690502 Fixed issue with OK label 2021-10-18 17:24:41 +02:00
Daniel Maya c8a11543e8 #8111 Fixed X-Frame-Options 2021-10-18 16:36:10 +02:00
Calvo 9f71a9ba81 Fix mr 48 breaking tasks 2021-10-18 16:05:37 +02:00
Calvo 7daf138ef5 Fix recursion and filter on modules massive operations 2021-10-18 15:47:22 +02:00
Daniel Rodriguez 704403fd52 Merge branch 'ent-7972-funcionalidad-historico-de-alertas-lanzadas' into 'develop'
Ent 7972 funcionalidad historico de alertas lanzadas

See merge request artica/pandorafms!4465
2021-10-18 11:36:19 +00:00
alejandro.campos@artica.es 8db66c7e0e add sorting capability to integriaims ticket list 2021-10-18 11:45:48 +02:00
Daniel Rodriguez aa2eb08edb Merge branch 'ent-fix-snmp-interfaces-wizard' into 'develop'
Fixed SNMP interfaces wizard against 32bit counter devices.

See merge request artica/pandorafms!4348
2021-10-18 08:33:17 +00:00
Calvo bd46cb7abc Fix metaconsole services tree view agent module data popup 2021-10-18 10:26:47 +02:00
Daniel Rodriguez cd73f534f9 Merge branch 'ent-8104-bug-delete-files-update-manager' into 'develop'
Fix delete files issue

See merge request artica/pandorafms!4472
2021-10-18 08:18:31 +00:00
Daniel Rodriguez 0c777c2925 Merge branch 'ent-8090-Bug-al-crear-template-en-Consolas-Visuales' into 'develop'
Ent 8090 bug al crear template en consolas visuales

See merge request artica/pandorafms!4469
2021-10-18 06:49:36 +00:00
artica c043c3d023 Auto-updated build strings. 2021-10-18 01:00:18 +02:00
artica 6da17b11aa Auto-updated build strings. 2021-10-17 01:00:18 +02:00
artica 0e9f37a090 Auto-updated build strings. 2021-10-16 01:00:22 +02:00
fbsanchez 6c0e2d23de updates 2021-10-15 13:39:23 +02:00
Jose Gonzalez 5b4043d9ea Fix delete files issue 2021-10-15 13:31:19 +02:00
Daniel Rodriguez 691b23c442 Merge branch 'ent-7722-cambio-en-el-comportamiento-de-modulos-al-editar-un-servicio' into 'develop'
Recreate service modules

See merge request artica/pandorafms!4456
2021-10-15 09:52:03 +00:00
Daniel Maya 9976783266 #8041 Fixed module graph height 2021-10-15 11:43:43 +02:00
Jose Gonzalez 304a4b5687 Fix size of event detail tabs 2021-10-15 09:36:22 +02:00
artica af9711ec3d Auto-updated build strings. 2021-10-15 01:00:20 +02:00
fbsanchez 75949691f3 fix mr 2021-10-14 21:22:21 +02:00
fbsanchez 6a537e58f4 Fix 2021-10-14 21:09:14 +02:00
fbsanchez 79174d512d Added tncm_vendor and model to manage targetrs 2021-10-14 20:44:05 +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 a300ca5786 #8098 Fixed pagination 2021-10-14 11:33:06 +02:00
artica 20448faa35 Auto-updated build strings. 2021-10-14 01:00:21 +02:00
fbsanchez 96250dcfa0 WIP NCM 2021-10-13 22:47:31 +02:00
Daniel Maya e986005cc0 #8090 Added auto_adjust in tlayout_template 2021-10-13 17:23:34 +02:00
Daniel Maya 4579d2b8c6 #8105 Fixed list of elements 2021-10-13 15:20:20 +02:00
Jose Gonzalez 3f28a98744 Added feature for read comments in grouped events 2021-10-13 14:58:31 +02:00
artica 9d813b729e Auto-updated build strings. 2021-10-13 01:00:13 +02:00
artica 4fd071cf60 Auto-updated build strings. 2021-10-12 01:00:19 +02:00
fbsanchez d2f5a04583 WIP NCM 2021-10-11 20:42:43 +02:00
Jose Gonzalez 8bf19e348f Fix 2021-10-11 08:18:55 +02:00
artica a8937abb65 Auto-updated build strings. 2021-10-11 01:00:15 +02:00
artica 2b419b826d Auto-updated build strings. 2021-10-10 01:00:16 +02:00
artica 9867024d2e Auto-updated build strings. 2021-10-09 01:00:19 +02:00
fbsanchez ef42348807 compat mysql 5.1 exceeded key 2021-10-08 16:02:06 +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
fbsanchez 81e696a045 fix in not null matching rule 2021-10-08 15:30:32 +02:00
fbsanchez fa35e6054c Fixes 2021-10-08 15:30:17 +02:00
fbsanchez 1cb2f77945 WIP NCM 2021-10-08 15:12:23 +02:00
Jose Gonzalez eaaab1e250 Added visual tab Custom data in events 2021-10-08 14:59:18 +02:00
Jose Gonzalez aafa979b4a Fixed name 2021-10-08 12:37:09 +02:00
alejandro.campos@artica.es 088193438f fix wrong event id in grouped events 2021-10-08 11:59:29 +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
artica eb5b34b99e Auto-updated build strings. 2021-10-08 01:00:19 +02:00
alejandro.campos@artica.es 21c1bacc0e added search capacity to multiple select 2021-10-07 17:12:00 +02:00
marcos 96638189f2 new integriaims logo 2021-10-07 16:46:49 +02: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 Alconada 4378c3d6f5 Merge branch 'develop' into 'ent-8084-elementos-deshabilitados-irreconocibles-con-black-theme'
# Conflicts:
#   pandora_console/include/styles/pandora_black.css
2021-10-07 13:42:14 +00:00
Daniel Rodriguez f25035db58 Merge branch 'ent-8086-iconos-de-tree-view-metaconsola-rotos' into 'develop'
Some ui_get_full_url improvements

See merge request artica/pandorafms!4449
2021-10-07 13:36:30 +00:00
Daniel Rodriguez e1a55e78ac Merge branch 'ent-8094-iconos-de-politicas-en-blanco-black-theme' into 'develop'
set bg transparent on images black theme

See merge request artica/pandorafms!4454
2021-10-07 13:34:57 +00:00
Jose Gonzalez 2c22e53e9d Fixed Diagnostics 2021-10-07 14:20:59 +02:00
marcos f55a6685bd show only events filter in acl groups 2021-10-07 14:09:02 +02:00
marcos 34350c92a0 fixed visual black theme error 2021-10-07 13:43:46 +02:00
fbsanchez d4ceaa4643 Recreate service modules 2021-10-07 13:21:04 +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
fbsanchez 2050c137ec errata fix 2021-10-07 12:25:41 +02:00
Daniel Maya 49ffdf822b #8040 Fixed module graph 2021-10-07 11:50:27 +02:00
Daniel Rodriguez 2118f44a7a Merge branch 'ent-7964-nug-visual-en-tree-view' into 'develop'
Added title attr to module names in treeview

See merge request artica/pandorafms!4412
2021-10-07 08:42:01 +00:00
marcos 52f87757d6 set bg transparent on images black theme 2021-10-07 10:30:05 +02:00
Daniel Maya e9b6acc1a8 #8039 Fixed network link 2021-10-07 10:27:31 +02:00
marcos 795d5c055a merge conflict 2021-10-07 09:56:17 +02:00
artica c7face04e1 Auto-updated build strings. 2021-10-07 01:00:20 +02:00