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

11803 Commits

Author SHA1 Message Date
Tatiana Llorente 51a1d7c0b7 Merge branch 'ent-4461-Configuracion-integracion-integria' of brutus.artica.lan:artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-23 13:18:08 +02:00
Tatiana Llorente f9a903319c Adding tabs and new functions - #4644 2019-09-23 13:14:20 +02:00
alejandro-campos 9bf2980f01 fix minor bugs in integria integration 2019-09-23 12:48:20 +02:00
Daniel Rodriguez 596bd6a566 Merge branch 'ent-4667-aadcm-peta-la-ejecucion-de-tareas-programadas' into 'develop' 
web2image control phantomjs flow

See merge request artica/pandorafms!2739
 2019-09-23 11:40:08 +02:00
artica 2543f54413 Auto-updated build strings. 2019-09-23 00:01:17 +02:00
artica b763650177 Auto-updated build strings. 2019-09-22 00:01:06 +02:00
artica 27d8c5025e Auto-updated build strings. 2019-09-21 00:01:09 +02:00
Alejandro Fraguas 0418c86867 Merge branch 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' into 'develop' 
pandora HA review

See merge request artica/pandorafms!2654
 2019-09-20 13:57:03 +02:00
alejandro-campos be3de8dcfb Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-20 12:45:22 +02:00
alejandro-campos 0df2447770 added comment management and fixed some errors in incident edition 2019-09-20 12:37:47 +02:00
Tatiana Llorente 375bfca6ff New view - Dashboard details of Integria IMS tickets - #4644 2019-09-20 12:27:36 +02:00
Daniel Rodriguez 409ac061e0 Merge branch 'ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email' into 'develop' 
Ent 4047 simplificacion de la configuracion del sistema de email

See merge request artica/pandorafms!2712
 2019-09-20 11:57:58 +02:00
Kike 279b360236 Fixed open and enterprise network map migration 2019-09-20 10:13:09 +02:00
artica d8ab1defcb Auto-updated build strings. 2019-09-20 00:01:09 +02:00
Daniel Rodriguez 28559f4fcb Merge branch 'ent-4435-consola-visual-host-alive-keep-alive' into 'develop' 
Add new visual console Host Alive Keep Alive

See merge request artica/pandorafms!2701
 2019-09-19 16:10:33 +02:00
manuel 43eb928aa8 Fixed csv reports download 2019-09-19 12:59:51 +02:00
fbsanchez 6def88472a Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-19 10:18:15 +02:00
artica 14f73f147f Auto-updated build strings. 2019-09-19 00:01:10 +02:00
Tatiana Llorente 8acdde9f3a Added date filter - #4642 2019-09-18 18:19:29 +02:00
fbsanchez 42c0fa9a5a web2image control phantomjs flow 2019-09-18 16:58:02 +02:00
Tatiana Llorente eb271a93eb Added button for export to csv - #4642 2019-09-18 15:32:36 +02:00
Daniel Rodriguez c81cb1d222 Merge branch 'ent-3878-Report-type-summation-not-working-properly' into 'develop' 
Ent 3878 report type summation not working properly

See merge request artica/pandorafms!2599
 2019-09-18 14:41:35 +02:00
Daniel Barbero Martin 056bbb7348 fixed minor error 2019-09-18 13:16:05 +02:00
Daniel Barbero Martin 84d1979c9e fixed error percentil label 2019-09-18 11:15:55 +02:00
artica 47be6a611f Auto-updated build strings. 2019-09-18 00:01:11 +02:00
alejandro-campos f2a6dbb60e Merge remote-tracking branch 'origin/ent-4642-Listado-de-tickets-integración-Integria' into ent-4461-Configuracion-integracion-integria 2019-09-17 14:56:54 +02:00
alejandro-campos 979f7beca4 created ajax file to manage incident fields autocompletion 2019-09-17 13:41:21 +02:00
alejandro-campos 87f8badc18 completed integria setup and incident creation and update 2019-09-17 13:38:17 +02:00
Tatiana Llorente 326b053f23 New view - List of Integria IMS tickets - #4642 2019-09-17 13:03:36 +02:00
Tatiana Llorente 027f9fd9d4 New view - List of Integria IMS tickets - #4642 2019-09-17 12:59:29 +02:00
Daniel Rodriguez 1ad8c6fe2e Merge branch 'ent-4280-Nombres-duplicados-SNMP-console-y-trap-generator-en-ACL-Enterprise' into 'develop' 
Fixed duplicated names - #4280

See merge request artica/pandorafms!2658
 2019-09-17 10:47:05 +02:00
Alejandro Fraguas d9b697d076 Merge branch 'ent-4635-8710-Monitor-Report-informes-muestra-el-dato-al-reves' into 'develop' 
Fixed bug in item type monitor report

See merge request artica/pandorafms!2726
 2019-09-17 09:48:15 +02:00
