Commit Graph

986 Commits

Author SHA1 Message Date
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
2021-03-22 09:59:07 +01:00
Daniel Barbero Martin b78f4093ac fixed error tree groups agent edition metaconsole 2021-03-15 13:31:24 +01:00
Daniel Maya 2f7d0f1795 fixed permissions on response 2021-03-11 16:11:06 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
fbsanchez 95f1a2abcc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
2021-03-11 10:00:17 +01:00
Daniel Rodriguez 2422813a29 Merge branch 'ent-7085-11447-No-se-visualizan-nombres-de-modulos-en-graficas-combinadas-en-el-agente' into 'develop'
visual fixes in agent view graphs

See merge request artica/pandorafms!3884
2021-03-10 15:56:15 +00:00
fbsanchez b384e97da5 Test REGEXP is valid before apply in MySQL 2021-03-09 10:17:29 +01:00
alejandro.campos@artica.es 0a8c478c47 visual fixes in agent view graphs 2021-03-08 17:48:59 +01:00
Daniel Rodriguez 94b04a8ef4 Merge branch 'ent-6106-Exportacion-CSV-en-icono-grafica-es-diferente-a-la-exportacion-normal' into 'develop'
Fix styles file export_data

See merge request artica/pandorafms!3691
2021-03-04 10:29:52 +00:00
daniel fbf26fab91 Fix styles file export_data 2021-03-04 10:29:52 +00:00
Daniel Rodriguez 51404eda8d Merge branch 'ent-7077-no-funciona-doble-auth-meta' into 'develop'
Ent 7077 no funciona doble auth meta

See merge request artica/pandorafms!3866
2021-03-02 12:24:03 +00:00
Luis 93a4a90dd6 Ent 7077 no funciona doble auth meta 2021-03-02 12:24:03 +00:00
fbsanchez d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
2021-03-02 09:40:15 +01:00
Daniel Rodriguez 4fbfc14479 Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop'
Fix loading charts modules and interfaces

See merge request artica/pandorafms!3700
2021-03-01 12:16:27 +00:00
Daniel Rodriguez 39d0e66983 Merge branch 'ent-6378-descarga-custom-field-view' into 'develop'
Added ACL check to custom view CSV donwload

See merge request artica/pandorafms!3714
2021-03-01 10:47:50 +00:00
fbsanchez 85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/include/functions_ui.php
2021-02-22 12:01:29 +01:00
fbsanchez b17d6349f7 Multiple fixes port defition 2021-02-09 13:44:21 +01:00
fbsanchez 2639533cc1 Fixes 2021-02-09 12:05:59 +01:00
fbsanchez ecf0f3d161 Force error catching while SNMP browsing 2021-02-09 10:25:42 +01:00
fbsanchez e711239c69 Added port, limited base OID (default) removed timeout (browser) capturing error to message 2021-02-08 17:42:41 +01:00
fbsanchez 380c77be02 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
Conflicts:
	pandora_console/include/lib/Module.php
	pandora_console/include/visual-console-client/vc.main.css.map
2021-02-02 12:15:24 +01:00
fbsanchez 0ddc1929fa multiple fixes 2021-02-02 11:25:26 +01:00
fbsanchez b8980c189c Schedule history db schema check after MR update 2021-01-28 18:50:55 +01:00
alejandro-campos 0549f2c604 added file to open folder 2021-01-18 10:31:53 +01:00
José González 3199b3d6b5 Merge branch 'develop' into 'ent-6407-server-to-execute-snmp-browser'
# Conflicts:
#   pandora_console/include/ajax/snmp_browser.ajax.php
2021-01-07 14:14:33 +01:00
Daniel Rodriguez b9a2998c49 Merge branch 'ent-6490-Errores-en-edicion-de-acciones-de-alertas' into 'develop'
Ent 6490 errores en edicion de acciones de alertas

See merge request artica/pandorafms!3657
2021-01-04 11:11:16 +01:00
Daniel Rodriguez b0f862b4c7 Merge branch 'ent-1175-copyright-actualizados' into 'develop'
Updated copyrights

