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

15513 Commits

Author SHA1 Message Date
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 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 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 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 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 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
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
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 94e8a35613 minor change 2021-11-10 17:14:12 +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
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
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
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 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 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
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 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
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
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
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
Daniel Maya 030938c78e #8134 Fixed search module 2021-10-25 15:40:43 +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
artica 1218932b05 Auto-updated build strings. 2021-10-22 01:00:20 +02:00
Calvo a03e46ecea Fix parameters in cron_task_generate_report_by_template 2021-10-21 12:25:39 +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
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
Daniel Maya 30d1e3ec23 #7916 Fixed group name 2021-10-20 13:09:47 +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 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
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
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
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
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
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
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
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 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 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
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 85037693b2 fixed visual black theme error 2021-10-07 16:45:56 +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 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 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 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
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
fbsanchez 6781e513c8 NCM WIP 2021-10-06 19:52:46 +02:00
Daniel Maya eab82aa6d1 #8049 Fixed get visual console with selected node 2021-10-06 16:49:21 +02:00
fbsanchez 35eb1d0790 Some ui_get_full_url improvements 2021-10-06 15:13:21 +02:00
fbsanchez 8764413597 Some ui_get_full_url improvements 2021-10-06 15:07:46 +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 3f86528c80 Merge branch 'ent-7910-pandora-db-con-db-encriptada' into 'develop' 
Fix issue with encrypted password

Closes pandora_enterprise#7910

See merge request artica/pandorafms!4433
 2021-10-06 12:42:12 +00:00
Daniel Rodriguez ce656997a5 Merge branch 'ent-8078-Los-tokens-de-selector-general-del-wizard-SNMP-no-funcionan' into 'develop' 
fix block selector in snmp wizards

See merge request artica/pandorafms!4443
 2021-10-06 12:28:40 +00:00
Jose Gonzalez a70d48514e Fix Barivion name in license and readme 2021-10-06 13:33:25 +02:00
Daniel Rodriguez 69216e1bcf Merge branch 'ent-8056-12473-Funcion-get-magic-quotes-gpc-hace-fallar-snmp-browser-para-PHP-7-4-o-superior' into 'develop' 
removed deprecated get_magic_quotes_gpc function and dependent code

See merge request artica/pandorafms!4439
 2021-10-06 10:30:58 +00:00
Calvo 50dbeb03ce Fix entities on modules with large name treeview 2021-10-06 10:41:55 +02:00
Daniel Rodriguez 35c877ad79 Merge branch 'ent-8024-source-ip-advanced-filter' into 'develop' 
Ent 8024 source ip advanced filter

See merge request artica/pandorafms!4430
 2021-10-06 08:34:56 +00:00
Daniel Rodriguez 8b889b6c5b Merge branch 'ent-7990-error-servicios-metaconsola-detras-de-un-reverse-proxy' into 'develop' 
Please check carefully this change

See merge request artica/pandorafms!4442
 2021-10-06 08:32:46 +00:00
Daniel Rodriguez b56026ef59 Merge branch 'ent-8051-Giss-informe-de-grafica-de-prediccion-no-funciona-en-metaconsola' into 'develop' 
fixed projection report in metaconsole

See merge request artica/pandorafms!4440
 2021-10-06 08:31:30 +00:00
artica 1ebc2ed082 Auto-updated build strings. 2021-10-06 01:00:22 +02:00
Calvo 1fca24d8dc Fix ldap auth php function passwords with special chars 2021-10-05 18:00:16 +02:00
fbsanchez e335bb6885 some fixes, please hard test 2021-10-05 17:03:06 +02:00
alejandro.campos@artica.es 4016d97c39 fix block selector in snmp wizards 2021-10-05 16:51:13 +02:00
fbsanchez ec8d5b4fe4 Please check carefully this change 2021-10-05 15:09:30 +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 4cff768f4b Merge branch 'ent-7760-bug-visual-con-el-times-in-al-añadir-una-accion-a-una-alerta-de-correlacion' into 'develop' 
fixed visual error with time in action on ca

See merge request artica/pandorafms!4294
 2021-10-05 09:27:30 +00:00
Daniel Rodriguez 961522218e Merge branch 'ent-7694-imagen-pequena-en-sap-view' into 'develop' 
fixed size sap logo

See merge request artica/pandorafms!4289
 2021-10-05 09:25:35 +00:00
Daniel Rodriguez 1595b99e09 Merge branch 'ent-7748-fallo-visual-en-snmp-interfaces-wizard' into 'develop' 
fallo critico del swich regordete

See merge request artica/pandorafms!4288
 2021-10-05 09:24:51 +00:00
Daniel Rodriguez 6cbf83b2e2 Merge branch 'ent-7780-error-black-theme-en-transaccional-maps' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4285
 2021-10-05 09:23:14 +00:00
Daniel Rodriguez 4b5719c1da Merge branch 'ent-7781-black-theme-botones-blancos-en-filtro-de-eventos' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4283
 2021-10-05 09:22:35 +00:00
Daniel Rodriguez 086761b7b6 Merge branch 'ent-7822-vista-agents-modules-descuadra-cuando-la-ventana-no-esta-maximizada' into 'develop' 
fixed visual error with modules agents

See merge request artica/pandorafms!4390
 2021-10-05 09:22:05 +00:00
Daniel Rodriguez fb7e443138 Merge branch 'ent-7938-bug-visual-en-item-odometro-cv' into 'develop' 
Ent 7938 bug visual en item odometro cv

See merge request artica/pandorafms!4386
 2021-10-05 09:20:47 +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
alejandro.campos@artica.es ccac91e83c fixed projection report in metaconsole 2021-10-05 10:47:50 +02:00
artica d1b9dc4ef8 Auto-updated build strings. 2021-10-05 01:00:20 +02:00
fbsanchez e11d8f3766 minor schema update 2021-10-04 19:43:57 +02:00
alejandro.campos@artica.es c08806374e removed deprecated get_magic_quotes_gpc function and dependent code 2021-10-04 17:37:06 +02:00
marcos aa43caee23 resolved mrege conflicts 2021-10-04 14:22:11 +02:00
marcos 4f2be6f280 add title on odometer 2021-10-04 13:32:48 +02:00
marcos 7418719861 resolved merge conflict 2021-10-04 12:27:57 +02:00