artica 15a5d6f2e5 Auto-updated build strings. 2019-09-17 00:01:57 +02:00
Luis Calvo a04268b33c Merge remote-tracking branch 'origin/develop' into ent-3878-Report-type-summation-not-working-properly 2019-09-16 11:02:18 +02:00
artica 2e121e2cc5 Auto-updated build strings. 2019-09-16 00:01:08 +02:00
artica 05eeb6f3d2 Auto-updated build strings. 2019-09-15 00:01:08 +02:00
artica bc36ed132d Auto-updated build strings. 2019-09-14 00:01:23 +02:00
Tatiana Llorente ca6fe42298 Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria 2019-09-13 12:00:04 +02:00
Tatiana Llorente 89253f4111 Added option for custom delimiter in export csv for datatables - #4623 2019-09-13 10:27:14 +02:00
manuel 00fc4c9238 Fixed bug in item type monitor report 2019-09-13 09:39:09 +02:00
Tatiana Llorente e16855396a Merge remote-tracking branch 'origin/develop' into ent-4545-Bug-creacion-infrome-con-graficas-MAX-Value-fallo-tabla 
Conflicts:
	pandora_console/include/functions_reporting.php
 2019-09-13 09:24:24 +02:00
artica 2f45d3d6ec Auto-updated build strings. 2019-09-13 00:01:11 +02:00
Alejandro Fraguas 3a85b434ca Merge branch 'ent-4558-8584-intracom-el-pdf-generado-desde-custom-report-es-ilegible-si-la-tabla-tiene-muchas-filas' into 'develop' 
Fixed max,min,avg report

See merge request artica/pandorafms!2720
 2019-09-12 17:29:09 +02:00
Daniel Maya 3d8486659e Fixed period in template 2019-09-12 12:52:40 +02:00
Daniel Maya 7bacb869f2 Fixed historical_data report in metaconsole 2019-09-12 12:02:28 +02:00
fbsanchez ebcce5cad4 Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-12 11:17:44 +02:00
artica 602c9ccb5e Auto-updated build strings. 2019-09-12 00:01:26 +02:00
Daniel Maya d9dc03dd91 Fixed max,min,avg report 2019-09-11 18:08:40 +02:00
Tatiana Llorente 3f49988a19 Fixed bug in max, min and avg value in table of reports - #4545 2019-09-11 17:57:16 +02:00
marcos.alconada b9b4230a6e changed style on tables pdf report 2019-09-11 12:20:09 +02:00
Alejandro Fraguas a9e6409cf9 Merge branch 'ent-4587-Limpieza-de-sesiones' into 'develop' 
delete session open by api calls

See merge request artica/pandorafms!2691
 2019-09-11 09:40:18 +02:00
artica fdef0b5188 Auto-updated build strings. 2019-09-11 00:01:10 +02:00
Tatiana Llorente c842c96d08 Fixed duplicated names - #4280 2019-09-10 12:19:53 +02:00
Alejandro Fraguas b97080f13c Merge branch 'ent-4275-notificaciones-correo-no-escribe-bien-url' into 'develop' 
Added ui_get_full_url in all links

See merge request artica/pandorafms!2703
 2019-09-10 12:18:52 +02:00
Tatiana Llorente b198700172 Fixed duplicated names - #4280 2019-09-10 12:18:17 +02:00
alejandro-campos 93b9c76f58 Merge branch 'develop' into ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email 2019-09-10 10:50:53 +02:00
artica 16912732d2 Auto-updated build strings. 2019-09-10 00:01:08 +02:00
marcos.alconada 83e5c14b1d add condition in query 2019-09-09 12:54:16 +02:00
artica 5526bb49ed Auto-updated build strings. 2019-09-09 00:01:07 +02:00
artica f088f47605 Auto-updated build strings. 2019-09-08 00:01:06 +02:00
artica 3680555bae Auto-updated build strings. 2019-09-07 00:01:10 +02:00
Daniel Rodriguez da7811953c Merge branch 'ent-3918-cambiar-el-tamaño-por-defecto-de-los-elementos-de-icono' into 'develop' 
Added mr and uncommented code

See merge request artica/pandorafms!2558
 2019-09-06 13:38:11 +02:00
artica ae474a2731 Auto-updated build strings. 2019-09-06 00:01:10 +02:00
Daniel Rodriguez d02f3621f3 Merge branch 'ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module' into 'develop' 
Removed autofill proxi in auth server

See merge request artica/pandorafms!2361
 2019-09-05 18:29:43 +02:00
Daniel Maya 86cf025317 Fixed some errors in visual console 2019-09-05 11:58:15 +02:00
fbsanchez 315d9728ec quick fix short news titles 2019-09-05 10:54:14 +02:00
artica a4739e4891 Auto-updated build strings. 2019-09-05 00:01:07 +02:00
Jose Gonzalez bb25679344 Added ui_get_full_url in all links 2019-09-04 14:12:38 +02:00
fbsanchez d0e6f0dbae Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha 2019-09-04 12:07:56 +02:00
artica 61c75118f2 Auto-updated build strings. 2019-09-04 00:01:10 +02:00
Daniel Rodriguez 8493ec20eb Merge branch 'ent-4580-8639-errores-al-generar-informes-dinamicos' into 'develop' 
Fixed date limit in historical_data

See merge request artica/pandorafms!2695
 2019-09-03 18:37:55 +02:00
Daniel Rodriguez f126b8b2a2 Merge branch 'ent-4503-XML-bloquea-vista-101-de-consola' into 'develop' 
Escape the double quotes that may have the name of the module - #4503

See merge request artica/pandorafms!2680
 2019-09-03 17:09:21 +02:00
Daniel Rodriguez a5fe2a913f Merge branch 'ent-4478-no-carga-valores-actuales-al-editar-accion-alerta' into 'develop' 
Fixed alert actions bug

See merge request artica/pandorafms!2636
 2019-09-03 17:08:17 +02:00
