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

11254 Commits

Author SHA1 Message Date
Daniel Rodriguez 791d8f512a Merge branch 'ent-4311-Fallos_en_graficas_al_descargar_informes' into 'develop' 
fixed error in pdf

See merge request artica/pandorafms!2585
 2019-07-15 16:53:07 +02:00
Alejandro Fraguas e3e187b122 Merge branch 'ent-4308-error-sql-en-la-vista-de-reprotes-en-html-de-groups-event-report-metaconsola' into 'develop' 
Resolved error query

See merge request artica/pandorafms!2566
 2019-07-15 15:44:39 +02:00
Alejandro Fraguas 5498e1df3c Merge branch 'ent-4038-warning-php-vodat' into 'develop' 
Fixed wrong img paths

See merge request artica/pandorafms!2551
 2019-07-15 14:51:23 +02:00
Daniel Rodriguez 69da2f22ec Merge branch 'ent-3793-fallo-en-la-resolucion-de-los-informes-de-netflow' into 'develop' 
Fixed netflow reports resolution

Closes pandora_enterprise#3793

See merge request artica/pandorafms!2310
 2019-07-15 14:21:19 +02:00
Daniel Rodriguez 81c4bd1a76 Merge branch 'ent-3333-etiquetas-a-los-items-en-el-builder-de-consolas-visuales' into 'develop' 
Ent 3333 etiquetas a los items en el builder de consolas visuales

See merge request artica/pandorafms!2344
 2019-07-15 14:12:16 +02:00
Daniel Rodriguez 244c00e96f Merge branch 'ent-3428-error-grafica-events-per-agent-en-item-event-report-group-en-meta' into 'develop' 
fixed errors with graphs in meta

See merge request artica/pandorafms!2594
 2019-07-15 13:10:55 +02:00
Daniel Rodriguez 26e30f7c25 Merge branch 'ent-3656-Vista_tactica_modulos_sec' into 'develop' 
fixed errors modules/sec in tactical view

See merge request artica/pandorafms!2600
 2019-07-15 12:36:11 +02:00
artica 7a8413154f Auto-updated build strings. 2019-07-15 10:21:25 +02:00
artica 17dcb2feb3 Auto-updated build strings. 2019-07-13 00:01:10 +02:00
Daniel Barbero 683059af43 fixed errors mod/sec tactical view 2019-07-12 14:53:44 +02:00
Daniel Barbero 7288a6e262 fixed errors modules/sec in tactical view 2019-07-12 13:36:29 +02:00
Daniel Rodriguez 91f55c326e Merge branch 'ent-4351-Modificar-imagenes-con-bordes-blancos-para-que-sean-transparentes' into 'develop' 
Changed images with transparent borders - #4351

See merge request artica/pandorafms!2597
 2019-07-12 13:24:44 +02:00
Alejandro Fraguas bfc267691b Merge branch 'ent-3105-comportamiento-public_url' into 'develop' 
Ent 3105 comportamiento public url

See merge request artica/pandorafms!2568
 2019-07-12 13:02:42 +02:00
fbsanchez e2f3a3fd0c Update functions_ui.php minor adjustment 2019-07-12 12:35:39 +02:00
fbsanchez cca5c7fcf3 Update ui_get_full_url meta with def. target/pandora_console as public_url 2019-07-12 12:27:58 +02:00
Daniel Rodriguez 24cbe3bd8e Merge branch 'ent-4347-Desplazamiento-de-un-cuadro-sobre-otro-en-la-configuracion-de-las-visual-styles' into 'develop' 
Ent 4347 desplazamiento de un cuadro sobre otro en la configuracion de las visual styles

See merge request artica/pandorafms!2598
 2019-07-12 10:26:05 +02:00
Tatiana Llorente fca4a288a2 Changed gray image in discovery - #4351 2019-07-12 10:23:20 +02:00
Tatiana Llorente cac34e3311 Changed gray image in discovery - #4351 2019-07-12 10:21:54 +02:00
fbsanchez c386a29b80 Merge remote-tracking branch 'origin/develop' into ent-3105-comportamiento-public_url 2019-07-12 09:38:28 +02:00
artica fe98189779 Auto-updated build strings. 2019-07-12 00:01:08 +02:00
Alejandro Fraguas 99a219aa64 Merge branch 'ent-3545-8250-7558-7882-monitorizar-servicios-de-azure' into 'develop' 
Ent 3545 8250 7558 7882 monitorizar servicios de azure

See merge request artica/pandorafms!2591
 2019-07-11 18:28:34 +02:00
Alejandro Fraguas f5a92b3157 Merge branch 'ent-4255-8206-Allowed-memory-size-exhausted-en-custom-graph' into 'develop' 
fix bug: custom graphs not showing properly

See merge request artica/pandorafms!2524
 2019-07-11 16:30:38 +02:00