Closes pandora_enterprise#1175

See merge request artica/pandorafms!3668
2020-12-23 17:19:46 +01:00
Daniel Rodriguez fc49958c96 Merge branch 'ent-6681-SNMP-Browser-multiple-remote-components-y-abrir-ventana-adicional-en-el-navegador' into 'develop'
Ent 6681 snmp browser multiple remote components y abrir ventana adicional en el navegador

See merge request artica/pandorafms!3608
2020-12-23 16:55:56 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
Luis Calvo 734efbf892 Added ACL check to custom view CSV donwload 2020-12-11 10:10:22 +01:00
Daniel Barbero Martin aa52ab01df Fix loading charts modules and interfaces 2020-12-09 14:05:40 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Jose Gonzalez 9bf70add51 Fixed snmp server selection 2020-11-26 10:35:48 +01:00
Daniel Maya 1cf3381797 Fixed update alert actions 2020-11-26 10:33:32 +01:00
marcos 13d90bb1c5 Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-18 12:05:57 +01:00
Daniel Maya 0ea8196db0 Fixed create network components 2020-11-12 13:44:52 +01:00
fbsanchez b585a4e372 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-03 16:35:25 +01:00
Daniel Rodriguez 946c548244 Merge branch 'ent-6626filtros-de-eventos-personalizados-no-guardia-varios-apartados' into 'develop'
Primeras modificaciones del filtro de eventos

See merge request artica/pandorafms!3585
2020-10-30 14:42:41 +01:00
daniel c4e7c6b5f1 fix events acknowledge-by 2020-10-30 14:42:10 +01:00
Daniel Rodriguez fe90008d17 Merge branch 'ent-6587-bug-historico-comentarios-eventos' into 'develop'
Handled comments for validated comments

Closes pandora_enterprise#6587

See merge request artica/pandorafms!3564
2020-10-30 10:46:52 +01:00
fbsanchez 8e09a30a05 WIP Networklink POC 2020-10-29 17:20:16 +01:00
marcos 6bcca915ba resuelto el error que vaciaba el module search 2020-10-29 14:57:54 +01:00
marcos cf108c0a17 se cambia el valor del modulo y marca en el filtro usado 2020-10-29 12:30:54 +01:00
marcos edc9038783 Primeras modificaciones del filtro de eventos 2020-10-29 10:24:37 +01:00
Jose Gonzalez 765d7938f9 Handled comments for validated comments 2020-10-23 12:20:20 +02:00
Daniel Barbero Martin 73ff2cff9d fixed error report selector modules in metaconsole 2020-10-20 18:30:53 +02:00
daniel 148384f8fb phantomjs performance 2020-10-13 18:24:10 +02:00
marcos 848f60229a updates on 2FA all users feature 2020-10-06 17:02:58 +02:00
fbsanchez 2187f9d0c9 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
2020-10-02 14:56:07 +02:00
daniel 0db539c444 fix visual windows charts 2020-10-01 15:29:54 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
fbsanchez 3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
Jose Gonzalez 42a615166e Fixed object definitions 2020-09-07 13:54:18 +02:00
alejandro-campos 0917a631ee fix parameter macros in event responses 2020-08-14 14:48:34 +02:00
alejandro-campos 90ea61f753 fix parameter macros in event responses 2020-08-13 14:10:57 +02:00
Daniel Rodriguez f7854ab633 Merge branch 'ent-6068-snmp-browser-community-spcial-char' into 'develop'
Fixed snmp community special char

See merge request artica/pandorafms!3352
2020-08-07 09:46:57 +02:00
Alejandro Fraguas bd6904b99f Merge branch 'ent-6002-pandora-communty-vulnerabilities' into 'develop'
Fixed xss event comments vulnerabiluty and some acls on event ajax