marcos.alconada b18f72dcdd Add new visual console Host Alive Keep Alive 2019-09-03 13:04:12 +02:00
fbsanchez 291dece854 obhd encapsulated debug print 2019-09-03 12:40:16 +02:00
artica fa39119264 Auto-updated build strings. 2019-09-03 00:01:12 +02:00
alejandro-campos 11cb53582c backup changes 2019-09-02 17:01:41 +02:00
Jose Gonzalez 33da6fd153 Available in metaconsole sql charts in reports for metaconsole server 2019-09-02 12:33:49 +02:00
Daniel Maya 6c51c4e1e9 Fixed date limit in historical_data 2019-09-02 11:18:04 +02:00
fbsanchez 9868462d43 Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha 2019-09-02 09:57:45 +02:00
artica d6b91e9fce Auto-updated build strings. 2019-09-02 00:01:15 +02:00
artica aea8a6b3c7 Auto-updated build strings. 2019-09-01 00:01:07 +02:00
artica fe7ec38cef Auto-updated build strings. 2019-08-31 00:01:12 +02:00
Daniel Rodriguez c47b24d84c Merge branch 'ent-4278-Bug-ACL-al-cargar-o-gestionar-filtros-de-eventos' into 'develop' 
Fixed bug permissions on filter events- 4278

See merge request artica/pandorafms!2671
 2019-08-30 16:07:45 +02:00
Luis Calvo e4a69dc849 Fixed CSV custom graphs export 2019-08-30 15:28:06 +02:00
Daniel Rodriguez c46686981e Merge branch 'ent-4547-Entities-extrañas-en-el-CSV-del-Review-Logs' into 'develop' 
modified function to export audit csv to decode entities as separator

See merge request artica/pandorafms!2692
 2019-08-30 14:29:44 +02:00
Daniel Rodriguez 1ca7e03fa4 Merge branch 'ent-4523-fallos-en-black-theme' into 'develop' 
Changed background-color in request new licence

See merge request artica/pandorafms!2673
 2019-08-30 14:10:04 +02:00
manuel 94e377c3c3 Merge branch 'develop' into ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module 
Conflicts:
	pandora_console/godmode/agentes/configurar_agente.php
 2019-08-30 09:46:27 +02:00
alejandro-campos f423ddc42f modified function to export audit csv to decode entities as separator 2019-08-30 09:42:58 +02:00
Daniel Maya 25354f6f3b delete session open by api calls 2019-08-30 08:47:49 +02:00
artica 79298d0b8e Auto-updated build strings. 2019-08-30 00:01:09 +02:00
artica 1c4b639deb Auto-updated build strings. 2019-08-29 00:01:08 +02:00
Luis Calvo 5973c0b350 Merge remote-tracking branch 'origin/develop' into ent-4559-desajuste-en-custom-fields 2019-08-28 15:43:05 +02:00
Daniel Maya 94d797b4b7 Fixed session garbage collector 2019-08-28 11:33:02 +02:00
Alejandro Fraguas 21712c5c23 Merge branch 'ent-4565-No-funciona-el-filtro-de-servidor-en-la-vista-de-eventos-de-la-metaconsola' into 'develop' 
Fixed bug in metaconsole filter events

See merge request artica/pandorafms!2683
 2019-08-28 09:20:18 +02:00
artica 662c9ca7f2 Auto-updated build strings. 2019-08-28 00:01:10 +02:00
Luis Calvo e71bb2a791 Long custom fields urls and text truncated 2019-08-27 16:01:18 +02:00
manuel 3901a1abb6 Fixed bug in metaconsole filter events 2019-08-27 15:46:22 +02:00
Alejandro Fraguas fe088a59d6 Merge branch 'ent-4490-Cambio-de-dato-a-percentil-segun-el-tamano-de-custom-graph-en-consola-visual' into 'develop' 
fixed error labels pie chart

See merge request artica/pandorafms!2679
 2019-08-27 12:02:27 +02:00
Luis Calvo 23e5c50d13 Added new custom fields url formating to custom fields 2019-08-27 09:34:42 +02:00
Luis Calvo 2dc084da8a Merge remote-tracking branch 'origin/develop' into ent-4132-custom-fields-url 2019-08-27 09:11:45 +02:00
artica c06ec0477c Auto-updated build strings. 2019-08-27 00:01:10 +02:00
Daniel Maya 473b29252c Merge branch 'develop' into ent-3918-cambiar-el-tamaño-por-defecto-de-los-elementos-de-icono 2019-08-26 16:08:03 +02:00
Alejandro Fraguas fadccf0ff3 Merge branch 'ent-4509-AADCM-MCM-8206-Bug-en-consola-visual-link-a-consola-visual-publica' into 'develop' 
Fixed bug in public visual console view

See merge request artica/pandorafms!2672
 2019-08-26 13:12:31 +02:00
Tatiana Llorente ea970f2adc Escape the double quotes that may have the name of the module - #4503 2019-08-26 12:26:43 +02:00
artica a2713517f0 Auto-updated build strings. 2019-08-26 00:01:08 +02:00
artica 1320426628 Auto-updated build strings. 2019-08-25 00:01:09 +02:00
artica 56da633588 Auto-updated build strings. 2019-08-24 00:01:09 +02:00
Alejandro Fraguas 51f2baa0dd Merge branch 'ent-4541-Comportamiento_erroneo_en_Metaconsola' into 'develop' 
fixed event view metaconsole