Daniel Rodriguez cdf7c84b81 Merge branch 'ent-4302-Opcion_para_deshabilitar_aviso_de_suscripcion_a_newsletter' into 'develop' 
new tocken user edit newslatter info

See merge request artica/pandorafms!2589
 2019-07-11 15:36:56 +02:00
fbsanchez 219852283d Fix in snmp browser tree 2019-07-11 14:53:00 +02:00
Tatiana Llorente fd24398219 Fixed several minor visual bugs - #4347 2019-07-11 14:46:41 +02:00
Daniel Barbero Martin bd070b706b fixed minor error 2019-07-11 12:45:52 +02:00
Daniel Rodriguez ac3de84bda Merge branch 'ent-4309-Falta-mensaje-de-Successfull-al-cambiar-el-owner-de-un-evento' into 'develop' 
Added success and error messages when change the event owner - #4309

See merge request artica/pandorafms!2590
 2019-07-11 11:36:03 +02:00
Daniel Rodriguez f0c539cfcf Merge branch 'ent-4203-Meter-submenus-de-discovery' into 'develop' 
Added discovery submenus to main menu - #4203

See merge request artica/pandorafms!2571
 2019-07-11 11:14:24 +02:00
artica 45c9db2b69 Auto-updated build strings. 2019-07-11 00:01:12 +02:00
marcos.alconada 6382cb2abe fixed errors with graphs in meta 2019-07-10 14:18:23 +02:00
Tatiana Llorente 1f8e143963 Fixed bug to change the event status in modal window - #4309 2019-07-10 13:04:06 +02:00
Tatiana Llorente bfb7897149 Added success and error messages when change the event status - #4309 2019-07-10 12:15:41 +02:00
Daniel Rodriguez 96fbca35a4 Merge branch 'ent-4194-Revision-de-CSS-alternativos' into 'develop' 
Created black theme - #4194

See merge request artica/pandorafms!2564
 2019-07-10 11:47:21 +02:00
Tatiana Llorente 8c7745768c Added success and error messages when change the event owner - #4309 2019-07-10 11:05:06 +02:00
Daniel Rodriguez f864573486 Merge branch 'ent-4252-Ampliacion_del_informe_de_disponibilidad_para_fuentes_secundarias' into 'develop' 
Ent 4252 ampliacion del informe de disponibilidad para fuentes secundarias

See merge request artica/pandorafms!2577
 2019-07-10 09:33:41 +02:00
artica ca237a0fc4 Auto-updated build strings. 2019-07-10 00:01:10 +02:00
Daniel Rodriguez 207bcceb5f Merge branch 'ent-3685-7702-al-poner-evento-en-in-progress-no-se-muestra-el-campo-user' into 'develop' 
Resolved

See merge request artica/pandorafms!2253
 2019-07-09 18:00:13 +02:00
Tatiana Llorente 7fd284f105 Fixed visual bugs in green and black theme - #4194 2019-07-09 17:36:40 +02:00
fbsanchez cab4a6dc03 Merge remote-tracking branch 'origin/develop' into 3545-8250-7558-7882-monitorizar-servicios-de-azure 2019-07-09 17:28:14 +02:00
Tatiana Llorente 936a7e839f Added success and error messages when change the event owner - #4309 2019-07-09 17:18:37 +02:00
Tatiana Llorente 6af6aa179b Changed background in update manager offline - #4194 2019-07-09 16:45:00 +02:00
Tatiana Llorente 084d1a229e Added success and error messages when change the event owner - #4309 2019-07-09 16:41:00 +02:00
Tatiana Llorente eaf29b798a Fixed minor visual bugs in black theme- #4194 2019-07-09 15:03:38 +02:00
Daniel Barbero d05dd7ecbc fixed minor error 2019-07-09 14:56:42 +02:00
Alejandro Fraguas 26c606b0d5 Merge branch 'ent-3090-Personalizacion-saml-2' into 'develop' 
Added more parameters to SAML configuration

See merge request artica/pandorafms!2506
 2019-07-09 13:18:12 +02:00
fbsanchez 0cabc4d4da Azure discovery task form completed 2019-07-09 12:02:29 +02:00
fbsanchez bd80e013f5 minor fix to avoid log messages 2019-07-09 12:02:07 +02:00
Daniel Rodriguez 7fa79f2043 Merge branch 'ent-4227-Componentes_de_red_no_funcionan_bien' into 'develop' 
fixed error network component plugin

See merge request artica/pandorafms!2581
 2019-07-09 10:27:08 +02:00
Daniel Rodriguez 972e7447ea Merge branch 'ent-4195-Status-sets-Visual' into 'develop' 
Changed default images status set for css - #4195

See merge request artica/pandorafms!2530
 2019-07-09 10:01:09 +02:00
fbsanchez 297bd7c107 Merge remote-tracking branch 'origin/develop' into 3545-8250-7558-7882-monitorizar-servicios-de-azure 2019-07-09 09:53:04 +02:00