See merge request artica/pandorafms!3335
2020-07-13 10:06:26 +02:00
Luis Calvo 9ae225a505 Fixed snmp community special char 2020-07-03 13:34:04 +02:00
fbsanchez 112f578512 wip smart services 2020-07-01 20:50:07 +02:00
Luis Calvo 9a8c42f4ac Fixed xss event comments vulnerabiluty and some acls on event ajax 2020-06-26 15:36:51 +02:00
Manuel Montes b7411da737 Ent 5914 problema css con resolucion pantalla 1366 2020-06-26 13:29:17 +02:00
Daniel Rodriguez 3c5a893c71 Merge branch 'ent-5830-SNMP-Browser-Network-components-OID-info-and-Create-agent-modules' into 'develop'
Ent 5830 snmp browser network components oid info and create agent modules

See merge request artica/pandorafms!3249
2020-06-24 12:46:49 +02:00
Luis b40b98fc54 Added type to SNMP browser module creation 2020-06-23 14:46:22 +02:00
marcos 7cfc68a3d6 ignore keys on xss event comments 2020-06-19 10:59:43 +02:00
marcos 93bc14d102 fixed vulnerabilty on events comments 2020-06-09 11:40:39 +02:00
daniel b9d5ab9c4a Fixed errors new tab base64 image 2020-06-08 11:24:46 +02:00
Daniel Rodriguez 86afda25fe Merge branch 'ent-5673-Mala-visualizacion-de-modulos-con-caracteres-japones' into 'develop'
Fixed errors encoding

See merge request artica/pandorafms!3234
2020-06-02 17:24:11 +02:00
alejandro-campos 6ba1a27274 added error to dialog submission when no agents or policies have been selected 2020-05-27 18:51:25 +02:00
Daniel Barbero Martin db32fedde4 Fixed errors encoding 2020-05-25 17:06:20 +02:00
fbsanchez b0e8287c61 Wip cluster view 2020-05-21 19:28:24 +02:00
fbsanchez bd3ffc0c8d Tree view style review 2020-05-06 17:35:05 +02:00
Daniel Maya 8ae8ac45f5 Ent 5690 vulnerabilidad critica inyeccion de comandos en llamada a event response 2020-04-15 15:50:08 +02:00
Jose Gonzalez 253432d4ee Clean unnecesary file 2020-04-07 09:11:13 +02:00
fbsanchez 2d4b977d26 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-06 11:05:18 +02:00
Luis bcd9aabcd8 Ent 5604 policy modules japanese bug 2020-04-02 14:30:02 +02:00
Jose Gonzalez 161c1eb643 WIP: Minor fixes 2020-03-26 14:41:54 +01:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Jose Gonzalez 2b21266a38 WIP: At this point, PEN form is operative and functional 2020-03-26 12:17:28 +01:00
Jose Gonzalez 86cbecc9a0 WIP: PEN form near to clear 2020-03-26 09:04:10 +01:00
alejandro-campos 4246c15157 add not available in case there is no last status change registered 2020-03-25 16:21:51 +01:00
alejandro-campos e05c292d7d show last status change of module 2020-03-23 12:47:58 +01:00
alejandro-campos 014688468c changes to show last status change of modules 2020-03-19 15:18:20 +01:00
alejandro-campos 0f1ed5165e default timeout for IPAM ping 2020-03-17 18:03:08 +01:00
fbsanchez f3da919abc WIP multiple changes 2020-03-16 23:52:20 +01:00
Tatiana Llorente 04f2ebeaf1 Ent 4515 filtro de alertas en vista de agente 2020-03-12 10:47:59 +01:00
Luis 82fe47cfd9 Ent 5312 snmp browser enchancements 2020-02-27 16:31:09 +01:00
Alejandro Fraguas 0538bd5185 Merge branch 'ent-5227-Problema-encoding-aplicación-politicas' into 'develop'
Ent 5227 problema encoding aplicación politicas

See merge request artica/pandorafms!3055
2020-02-10 12:14:19 +01:00
Jose Gonzalez 0b7d4a9463 Added solution for UTF8 charset in treeview and main agent view 2020-02-10 11:16:57 +01:00
Daniel Rodriguez 8b60daa9ba Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop'
fix module string data with html special chars breaking html in page