See merge request artica/pandorafms!2677
 2019-08-23 13:19:30 +02:00
Daniel Barbero 22f125dee0 fixed error labels pie chart 2019-08-23 10:59:06 +02:00
artica 6a982697d2 Auto-updated build strings. 2019-08-23 00:01:11 +02:00
Daniel Barbero Martin 31da17db03 fixed event view metaconsole 2019-08-22 14:27:45 +02:00
Alejandro Fraguas 03fb2875be Merge branch 'ent-4431-Problemas-CSV-Audit-log' into 'develop' 
Modified the divider in print_audit_csv function

See merge request artica/pandorafms!2615
 2019-08-22 13:40:55 +02:00
Alejandro Fraguas 26f247375b Merge branch '4496-Graficas-Metaconsola-no-funcionan' into 'develop' 
fix graphs not showing in metaconsole monitors view

See merge request artica/pandorafms!2649
 2019-08-22 09:41:18 +02:00
artica 1d0875e89a Auto-updated build strings. 2019-08-22 00:01:11 +02:00
Alejandro Fraguas 0f1baadb00 Merge branch 'ent-4032-new-macro-sql-reports' into 'develop' 
Ent 4032 new macro sql reports

See merge request artica/pandorafms!2610
 2019-08-21 14:23:28 +02:00
Alejandro Fraguas d42bcd17c2 Merge branch 'ent-4366-fallos-visuales-en-el-log-de-pandora' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2666
 2019-08-21 12:17:53 +02:00
Alejandro Fraguas 83cb4fc484 Merge branch 'ent-4458-Filtro-de-módulos-deshabilitados-al-agregarlos-a-un-servicio' into 'develop' 
Remove disabled modules to create service element - #4458

See merge request artica/pandorafms!2646
 2019-08-21 10:32:11 +02:00
Alejandro Fraguas 72e28d6a3c Merge branch 'ent-4304-8295-centrar-elementos-en-informes-sql' into 'develop' 
centrar elementos en informes sql

See merge request artica/pandorafms!2662
 2019-08-21 09:58:50 +02:00
marcos.alconada a6037d8308 Changed background-color in request new licence 2019-08-21 09:27:55 +02:00
manuel e439e7349f Fixed bug in public visual console view 2019-08-21 09:22:13 +02:00
artica c36234a3ae Auto-updated build strings. 2019-08-21 00:01:09 +02:00
Alejandro Fraguas 4c3d705340 Merge branch 'ent-4352-Evento-con-intructions-no-las-muestra-como-enlaces' into 'develop' 
Ent 4352 evento con intructions no las muestra como enlaces

See merge request artica/pandorafms!2630
 2019-08-20 14:29:47 +02:00
Tatiana Llorente 38547052fb Fixed bug permissions on filter events- 4278 2019-08-20 13:42:04 +02:00
Alejandro Fraguas 8b9cd01d58 Merge branch 'ent-4483-Vista-detalle-de-alertas-erronea' into 'develop' 
Fixed bug in alerts details view

See merge request artica/pandorafms!2643
 2019-08-20 11:32:23 +02:00
artica 13d8c065e6 Auto-updated build strings. 2019-08-20 00:01:10 +02:00
marcos.alconada 0414b4033e fixed visual error 2019-08-19 10:05:06 +02:00
artica 6550d52813 Auto-updated build strings. 2019-08-19 00:01:07 +02:00
artica 7a57ae9063 Auto-updated build strings. 2019-08-18 00:01:06 +02:00
artica 0802d45e85 Auto-updated build strings. 2019-08-17 00:01:10 +02:00
marcos.alconada f2cf24cfb8 center content tables in pdf generator 2019-08-16 09:30:10 +02:00
marcos.alconada 61a1243213 center content tables in pdf generator 2019-08-16 09:29:40 +02:00
artica ac85884e46 Auto-updated build strings. 2019-08-16 00:01:08 +02:00
artica 4e544e8433 Auto-updated build strings. 2019-08-15 00:01:16 +02:00
artica 7b78b5820e Auto-updated build strings. 2019-08-14 00:01:10 +02:00
artica c0588d95ca Updated version and build strings. 2019-08-13 12:27:44 +02:00
artica a8915e13ad Auto-updated build strings. 2019-08-13 00:01:08 +02:00
Tatiana Llorente bdee45c2dd Fixed duplicated names - #4280 2019-08-12 14:24:26 +02:00
artica 5cecf1f899 Auto-updated build strings. 2019-08-12 00:01:07 +02:00
artica 390acf0459 Auto-updated build strings. 2019-08-11 00:01:09 +02:00
fbsanchez adbb48ab87 pandora HA review 2019-08-10 02:13:01 +02:00
artica 4f25e42be1 Auto-updated build strings. 2019-08-10 00:01:17 +02:00
Daniel Rodriguez 57fcfee36c Merge branch '4003-Arreglos-en-servicios' into 'develop' 
4003 arreglos en servicios

See merge request artica/pandorafms!2621
 2019-08-09 09:04:17 +02:00
Daniel Rodriguez ff3134c55a Merge branch 'ent-4388-Nuevos-eventos' into 'develop' 
Ent 4388 nuevos eventos

See merge request artica/pandorafms!2628
 2019-08-09 09:00:57 +02:00
