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

21966 Commits

Author SHA1 Message Date
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
fbsanchez 467ee5fb8f Minor errata fix 2019-07-11 12:01:19 +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
Tatiana Llorente a8019fd223 Changed images with transparent borders - #4351 2019-07-11 10:49:48 +02:00
marcos.alconada 2d39b442a2 Merge remote-tracking branch 'origin/develop' into ent-4099-8092-busqueda-general-politicas 2019-07-11 09:31:55 +02:00
artica 45c9db2b69 Auto-updated build strings. 2019-07-11 00:01:12 +02:00
Daniel Barbero Martin ed0688f853 fixed macros reports 2019-07-10 18:20:43 +02:00
marcos.alconada a4518819e4 add link and change table 2019-07-10 17:58:52 +02:00
marcos.alconada abfa8933f5 Merge remote-tracking branch 'origin/develop' into ent-4099-8092-busqueda-general-politicas 2019-07-10 17:13:39 +02:00
Tatiana Llorente 3b23810323 Added filter by agent in massive copy - #4318 2019-07-10 16:37:24 +02:00
Alejandro Fraguas a752cbd2fe Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml-3' into 'develop' 
changed condition for saml no access

See merge request artica/pandorafms!2593
 2019-07-10 16:32:41 +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
Daniel Rodriguez e0b6da9615 Merge branch 'ent-4337-8327-bug-tags-filtros-eventos' into 'develop' 
Fix: user filter load tags

See merge request artica/pandorafms!2592
 2019-07-10 12:20:14 +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
marcos.alconada 5b6e7d13cd changed condition for saml no access 2019-07-09 18:13:46 +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
Daniel Rodriguez 0a39f4668f Merge branch 'ent-3942-Visualizacion_de_graficas_en_META_mobile' into 'develop' 
fixed graph in mobile view metaconsole

See merge request artica/pandorafms!2583
 2019-07-09 17:59:46 +02:00
fbsanchez 85e40b30dc Fix: user filter load tags 2019-07-09 17:54:23 +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
fbsanchez ca3b893073 Discovery Cloud Azure 2019-07-09 16:08:29 +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
Daniel Barbero ab3cfd4cc9 new tocken user edit newslatter info 2019-07-09 14:08:06 +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 2f69bff9d7 Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml-2' into 'develop' 
add message no acces saml without saml.php file

See merge request artica/pandorafms!2587
 2019-07-09 10:08:54 +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
Tatiana Llorente 0f280494a0 Changed images for divs to show preview in visual styles - #4195 2019-07-09 09:33:49 +02:00
artica 729fb32ffb Auto-updated build strings. 2019-07-09 00:01:10 +02:00
Daniel Barbero 127f67f2ac fixed error in network component 2019-07-08 19:33:54 +02:00
Tatiana Llorente 6d6c8fe197 Added filter by agent - #4318 2019-07-08 17:57:23 +02:00
Daniel Rodriguez e43469954a Merge branch 'ent-4109-Bug-en-utilizacion-de-macro-en-report-a-traves-de-plantillas' into 'develop' 
fix item name macros when using report templates

See merge request artica/pandorafms!2570
 2019-07-08 17:13:13 +02:00
marcos.alconada 09e5feef05 add message no acces saml without saml.php file 2019-07-08 17:02:28 +02:00
alejandro-campos 95d264059a conflict resolution 2019-07-08 16:15:47 +02:00