See merge request artica/pandorafms!3042
2020-02-04 10:10:07 +01:00
alejandro-campos 73f3dfac85 fix module string data with html special chars breaking html in page 2020-01-31 11:53:42 +01:00
Daniel Rodriguez 28392b71ef Merge branch 'ent-5066-9061-Crear-Failover-en-Informe-de-disponibilidad' into 'develop'
availability failover

See merge request artica/pandorafms!3015
2020-01-27 10:48:50 +01:00
Alejandro Campos e7769b8bf4 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/extras/mr/35.sql
2020-01-20 12:00:42 +01:00
Daniel Rodriguez 96eebe4310 Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' into 'develop'
Added port option on server configuration to be used when connecting to execution server

See merge request artica/pandorafms!3012
2020-01-17 14:40:58 +01:00
Tatiana Llorente 0980c9a74a Ent 5261 cambio de control de intervalo en alertas 2020-01-16 13:50:39 +01:00
Daniel Maya c68f83f013 availability failover 2020-01-15 17:16:46 +01:00
Alejandro Campos c389769602 Merge branch 'develop' into 'ent-5135-No-funciona-la-exploracion-SNMP-remota'
# Conflicts:
#   pandora_console/extras/mr/35.sql
2020-01-15 17:12:32 +01:00
alejandro-campos 5eb2953810 Added port option on server configuration to be used when connecting to execution server 2020-01-14 15:43:17 +01:00
Alejandro Campos dcd2aae3c5 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/extras/mr/35.sql
2020-01-14 10:28:55 +01:00
Daniel Maya 7204e7c0f2 Ent 4862 mas opciones en los filtros de severidad 2020-01-13 18:24:29 +01:00
manuel 62c915d6df Added log when offline update fails 2020-01-09 17:09:55 +01:00
Daniel Rodriguez 1cef8aa62f Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop'
Changed the mode of obtain the title

See merge request artica/pandorafms!2743
2020-01-09 16:46:58 +01:00
Alejandro Campos 0468c85a4d Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
2020-01-07 12:00:27 +01:00
Daniel Rodriguez 8a6fa4f988 Merge branch 'ent-4881-entities-audit-OUM' into 'develop'
Fixed audit log OUM entities bug

See merge request artica/pandorafms!2902
2020-01-07 10:23:39 +01:00
Daniel Rodriguez de77e76c3a Merge branch 'ent-3270-Bug-en-las-consolas-visuales-de-tipo-bars-graph' into 'develop'
fix bug in bars graph visual console editor

See merge request artica/pandorafms!2849
2020-01-07 09:44:25 +01:00
Alejandro Fraguas ebe6e1109c Merge branch 'ent-4467-barra-de-busqueda-como-interprete-de-ordenes' into 'develop'
Ent 4467 barra de busqueda como interprete de ordenes

See merge request artica/pandorafms!2934
2019-12-26 11:10:53 +01:00
Alejandro Fraguas 69159d158d Merge branch 'ent-1786-Rango-de-tiempo-en-container-graphs' into 'develop'
Ent 1786 rango de tiempo en container graphs

See merge request artica/pandorafms!2931
2019-12-23 10:18:39 +01:00
marcos 1f3fc1f908 add more pages in order interpreter 2019-12-12 16:27:11 +01:00
Daniel Maya bb4fce07a1 Added secondary groups in event details 2019-12-11 12:35:27 +01:00
Daniel Rodriguez 1350ef951b Merge branch '5079-Otra-vez-las-comillas-dobles-en-comentarios' into 'develop'
Code reset and solved other issues with comments

See merge request artica/pandorafms!2943
2019-12-10 17:21:48 +01:00
Luis 6ba4a26564 Added timeoout option to command event responses 2019-12-10 11:54:30 +01:00
vgilc 418cf73c87 Merge branch 'ent-4506-item-de-consola-visual-tipo-line-imborrable-y-problemas-al-colocarlo' into 'develop'
Fixed bug in visual console line item

See merge request artica/pandorafms!2885
2019-12-10 11:49:42 +01:00
vgilc f55a5c484e Merge branch 'ent-4961-Ventana-filtro-de-eventos-muy-pequeña-si-el-nombre-de-filtro-es-muy-grande' into 'develop'
Ent 4961 ventana filtro de eventos muy pequeña si el nombre de filtro es muy grande