artica 992958f4b4 Auto-updated build strings. 2019-08-09 00:01:09 +02:00
alejandro-campos 0461cb04f7 fix graphs not showing in metaconsole monitors view 2019-08-08 15:18:15 +02:00
artica 21c81f6dfe Auto-updated build strings. 2019-08-08 00:01:08 +02:00
Tatiana Llorente 7826ba79e6 Remove disabled modules to create service element - #4458 2019-08-07 14:23:10 +02:00
manuel 6c90a4dd53 Fixed bug in alerts details view 2019-08-07 13:04:37 +02:00
artica 871e0568d7 Auto-updated build strings. 2019-08-07 00:01:32 +02:00
Jose Gonzalez 3d03faed9a Solved some issues 2019-08-06 14:56:57 +02:00
Luis Calvo 47e8a618c2 Fixed alert actions bug 2019-08-06 14:41:54 +02:00
artica 5aa9320ae3 Auto-updated build strings. 2019-08-06 00:01:22 +02:00
alejandro-campos 28cf43498e lint change 2019-08-05 14:18:23 +02:00
alejandro-campos 9b8e3c540c created integria integration setup 2019-08-05 13:42:01 +02:00
Alejandro Campos 12eacc1933 Merge branch 'develop' into 'ent-4388-Nuevos-eventos' 
# Conflicts:
#   pandora_console/extras/mr/31.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-08-05 09:26:18 +02:00
artica 2133551889 Auto-updated build strings. 2019-08-05 00:01:08 +02:00
artica 914a41ab8d Auto-updated build strings. 2019-08-04 00:01:08 +02:00
artica e417b775c7 Auto-updated build strings. 2019-08-03 00:01:10 +02:00
Daniel Rodriguez 06591680de Merge branch 'ent-4408-csv-meta-custom-field-views' into 'develop' 
Added title in custom field

See merge request artica/pandorafms!2613
 2019-08-02 14:12:21 +02:00
artica 3a654c7f79 Auto-updated build strings. 2019-08-02 00:01:11 +02:00
Tatiana Llorente c591dd4260 Show html tags in instructions - #4352 2019-08-01 13:11:50 +02:00
Tatiana Llorente 4e927e1ee5 Fixed bad image for warning status - #4454 2019-08-01 10:36:15 +02:00
artica 28e562a2f7 Auto-updated build strings. 2019-08-01 00:01:09 +02:00
fbsanchez 1e73105fc9 minor fix adding slash if not found 2019-07-31 10:59:51 +02:00
artica 6713f51414 Updated version and build strings. 2019-07-31 09:25:59 +02:00
artica 9995d8b654 Auto-updated build strings. 2019-07-31 00:01:13 +02:00
alejandro-campos b4bd7f0f63 fixed problems in event view and event view custom fields 2019-07-30 16:10:34 +02:00
fbsanchez 755b0bbf7d Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-30 12:53:23 +02:00
artica 8734697169 Auto-updated build strings. 2019-07-30 00:01:11 +02:00
Jose Gonzalez dd77429aea Solved issue with status names 2019-07-29 17:22:16 +02:00
Luis Calvo f6f96523a0 Added html enconde 2019-07-29 16:57:39 +02:00
Jose Gonzalez 719f56efec Modified SQL queries for avoidance of case sensitive 2019-07-29 16:32:50 +02:00
artica 4d9d0deab7 Auto-updated build strings. 2019-07-29 00:01:08 +02:00
artica 32b013e11c Auto-updated build strings. 2019-07-28 00:01:06 +02:00
artica 3980cefd2c Auto-updated build strings. 2019-07-27 00:01:09 +02:00
fbsanchez f7e2023253 Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-26 21:56:45 +02:00
artica 871d8e9885 Auto-updated build strings. 2019-07-26 00:01:10 +02:00
fbsanchez 6ac21acd39 wip agent deployment scan 2019-07-25 18:35:51 +02:00
Jose Gonzalez 5ab2bfacbd Modified date formatting to avoid entities 2019-07-25 15:43:46 +02:00
Jose Gonzalez 5cdfb871a1 Modified the divider in print_audit_csv function 2019-07-25 15:35:57 +02:00
fbsanchez 1445740e2c Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-25 12:08:18 +02:00
Daniel Rodriguez 2475e6a881 Merge branch 'ent-8429-eventos-duplicados-metaconsola' into 'develop' 
SQL Query modified for solve duplicate events issue

See merge request artica/pandorafms!2611
 2019-07-25 10:29:31 +02:00
artica 3f90ebc938 Auto-updated build strings. 2019-07-25 00:01:09 +02:00
fbsanchez ce346bd604 agent deployment 2019-07-24 17:38:25 +02:00
Daniel Maya 4e01967b88 Added title in custom field 2019-07-24 17:05:54 +02:00
Jose Gonzalez ca19e25f74 SQL Query modified for solve duplicate events issue 2019-07-24 16:00:25 +02:00
artica 6e68b8dc5e Auto-updated build strings. 2019-07-24 00:01:09 +02:00
fbsanchez 6c79bfb135 Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-23 15:28:04 +02:00
artica 776fcc3f81 Auto-updated build strings. 2019-07-23 00:01:08 +02:00
Luis Calvo 64d93d98ed Fixed minor bugs and format 2019-07-22 16:08:01 +02:00
Luis Calvo ffec3150d4 Fixed minor bugs and format 2019-07-22 16:03:50 +02:00
Luis Calvo 6aa652649d Fixed minor bugs and format 2019-07-22 15:49:12 +02:00
artica 10e2b5beaf Auto-updated build strings. 2019-07-22 00:01:07 +02:00
artica 3d5a40d4da Auto-updated build strings. 2019-07-21 00:01:07 +02:00
artica 86ad61a010 Auto-updated build strings. 2019-07-20 00:01:07 +02:00
Luis Calvo 38f1c45698 Added macro for sql custom reports 2019-07-19 10:07:39 +02:00
Luis Calvo af8055212f Added macro for sql custom reports 2019-07-19 10:05:01 +02:00
artica 921de9aeea Auto-updated build strings. 2019-07-19 00:01:09 +02:00
Daniel Rodriguez fdbc3b5366 Merge branch 'ent-3470-getallheaders_en_PHP_FPM' into 'develop' 
PHP-FPM

See merge request artica/pandorafms!2607
 2019-07-18 15:40:59 +02:00
Daniel Rodriguez 651c24fc02 Merge branch 'ent-4269-bad-translation-syslog' into 'develop' 
Fixed bad transalation

See merge request artica/pandorafms!2609
 2019-07-18 13:01:48 +02:00
Daniel Rodriguez f08b5204c7 Merge branch 'ent-3673-bug-webchat-consola' into 'develop' 
Modified jquery window function

See merge request artica/pandorafms!2550
 2019-07-18 12:50:56 +02:00
Luis Calvo 6df9e04f31 Fixed bad transalation 2019-07-18 12:14:03 +02:00
Daniel Rodriguez 87ebde3f41 Merge branch 'ent-4394-No-cargan-graficas-en-vista-tactica' into 'develop' 
fixed minor error fgraph

See merge request artica/pandorafms!2608
 2019-07-18 09:59:33 +02:00
artica 3d496357d7 Auto-updated build strings. 2019-07-18 00:01:11 +02:00
fbsanchez 8d9c4682c7 WIP Agent repository 2019-07-17 20:37:13 +02:00
Daniel Barbero Martin c900465546 fixed minor error fgraph 2019-07-17 17:40:49 +02:00
Daniel Barbero Martin 7fa95d3e43 PHP-FPM 2019-07-17 17:20:09 +02:00
fbsanchez 17dc0b82ac Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-17 17:19:58 +02:00
Daniel Barbero Martin 6b6d852ceb Merge remote-tracking branch 'origin/develop' into ent-4205-gigas-proyectos-funcionamiento-incorrecto-del-wizard-snmp-con-exec-server 
Conflicts:
	pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
 2019-07-17 15:06:38 +02:00
Daniel Rodriguez c97074ea74 Merge branch 'ent-4354-Revision_completa_de_macros_de_reports' into 'develop' 
fixed macros reports

See merge request artica/pandorafms!2595
 2019-07-17 13:49:38 +02:00
Daniel Barbero Martin 7f4701f22e exec server error wizard 2019-07-17 11:11:38 +02:00
Luis Calvo 53c239f558 fixed minor errors 2019-07-17 10:34:56 +02:00
artica 02d62a9e78 Auto-updated build strings. 2019-07-17 00:01:11 +02:00
Jose Gonzalez b7c662d3f9 Added session control for unexpected or forced logouts 2019-07-16 17:55:44 +02:00
Daniel Rodriguez cc603dbefe Merge branch 'ent-4039-7977-cambiar-mensaje-por-uno-mas-intuitivo' into 'develop' 
Ent 4039 7977 cambiar mensaje por uno mas intuitivo

See merge request artica/pandorafms!2503
 2019-07-16 17:01:47 +02:00
Daniel Rodriguez c80561f595 Merge branch 'ent-4338-No_funcionan_las_alertas_sonoras' into 'develop' 
fixed events sound

See merge request artica/pandorafms!2603
 2019-07-16 11:57:59 +02:00
Daniel Rodriguez ab7743b578 Merge branch 'ent-4307-No-se-puede-copiar-agent_name-ni-ID-de-agente-en-vista-de-agente-Firefox' into 'develop' 
Changed disabled to readonly in agent name and id- #4307

See merge request artica/pandorafms!2578
 2019-07-16 11:52:12 +02:00
Daniel Rodriguez 304301a54a Merge branch 'ent-4283-Elementos-superpuestos' into 'develop' 
Fixed minor style bug in pagination events - #4283

See merge request artica/pandorafms!2569
 2019-07-16 11:51:41 +02:00
Daniel Rodriguez fbd71d942a Merge branch 'ent-4035-add-serialize-precision-value-notification' into 'develop' 
Added notification for serialize_precicion value

See merge request artica/pandorafms!2432
 2019-07-16 11:45:38 +02:00
Daniel Barbero Martin dfee153983 fixed errors template node report 2019-07-16 11:22:58 +02:00
Daniel Rodriguez 18da97e9a7 Merge branch 'ent-4306-Error-de-paginacion-en-Nodo' into 'develop' 
Fix pagination blank page - #4306

See merge request artica/pandorafms!2580
 2019-07-16 10:49:14 +02:00