See merge request artica/pandorafms!2880
2019-12-10 11:35:41 +01:00
alejandro-campos 5880bec88a changes in module data formatting when printed across the application and new setup options 2019-12-05 17:41:44 +01:00
Jose Gonzalez 3652f31a18 Code reset and solved other issues with comments 2019-12-05 17:06:58 +01:00
marcos 631170bfe9 resolv blank page 2019-12-03 14:26:31 +01:00
marcos d4720c2260 add firts changes 2019-12-03 13:59:03 +01:00
Tatiana Llorente fecd2c74b5 Added button to refresh graph in container graphs 2019-12-03 13:00:59 +01:00
marcos 21bf49c218 update id_source_event 2019-11-22 13:38:08 +01:00
Luis Calvo d222553aba Fixed audit log OUM entities bug 2019-11-20 18:27:21 +01:00
manuel 607c26529d Fixed bug in visual console line item 2019-11-14 09:51:49 +01:00
Tatiana Llorente a11b18292c Fixed width in the select to load filters in events view 2019-11-12 17:12:44 +01:00
alejandro-campos a3ea32d355 fix bug in bars graph visual console editor 2019-10-31 14:12:45 +01:00
fbsanchez 72b1fb2b16 Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
Conflicts:
	pandora_console/include/javascript/pandora.js

	modified:   pandora_console/general/register.php
	modified:   pandora_console/godmode/agentes/configurar_agente.php
	modified:   pandora_console/godmode/agentes/module_manager_editor.php
	new file:   pandora_console/include/ajax/welcome_window.php
	new file:   pandora_console/include/class/WelcomeWindow.class.php
	modified:   pandora_console/include/constants.php
	modified:   pandora_console/include/functions_config.php
	modified:   pandora_console/include/javascript/pandora.js
	new file:   pandora_console/include/styles/new_installation_welcome_window.css
2019-10-30 16:56:44 +01:00
marcos e725a0185b cambios semi finales 2019-10-24 16:56:13 +02:00
Tatiana Llorente adf3b08537 Add text (inv) in the help of the thresholds for inverse intervals - #1880 2019-10-17 11:50:50 +02:00
alejandro-campos f73cd80336 minor changes in integria integration 2019-09-23 15:16:31 +02:00
Jose Gonzalez d7ca703c99 Cleaned the javascript call 2019-09-20 10:53:09 +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
Tatiana Llorente 326b053f23 New view - List of Integria IMS tickets - #4642 2019-09-17 13:03:36 +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
Luis Calvo 23e5c50d13 Added new custom fields url formating to custom fields 2019-08-27 09:34:42 +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
Daniel Barbero Martin 31da17db03 fixed event view metaconsole 2019-08-22 14:27:45 +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
Luis Calvo 47e8a618c2 Fixed alert actions bug 2019-08-06 14:41:54 +02:00
Jose Gonzalez 719f56efec Modified SQL queries for avoidance of case sensitive 2019-07-29 16:32:50 +02:00
Daniel Maya 4e01967b88 Added title in custom field 2019-07-24 17:05:54 +02:00
Daniel Barbero Martin 45e1c32473 fixed events sound 2019-07-15 15:31:01 +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
Tatiana Llorente 1f8e143963 Fixed bug to change the event status in modal window - #4309 2019-07-10 13:04: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
Daniel Barbero Martin 000cdfdcfd WIP failover 2019-07-04 12:09:08 +02:00
Daniel Barbero Martin 22734a4ea2 WIP failover 2019-07-03 17:51:47 +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
Daniel Barbero Martin 0064bc0cba fixed errors 2019-07-01 17:07:39 +02:00
Alejandro Fraguas cda9cd6fe1 Merge branch 'ent-4234-Ventana-popup-que-muestra-graficas-no-tiene-en-cuenta-los-unknown-y-no-cabe' into 'develop'
Changed size for modal window for module graph- #4234

See merge request artica/pandorafms!2536
2019-06-26 13:43:57 +02:00