artica a1055311ad Auto-updated build strings. 2019-07-16 00:01:17 +02:00
fbsanchez 3bbd01026e WIP agent deployment 2019-07-15 19:37:04 +02:00
Luis Calvo 94250cb870 Fixed minor bug 2019-07-15 17:46:59 +02:00
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
Daniel Barbero Martin 45e1c32473 fixed events sound 2019-07-15 15:31:01 +02:00
Luis Calvo a0ad1f2681 Merge remote-tracking branch 'origin/develop' into ent-4035-add-serialize-precision-value-notification 2019-07-15 15:04:13 +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
Luis Calvo ef9502a552 Fixed errors on sum report uncompressed checkbox 2019-07-15 11:56:57 +02:00
Daniel Barbero Martin 2f110b8e2e Merge remote-tracking branch 'origin/develop' into ent-4354-Revision_completa_de_macros_de_reports 2019-07-15 11:37:02 +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
fbsanchez 9fb32c4699 Deployment area single targets 2019-07-12 18:29:58 +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
Luis Calvo a1e2693d4b Merge remote-tracking branch 'origin/develop' into ent-3875-Report-type-summation-not-working-properly 2019-07-12 11:33:27 +02:00
Luis Calvo 41d8afaeea added summation report uncompressed module cehckbox 2019-07-12 11:32:56 +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
Daniel Barbero ecaba5ebd3 fixed errorsr macros reports 2019-07-12 10:24:46 +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
fbsanchez 5fd7b87a06 Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-11 18:27:49 +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 08bc1d3da1 Merge remote-tracking branch 'origin/ent-3545-8250-7558-7882-monitorizar-servicios-de-azure' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-11 15:03:50 +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
fbsanchez 9548cd4028 Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-11 11:14:34 +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
fbsanchez 47cc0d9d6e WIP: Agent deployment center 2019-07-10 23:59:09 +02:00
fbsanchez 58465090b2 Merge remote-tracking branch 'remotes/origin/ent-3545-8250-7558-7882-monitorizar-servicios-de-azure' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-10 22:05:02 +02:00
Daniel Barbero Martin ed0688f853 fixed macros reports 2019-07-10 18:20:43 +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
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
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
alejandro-campos 95d264059a conflict resolution 2019-07-08 16:15:47 +02:00
alejandro-campos d5362c1d5d fix bug: label macros not being replaced in view report 2019-07-08 16:07:22 +02:00
Alejandro Fraguas a295c9b789 Merge branch 'ent-3962-notification-timeout-session' into 'develop' 
Session expiration ignoring notifications checks

See merge request artica/pandorafms!2561
 2019-07-08 15:57:02 +02:00
Daniel Barbero b70c904ec3 fixed minor error network components 2019-07-08 13:40:52 +02:00
Daniel Barbero 58cb113d40 fixed error in pdf 2019-07-08 13:23:35 +02:00
Tatiana Llorente 0cccafc7be Heartbeat gifs with black background - #4194 2019-07-08 10:37:34 +02:00
Tatiana Llorente b6d551d583 Changed images with white background - #4194 2019-07-08 10:08:04 +02:00
artica 034181037d Auto-updated build strings. 2019-07-08 00:01:17 +02:00
artica 90497410c7 Auto-updated build strings. 2019-07-07 00:01:07 +02:00
artica d0f3a6bc0b Auto-updated build strings. 2019-07-06 00:01:19 +02:00
Alejandro Fraguas 8242bf34b8 Revert "Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml' into 'develop'" 
This reverts merge request !2562
 2019-07-05 14:55:22 +02:00
Tatiana Llorente 745ab711de Created green theme - #4194 2019-07-05 14:02:59 +02:00
Tatiana Llorente d1bc6cc2ff Created green theme - #4194 2019-07-05 13:59:48 +02:00
Daniel Barbero 6e7dfb38fd fixed error network component plugin 2019-07-05 13:46:48 +02:00
Alejandro Fraguas da110f1d33 Merge branch 'ent-4315-No-funcionan-las-politicas-en-meta' into 'develop' 
fix bug in api function that removes an agent from a policy

See merge request artica/pandorafms!2579
 2019-07-05 10:36:15 +02:00
Tatiana Llorente 31b19ab970 Fix pagination blank page - #4306 2019-07-05 09:31:23 +02:00
artica 8229f634e0 Auto-updated build strings. 2019-07-05 00:01:09 +02:00
fbsanchez 0e3fd848f7 minor fixes and visual change in azure credentials 2019-07-04 19:34:03 +02:00
alejandro-campos a10945d209 fix bug in api function that removes an agent from a policy 2019-07-04 18:33:12 +02:00
Tatiana Llorente de6a0c2192 Changed disabled to readonly in agent name and id- #4307 2019-07-04 16:20:01 +02:00
Alejandro Fraguas 8c1d119819 Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml' into 'develop' 
Add message for autenticaition error SAML

See merge request artica/pandorafms!2562
 2019-07-04 14:45:45 +02:00
Daniel Barbero Martin 000cdfdcfd WIP failover 2019-07-04 12:09:08 +02:00
Daniel Barbero Martin c25b7155fa WIP failover 2019-07-04 11:17:12 +02:00
Alejandro Fraguas e0a1f1b8b9 Merge branch 'ent-3360-fallo-en-agrupacion-de-agentes-con-mismo-alias-en-reports-2' into 'develop' 
final merge 3360 ticket

See merge request artica/pandorafms!2575
 2019-07-04 10:21:23 +02:00
artica f4b8b39704 Auto-updated build strings. 2019-07-04 00:01:09 +02:00
Daniel Barbero Martin 22734a4ea2 WIP failover 2019-07-03 17:51:47 +02:00
marcos.alconada 2ad44fcf90 final merge 3360 ticket 2019-07-03 17:07:31 +02:00
fbsanchez 07edee619a CS filtering and constant 2019-07-03 16:38:26 +02:00
fbsanchez 18d8f90f90 Credential store upgrade Azure 2019-07-03 16:04:40 +02:00
Tatiana Llorente c7e410b16d Added discovery submenus to main menu - #4203 2019-07-03 11:08:17 +02:00
Alejandro Fraguas 8ef22373a7 Merge branch 'ent.3698-Conteo-de-notificaciones-un-poco-raro' into 'develop' 
Fixed messages count

See merge request artica/pandorafms!2260
 2019-07-03 10:12:03 +02:00
artica 3b68964f27 Auto-updated build strings. 2019-07-03 00:01:12 +02:00
alejandro-campos 51d7104de7 fix item name macros when using report templates 2019-07-02 18:09:52 +02:00
Tatiana Llorente 89d00115e2 Fixed minor style bug in pagination events - #4283 2019-07-02 17:45:25 +02:00
fbsanchez 879e61b9aa minor fix in public_url_exclusions 2019-07-02 16:47:19 +02:00
Alejandro Fraguas 86610ebe96 Merge branch 'ent-4294-7984-Desplegable-de-grupos-desordenados' into 'develop' 
Fixed unordered groups

See merge request artica/pandorafms!2559
 2019-07-02 16:06:33 +02:00
Tatiana Llorente dd8fc659ee Created green theme - #4194 2019-07-02 15:15:19 +02:00
fbsanchez eb01e9baaf public_url with force option 2019-07-02 14:17:53 +02:00
Tatiana Llorente beace34567 Created black theme - #4194 2019-07-02 13:12:05 +02:00
marcos.alconada 4430f18ac5 Resolved error query 2019-07-02 12:21:58 +02:00
Daniel Barbero 209681e4c2 ADD failover option availability_graph 2019-07-02 11:50:58 +02:00
Tatiana Llorente 1aa0131a81 Merge branch 'develop' into 'ent-4195-Status-sets-Visual' 
Conflicts:
   pandora_console/include/styles/pandora.css
 2019-07-02 11:42:19 +02:00
Alejandro Fraguas 3a76f331c8 Merge branch 'ent-2094-Añadir-buscador-en-operaciones-masivas' into 'develop' 
Add module filter by text -#2094

See merge request artica/pandorafms!2520
 2019-07-02 11:37:01 +02:00
Alejandro Fraguas 1f2e6a50f8 Merge branch 'ent-4214-8207-Tactical-View-contador-de-alertas-disparadas-falla' into 'develop' 
Add condition in tactical view to exclude disabled alerts from count of triggered alerts

See merge request artica/pandorafms!2547
 2019-07-02 10:30:20 +02:00
artica 78bcf83856 Auto-updated build strings. 2019-07-02 00:01:09 +02:00
Daniel Barbero Martin 0064bc0cba fixed errors 2019-07-01 17:07:39 +02:00
Alejandro Fraguas 177eb86956 Merge branch 'ent-3679-7637-7711-Agregar-eliminar-agente-de-politica-en-metaconsola' into 'develop' 
modified api function for adding agent to policy to make it available on meta

See merge request artica/pandorafms!2522
 2019-07-01 17:06:37 +02:00
Tatiana Llorente 9163f725ed Created black theme - #4194 2019-07-01 16:57:33 +02:00
marcos.alconada 6349c29eb5 Add message for autenticaition error SAML 2019-07-01 13:45:42 +02:00
fbsanchez a6327a16ad Session expiration ignoring notifications checks 2019-07-01 12:46:09 +02:00
Alejandro Fraguas 8ec2ec9d0d Merge branch 'ent-4112-Bug-visual-cuadro-de-datos-tipo-string' into 'develop' 
Truncate long title in modal dialogs - #4112

See merge request artica/pandorafms!2508
 2019-07-01 10:36:24 +02:00
Alejandro Fraguas 39ac83ae5e Merge branch 'ent-4250-Cambios-de-estilo-pendientes_2' into 'develop' 
Style changes - #4250

See merge request artica/pandorafms!2557
 2019-07-01 10:02:02 +02:00
Alejandro Fraguas 47838a1134 Merge branch 'ent-4213-SNMP-Walk-dede-modulo-creado-no-muestra-parametros-v3' into 'develop' 
Ent 4213 snmp walk dede modulo creado no muestra parametros v3

See merge request artica/pandorafms!2511
 2019-07-01 09:48:33 +02:00
Alejandro Fraguas 9b0defdc34 Merge branch 'ent-4075-Bug-Tactical-view-en-dashboard-publico-cuando-no-hacemos-login_2' into 'develop' 
Fixed bug showing total events in tactical view on dashboard - #4075

See merge request artica/pandorafms!2509
 2019-07-01 09:39:05 +02:00
artica dd75aa6a42 Auto-updated build strings. 2019-07-01 00:01:07 +02:00
artica c9f101eda6 Auto-updated build strings. 2019-06-30 00:01:05 +02:00
artica eeffe40b6b Auto-updated build strings. 2019-06-29 00:01:07 +02:00
Tatiana Llorente c28185965a Merge remote-tracking branch 'origin/develop' into ent-4112-Bug-visual-cuadro-de-datos-tipo-string 
Conflicts:
	pandora_console/include/styles/js/jquery-ui_custom.css
 2019-06-28 12:28:13 +02:00