Commit Graph

19252 Commits

Author SHA1 Message Date
fbsanchez 72b6e7f81a Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-03-19 18:33:09 +01:00
fbsanchez 17eae7d97f updates 2020-03-19 18:33:04 +01:00
Jose Gonzalez 7bf5764081 Added CSS changes. WIP: Backup upload 2020-03-19 18:24:52 +01:00
Jose Gonzalez e14f072822 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-03-19 18:23:48 +01:00
Jose Gonzalez cca11f2341 WIP: Backup upload 2020-03-19 16:14:38 +01:00
alejandro-campos 014688468c changes to show last status change of modules 2020-03-19 15:18:20 +01:00
fbsanchez 32c6e7f30c Minor fixes 2020-03-19 14:26:01 +01:00
tatiana e939ac05a8 Delete groups in nodes when deleting in meta - #5138 2020-03-19 13:11:06 +01:00
Jose Gonzalez 451cdf2ca1 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-03-19 12:14:05 +01:00
Jose Gonzalez c9813afc9b DB changes 2020-03-19 12:13:56 +01:00
artica 6cea6f62c2 Auto-updated build strings. 2020-03-19 01:00:16 +01:00
fbsanchez f58276ddbb Templates 2020-03-18 19:31:58 +01:00
Tatiana Llorente 8c86019037 Ent 5583 bug comando de alerta 2020-03-18 12:25:29 +01:00
Alejandro Fraguas 49a7623bcf Merge branch 'ent-5495-Fallo-de-ping-desde-IPAM' into 'develop'
default timeout for IPAM ping

See merge request artica/pandorafms!3109
2020-03-18 11:25:59 +01:00
fbsanchez 6504fe49b5 intentation to spaces (2) and minor fix 2020-03-18 10:28:50 +01:00
artica d7eaa4355b Auto-updated build strings. 2020-03-18 01:00:17 +01:00
fbsanchez b860c49383 target selections 2020-03-17 18:34:30 +01:00
Jose Gonzalez c1337a4318 WIP: Backup upload 2020-03-17 18:27:56 +01:00
Luis Calvo 2ac727596c Fixed availability report column sizes 2020-03-17 18:10:15 +01:00
alejandro-campos 0f1ed5165e default timeout for IPAM ping 2020-03-17 18:03:08 +01:00
Jose Gonzalez 40958ae69d WIP: Backup upload 2020-03-17 16:24:17 +01:00
alejandro-campos 254225b8ac order alphabetically modules 2020-03-17 14:23:52 +01:00
Jose Gonzalez 142823eef6 WIP: Backup upload 2020-03-17 13:46:10 +01:00
artica b0e8a12df6 Auto-updated build strings. 2020-03-17 01:00:16 +01:00
fbsanchez 3a4deddc4b Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-03-16 23:52:34 +01:00
fbsanchez f3da919abc WIP multiple changes 2020-03-16 23:52:20 +01:00
Jose Gonzalez 106f8bd1cf Created new files with Module Blocks and changed Menu entries 2020-03-16 20:48:38 +01:00
Daniel Rodriguez e1e76595a5 Merge branch 'ent-5365-Pestana-de-acciones-de-alertas-sin-paginacion' into 'develop'
Ent 5365 pestana de acciones de alertas sin paginacion

See merge request artica/pandorafms!3087
2020-03-16 17:19:32 +01:00
Daniel Rodriguez a6721956ce Merge branch 'ent-5045-9182-Item-group_report-añadir-interval' into 'develop'
changed event count in group report

See merge request artica/pandorafms!3104
2020-03-16 17:14:01 +01:00
Daniel Rodriguez f1178559c3 Merge branch 'ent-5214-Bug-rutas' into 'develop'
added ui_get_full_url to paths

See merge request artica/pandorafms!3082
2020-03-16 16:35:48 +01:00
Tatiana Llorente c7bb4f5a95 Ent 5548 usabilidad en el editor de modulos 2020-03-16 16:35:01 +01:00
Daniel Maya fc88d265d4 Added group filter in alert list 2020-03-16 15:42:10 +01:00
alejandro-campos 421056e959 Sort modules alphabetically in module select 2020-03-16 14:07:54 +01:00
artica b2de9eeef2 Auto-updated build strings. 2020-03-16 01:00:14 +01:00
artica 7cd987321e Auto-updated build strings. 2020-03-15 01:00:13 +01:00
artica a4c44bf68b Auto-updated build strings. 2020-03-14 01:00:15 +01:00
alejandro-campos 8000f4cf92 changed event count in group report 2020-03-13 14:21:25 +01:00
fbsanchez ce11d89953 Frontent changes 2020-03-13 14:03:50 +01:00
artica 3c4c659d95 Auto-updated build strings. 2020-03-13 01:00:16 +01:00
Daniel Rodriguez 782ebce66f Merge branch 'ent-5511-9663-Bug-SQL-query-Metaconsola' into 'develop'
avoid trying to connect to server if server name is empty or zero

See merge request artica/pandorafms!3084
2020-03-12 16:23:44 +01:00
Daniel Rodriguez f2b5bb0583 Merge branch 'ent-5566-problemas-con-permisos-en-meta' into 'develop'
Ent 5566 problemas con permisos en meta

See merge request artica/pandorafms!3099
2020-03-12 13:31:34 +01:00
alejandro-campos db3709164a Merge branch 'develop' into ent-5214-Bug-rutas 2020-03-12 13:15:19 +01:00
Tatiana Llorente 04f2ebeaf1 Ent 4515 filtro de alertas en vista de agente 2020-03-12 10:47:59 +01:00
Luis d9dd1992ff Ent 5366 monitor report not showing correct sla 2020-03-12 10:41:43 +01:00
Alejandro Fraguas 1a8539fe81 Merge branch 'ent-2929-Check-servicios-favoritos' into 'develop'
Added control for favourites filter in TreeService class

See merge request artica/pandorafms!3098
2020-03-12 09:50:54 +01:00
artica 48f014ee7d Auto-updated build strings. 2020-03-12 01:00:17 +01:00
Daniel Maya a7fdd4cc20 change in metaconsole advanced setup 2020-03-11 16:21:25 +01:00
Jose Gonzalez c5888b1d1a Added control for favourites filter in TreeService class 2020-03-11 15:00:35 +01:00
fbsanchez f0a71e01de minor fixes 2020-03-11 13:35:31 +01:00
Luis 6721e4f5ab Ent 5446 bug creating netflow filter 2020-03-11 11:32:21 +01:00
Daniel Rodriguez 9aea31f5c4 Merge branch 'ent-5420-bug-agent-modules-view' into 'develop'
Added cont for module status alert triggered

See merge request artica/pandorafms!3092
2020-03-11 11:17:06 +01:00
Alejandro Fraguas 1cb6b8fa69 Merge branch 'ent-5492-Respuestas-eventos-no-disponibles-usuarios-con-tags' into 'develop'
Added tags_user for events responses

Closes pandora_enterprise#5492

See merge request artica/pandorafms!3091
2020-03-11 09:59:57 +01:00
artica c8ee27ed2b Auto-updated build strings. 2020-03-11 01:00:17 +01:00
alejandro-campos ef704895b1 truncate long texts 2020-03-10 17:23:19 +01:00
fbsanchez 9211396134 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-03-10 15:40:16 +01:00
fbsanchez 843f4f3f50 Wux style review 2020-03-10 15:39:44 +01:00
Daniel Rodriguez 97f3902cf4 Merge branch 'ent-5431-Filtro-de-usuarios' into 'develop'
fix bad parameter in function call

See merge request artica/pandorafms!3068
2020-03-10 12:11:29 +01:00
Jose Gonzalez 6488a88636 Solved issue with WHERE clause 2020-03-10 12:00:25 +01:00
Daniel Rodriguez 326e784e4d Merge branch 'ent-5404-Boton-de-creacion-desplazado-en-consolas-visuales' into 'develop'
Ent 5404 boton de creacion desplazado en consolas visuales

See merge request artica/pandorafms!3086
2020-03-10 10:17:59 +01:00
artica 8b3dafc48f Auto-updated build strings. 2020-03-10 01:00:15 +01:00
fbsanchez d0f1239d9d Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-03-09 18:50:23 +01:00
artica b7408b5e99 Auto-updated build strings. 2020-03-09 01:00:14 +01:00
artica 1ff7219e06 Auto-updated build strings. 2020-03-08 01:00:13 +01:00
artica d995210494 Auto-updated build strings. 2020-03-07 01:00:14 +01:00
artica bdd6cde6c2 Auto-updated build strings. 2020-03-06 01:00:16 +01:00
Jose Gonzalez 01641c4584 Avoid collections case for files download 2020-03-05 14:52:04 +01:00
artica 4a5af5da40 Auto-updated build strings. 2020-03-05 01:00:08 +01:00
Luis Calvo c2e608f120 Added cont for module status alert triggered 2020-03-04 12:09:54 +01:00
fbsanchez fd23ed30c5 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-03-04 11:37:35 +01:00
Jose Gonzalez 3501efb0ad Added tags_user for events responses 2020-03-04 10:42:52 +01:00
artica 9d3db50cf4 Auto-updated build strings. 2020-03-04 01:00:07 +01:00
Daniel Barbero 19b571fc78 update version 2020-03-03 10:17:18 +01:00
artica 3e6cc7b2e7 Auto-updated build strings. 2020-03-03 01:00:09 +01:00
Tatiana Llorente d799ac0739 Added pagination and filter box in alert actions - #5365 2020-03-02 16:17:45 +01:00
Tatiana Llorente c8e492b194 Moved creation button to right side in visual maps - #5404 2020-03-02 11:41:54 +01:00
Tatiana Llorente 13466536bd Show correct counter of deleted alerts - #5509 2020-03-02 11:23:20 +01:00
artica 015b1b55b2 Updated version and build strings. 2020-03-02 11:01:26 +01:00
Alejandro Fraguas 3c542b4d06 Merge branch 'ent-5371-tags-perfil-usuario-monitor-view' into 'develop'
Fixed monitor view groups without tags

See merge request artica/pandorafms!3083
2020-03-02 10:24:07 +01:00
artica 97037d1266 Auto-updated build strings. 2020-03-02 01:00:08 +01:00
artica 501d76b975 Auto-updated build strings. 2020-03-01 01:00:08 +01:00
artica b106981613 Auto-updated build strings. 2020-02-29 01:00:10 +01:00
alejandro-campos 814b68c284 avoid trying to connect to server if server name is empty or zero 2020-02-28 14:54:20 +01:00
Tatiana Llorente c820a32b53 Ent 4492 consola visual por paises 2020-02-28 14:37:44 +01:00
Luis Calvo 1196524581 Fixed monitor view groups without tags 2020-02-28 12:33:36 +01:00
alejandro-campos b29e0c7966 added ui_get_full_url to paths 2020-02-28 11:38:41 +01:00
Kike 4cdabc1c91 Added new mibs 2020-02-28 11:32:33 +01:00
Daniel Maya 30e1021877 Fixed conflict in tpolicies 2020-02-28 08:51:00 +01:00
artica 6e594f5503 Auto-updated build strings. 2020-02-28 01:00:10 +01:00
fbsanchez b125f7618e browser option in wux modules 2020-02-27 18:41:28 +01:00
Luis 82fe47cfd9 Ent 5312 snmp browser enchancements 2020-02-27 16:31:09 +01:00
Alejandro Fraguas 8c77637d19 Merge branch 'ent-5273-9370-5708-failed-to-read-configuration-file' into 'develop'
Ent 5273 9370 5708 failed to read configuration file

See merge request artica/pandorafms!3047
2020-02-27 14:04:02 +01:00
Tatiana Llorente ec57540fb0 Ent 5432 libreria de modulos de pandora integrada en consola 2020-02-27 11:20:24 +01:00
daniel ac6ca52c45 Fixed resulution charts 2020-02-27 10:52:01 +01:00
artica a9590892bf Auto-updated build strings. 2020-02-27 01:00:09 +01:00
marcos e28415250c remove entities from reports 2020-02-26 15:18:42 +01:00
vgilc a0ea52983b Revert "Merge branch 'ent-4239-entities-en-exportacion-de-informes-nodo-meta' into 'develop'"
This reverts merge request !2519
2020-02-26 14:27:19 +01:00
artica 3b9e100f9f Auto-updated build strings. 2020-02-26 01:00:08 +01:00
marcos 0cdd33f69a deleted alert correlations fms 2020-02-25 11:19:45 +01:00
alejandro-campos bd6540da87 fixed visual bug in table 2020-02-25 11:09:11 +01:00
artica 400809ce61 Auto-updated build strings. 2020-02-25 01:00:10 +01:00
Daniel Rodriguez a519330b42 Merge branch 'ent-5201-correlacion-de-alertas-fase-2' into 'develop'
alert correlation update

See merge request artica/pandorafms!3063
2020-02-24 18:11:09 +01:00
Daniel Rodriguez 43ca1bdc5d Merge branch 'ent-5336-SNMP-Interface-Wizard' into 'develop'
Fixed when you select 'show all modules' and the module is not from the interface

See merge request artica/pandorafms!3056
2020-02-24 14:30:49 +01:00
Alejandro Fraguas 568b869681 Merge branch 'ent-4239-entities-en-exportacion-de-informes-nodo-meta' into 'develop'
Removed entitites

See merge request artica/pandorafms!2519
2020-02-24 14:15:14 +01:00
alejandro-campos 4bdea42c63 fix bad parameter in function call 2020-02-24 13:16:22 +01:00
Daniel Maya 9f01356b6f conflict resolved 2020-02-24 09:49:25 +01:00
artica 03b97f4fdb Auto-updated build strings. 2020-02-24 01:00:07 +01:00
artica bfab0285e5 Auto-updated build strings. 2020-02-23 01:00:11 +01:00
artica 1667ed4f1c Auto-updated build strings. 2020-02-22 01:00:10 +01:00
marcos dcce09befd fixed error 2020-02-21 14:53:48 +01:00
Daniel Rodriguez b0f0ef3f98 Merge branch 'policies-rework' into 'develop'
Replaced old policies with reworked ones

See merge request artica/pandorafms!3060
2020-02-21 13:51:17 +01:00
Daniel Rodriguez 4e403bca72 Merge branch 'ent-5436-Vulnerabilidad' into 'develop'
fix bug when saving netflow filters

See merge request artica/pandorafms!3064
2020-02-21 13:27:34 +01:00
alejandro-campos 0a1dd6fe24 fix save of filters 2020-02-21 13:01:47 +01:00
marcos f25aacf108 fixed erro2 2020-02-21 10:58:04 +01:00
alejandro-campos e0a159736c safe output to string with entities 2020-02-21 10:50:56 +01:00
Kevin e6ff0b22ac Added missing information to Solaris policy 2020-02-21 10:27:20 +01:00
artica 540fffc6ef Auto-updated build strings. 2020-02-21 00:01:14 +01:00
marcos bc4c811071 update reports with enttites 2020-02-20 17:04:18 +01:00
Daniel Maya 4e4c1495eb Fixed merge conflict 2020-02-20 15:07:14 +01:00
Daniel Barbero Martin a55e431b46 Fixed error cache build link VC 2020-02-20 13:25:56 +01:00
Daniel Barbero Martin 6ccc606c74 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-20 08:06:59 +01:00
artica 70ee4f4e9b Auto-updated build strings. 2020-02-20 00:01:12 +01:00
Daniel Barbero 3288fec039 Fixed visual error VC 2020-02-19 15:31:30 +01:00
Daniel Rodriguez ab568bdb52 Merge branch 'ent-5488-Mala-redireccion-en-wizard-de-wmi-que-inhabilita-la-funcionalidad' into 'develop'
fix bug in form action

See merge request artica/pandorafms!3065
2020-02-19 11:30:34 +01:00
marcos e265bc2970 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-02-19 09:31:31 +01:00
artica a04b92a0bc Auto-updated build strings. 2020-02-19 09:12:12 +01:00
Alejandro Fraguas 1acfaa9cdc Merge branch 'ent-5429-Cambios-en-el-editor-de-modulos' into 'develop'
Ent 5429 cambios en el editor de modulos

See merge request artica/pandorafms!3052
2020-02-18 14:03:36 +01:00
alejandro-campos 65b3b1dc36 fix bug in form action 2020-02-18 13:47:47 +01:00
Daniel Maya 87dc92ffd9 Ent 5457 suid nodos elastic 2020-02-18 13:24:22 +01:00
marcos 2dffb967cc Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-02-18 12:58:11 +01:00
alejandro-campos b9e3c70374 fix bug when saving netflow filters 2020-02-18 11:25:45 +01:00
Daniel Barbero Martin 1ab92fe798 Fixed error event history VC 2020-02-18 08:08:56 +01:00
Daniel Barbero Martin dd437be186 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-18 07:55:19 +01:00
artica 92e1492f2b Auto-updated build strings. 2020-02-18 00:01:12 +01:00
marcos 7564249207 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-02-17 16:15:29 +01:00
marcos fbea1e7077 remove entities reports 2020-02-17 15:54:09 +01:00
marcos dea661f14d update 2020-02-17 14:49:34 +01:00
marcos 6a8fa93358 updates 2020-02-17 13:53:38 +01:00
Daniel Rodriguez a3d4fdf9c6 Merge branch 'ent-4154-Configuración-purgado-histórico-duplicada-+-error' into 'develop'
Added button for close error popup - #4154

See merge request artica/pandorafms!2674
2020-02-17 13:26:32 +01:00
marcos b521cc37fd update reports entitines 2020-02-17 13:17:33 +01:00
marcos 21a14c4d42 alert correlation update 2020-02-17 12:55:03 +01:00
Daniel Barbero Martin 3ad9e3c420 Fixed error event history VC 2020-02-17 08:19:36 +01:00
Daniel Barbero Martin f3b744717e Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-17 08:06:50 +01:00
artica bf0211c9b8 Auto-updated build strings. 2020-02-17 00:01:09 +01:00
artica 6a3d1b4992 Auto-updated build strings. 2020-02-16 00:01:08 +01:00
artica 19b59f2819 Auto-updated build strings. 2020-02-15 00:01:16 +01:00
Kevin 15a4bd0763 Replaced old policies with reworked ones 2020-02-14 11:18:21 +01:00
artica e60ccb8a68 Auto-updated build strings. 2020-02-14 00:01:12 +01:00
Daniel Barbero Martin f9c944fa8d Fixed error events history VC 2020-02-13 10:08:50 +01:00
Daniel Barbero Martin c96dd8e930 Fix selector modules only string in VC barsgraph and donutgraph 2020-02-13 09:55:49 +01:00
Daniel Maya 1e4217d1c6 Changed Inserts in tpolicy 2020-02-13 09:22:57 +01:00
Daniel Barbero Martin 10972a2364 Fix bug icon builder view not legacy mode 2020-02-13 08:45:25 +01:00
Daniel Barbero Martin cad6889c46 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-13 07:58:06 +01:00
artica d1663cd242 Auto-updated build strings. 2020-02-13 00:01:09 +01:00
Daniel Maya e908019d4f Ent 5318 no hay opcion de pantalla completa para las consolas visuales en la meta 2020-02-12 17:05:29 +01:00
artica 79fe01ee56 Auto-updated build strings. 2020-02-12 00:01:09 +01:00
Daniel Rodriguez 5d436d214b Merge branch 'ent-4740-revision-completa-de-informes-templates-en-nodo' into 'develop'
Fixed bug in prediction report item 4740

See merge request artica/pandorafms!2872
2020-02-11 15:39:26 +01:00
alejandro-campos 526ba37151 minor visual change in threshold graph 2020-02-11 10:10:03 +01:00
Daniel Barbero Martin 962b3d2248 Fix linked ACL another VC 2020-02-11 09:45:43 +01:00
Alejandro Fraguas f1a52d6272 Merge branch 'ent-4771-Revision-llamada-API-create-event-en-metaconsola' into 'develop'
Ent 4771 revision llamada api create event en metaconsola

See merge request artica/pandorafms!2793
2020-02-11 09:37:40 +01:00
Daniel Barbero Martin 1d2ad47507 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-11 07:57:42 +01:00
artica 0db7abbe9e Auto-updated build strings. 2020-02-11 00:01:12 +01:00
Daniel Barbero Martin 0042f390ef Fixed errors VC 2020-02-10 17:31:48 +01:00
Tatiana Llorente f2ff861b4d Merge remote-tracking branch 'origin/develop' into ent-4154-Configuración-purgado-histórico-duplicada-+-error
Conflicts:
	pandora_console/general/mysqlerr.php
2020-02-10 17:25:11 +01:00
Tatiana Llorente 740dcdb35b Changed id_agent for id_tagent 2020-02-10 17:10:39 +01:00
Tatiana Llorente 9a84c8c893 Changed id_agent for id_tagent 2020-02-10 17:05:03 +01:00
Tatiana Llorente 19f07b9b9e Changed id_agent for id_tagent 2020-02-10 17:01:36 +01:00
Tatiana Llorente 6dd1ee24e5 Merge remote-tracking branch 'origin/develop' into ent-4771-Revision-llamada-API-create-event-en-metaconsola 2020-02-10 16:48:38 +01:00
Daniel Maya 363b3e8a80 Changed pandora fms by product name 2020-02-10 16:21:04 +01:00
Daniel Maya e65de54f39 Fixed when you select 'show all modules' and the module is not from the interface 2020-02-10 15:46:04 +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
Manuel Montes 4f14921e85 Fixed bug in reports 2020-02-10 11:40:33 +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 6faac04672 Merge branch 'ent-5267-Fechas-erroneas-en-availability-graph' into 'develop'
Fixed date in availability graph

See merge request artica/pandorafms!3027
2020-02-10 10:46:55 +01:00
Daniel Rodriguez 6e3d70cd76 Merge branch 'ent-5411-Availability-graphs-visualización-pdf' into 'develop'
Ent 5411 availability graphs visualización pdf

See merge request artica/pandorafms!3048
2020-02-10 10:06:15 +01:00
Daniel Barbero Martin d99d31b432 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-10 09:54:03 +01:00
artica 583c605b31 Auto-updated build strings. 2020-02-10 00:01:08 +01:00
artica 47b60c29d6 Auto-updated build strings. 2020-02-09 00:01:08 +01:00
artica 1be17441e7 Auto-updated build strings. 2020-02-08 00:01:08 +01:00
alejandro-campos 58364f90d5 visual changes in module creation 2020-02-07 14:01:59 +01:00
alejandro-campos bc96e0b32a visual changes in module creation 2020-02-07 13:59:50 +01:00
alejandro-campos b658fddfc2 visual changes in module creation 2020-02-07 13:58:26 +01:00
artica 0cb2f88540 Auto-updated build strings. 2020-02-07 00:01:25 +01:00
Luis 56a2970755 Ent 5112 error nodos ficticios widget mapa red 2020-02-06 14:32:43 +01:00
Jose Gonzalez 5b08e71ec6 Solved issue with UTF8 chars in configuration_data field 2020-02-06 13:02:58 +01:00
Daniel Rodriguez 545c0056bc Merge branch 'ent-4700-No-funciona-logrotate-de-pandora-console-log' into 'develop'
fix bad owner for pandora_console logrotate config file

See merge request artica/pandorafms!3040
2020-02-06 12:03:57 +01:00
artica 36fdaf3ff7 Auto-updated build strings. 2020-02-06 00:01:11 +01:00
Daniel Barbero Martin 68dd01ba09 fixed errors VC 2020-02-05 18:56:28 +01:00
Daniel Maya ae015fa00f Fixed width in availability graph 2020-02-05 16:40:01 +01:00
Daniel Barbero Martin 902c42b559 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-05 14:05:26 +01:00
Daniel Rodriguez 97adbca5cd Merge branch 'ent-4768-error-macro-agent-address-event-responses' into 'develop'
Fixed macro agent address empty ip

See merge request artica/pandorafms!2823
2020-02-05 12:56:13 +01:00
Daniel Maya be47ed178b Added force apply in policies 2020-02-05 12:49:52 +01:00
Daniel Rodriguez 1cca736953 Merge branch 'ent-4788-Icono-GIS-en-Setup-desaparecido' into 'develop'
Ent 4788 icono gis en setup desaparecido

See merge request artica/pandorafms!2843
2020-02-05 12:35:50 +01:00
Alejandro Fraguas ec98d861b2 Merge branch 'ent-4622-Fallo-filtrado-en-listado-acceso-API' into 'develop'
Fixed bug with API access list - #4622

See merge request artica/pandorafms!2724
2020-02-05 10:44:42 +01:00
artica 70e5486ce6 Auto-updated build strings. 2020-02-05 00:01:11 +01:00
Daniel Rodriguez 3342b7dd53 Merge branch 'ent-5403-XSS-vistas-por-Nokia-USA' into 'develop'
Fixed XSS vulnerability

See merge request artica/pandorafms!3041
2020-02-04 17:30:21 +01:00
Daniel Rodriguez 22649e016f Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop'
fix html special characters breaking html in modules search

See merge request artica/pandorafms!3046
2020-02-04 16:56:26 +01:00
alejandro-campos a51c17b512 fix html special characters breaking html in modules search 2020-02-04 16:39:54 +01:00
Daniel Rodriguez 0e9e59efbb Merge branch 'ent-5289-9247-Group-Alert-Report-bug' into 'develop'
fix bug in group alert report data visualization

See merge request artica/pandorafms!3031
2020-02-04 13:25:29 +01:00
Daniel Rodriguez e6a5d7986f Merge branch 'ent-5376-Inyecciones-SQL-vistas-por-Nokia-USA' into 'develop'
Fixed % with sprintf

See merge request artica/pandorafms!3039
2020-02-04 13:14:55 +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
artica 3415838700 Auto-updated build strings. 2020-02-04 00:01:10 +01:00
alejandro-campos 674f2a2873 minor fix: data string not being displayed correctly when module unknown 2020-02-03 18:04:52 +01:00
alejandro-campos 3b233eeb90 changed functionality to not show trigger times that are not within the interval 2020-02-03 18:01:28 +01:00
fbsanchez 5da211aae0 ACL edit mode 2020-02-03 17:08:37 +01:00
fbsanchez 72d23e5dfa Module graph paint direct 2020-02-03 16:32:20 +01:00
Alejandro Fraguas 00ab0b9952 Merge branch 'ent-5295-Constantes-de-1año-2-años-y-3-años-no-son-correctas' into 'develop'
Ent 5295 constantes de 1año 2 años y 3 años no son correctas

See merge request artica/pandorafms!3014
2020-02-03 16:21:22 +01:00
alejandro-campos d05551f85a fix characters breaking html 2020-02-03 16:17:46 +01:00
Daniel Rodriguez 32cb47fb71 Merge branch 'ent-5251-9432-No-se-pueden-crear-usuarios-con-password-policy-activado' into 'develop'
Fixed password policy

See merge request artica/pandorafms!3020
2020-02-03 16:06:43 +01:00
Daniel Rodriguez bdb8d309ad Merge branch 'ent-5359-8945-Logo-y-nombre-de-Pandora-FMS-al-fallar-la-base-de-datos' into 'develop'
fix to display pandora tab subtitle based on condition and display rebranding...

See merge request artica/pandorafms!3025
2020-02-03 14:06:38 +01:00
Alejandro Fraguas 6aae378b37 Merge branch 'ent-4533-descuadre-visual-usuarios-metaconsola' into 'develop'
ajuste visual en tabla user management

See merge request artica/pandorafms!2682
2020-02-03 13:55:42 +01:00
Alejandro Fraguas 6c93fcfe02 Merge branch 'ent-5361-vulnerabilidad-subir-ficheros' into 'develop'
adding .htaccess files

See merge request artica/pandorafms!3026
2020-02-03 12:36:01 +01:00
Alejandro Fraguas 12d8dca70e Merge branch 'ent-5149-9065-Pandora-manage-create-event-poner-saltos-de-linea' into 'develop'
Added possibility to display comments with line breaks in event detail

See merge request artica/pandorafms!3029
2020-02-03 10:34:56 +01:00
artica af7d1ea5f9 Auto-updated build strings. 2020-02-03 00:01:08 +01:00
artica 690f6e715d Auto-updated build strings. 2020-02-02 00:01:08 +01:00
artica 3136563bba Auto-updated build strings. 2020-02-01 00:01:09 +01:00
rafael c200f57856 adding .txt restreriction for webchat 2020-01-31 18:45:53 +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
artica 7aa9a630d0 Auto-updated build strings. 2020-01-31 00:01:10 +01:00
Daniel Maya bf53eb5a6b Fixed XSS vulnerability 2020-01-30 17:29:07 +01:00
alejandro-campos b79805c363 fix bad owner for pandora_console logrotate config file 2020-01-30 13:08:56 +01:00
Daniel Maya 891c517611 Fixed % with sprintf 2020-01-30 13:02:33 +01:00
artica 1134c041f2 Auto-updated build strings. 2020-01-30 00:01:08 +01:00
Daniel Maya baecac1efb Next mr 2020-01-29 15:51:39 +01:00
marcos 0ed4937368 add traductions 2020-01-29 13:48:48 +01:00
Alejandro Fraguas 0cf42f2d74 Merge branch 'new-vc-line-element' into 'develop'
New vc line element

See merge request artica/pandorafms!2795
2020-01-29 11:04:23 +01:00
Daniel Barbero Martin dc6f1e3049 fixed errors VC 2020-01-29 10:56:29 +01:00
Daniel Barbero Martin 2bbc5d18b5 fixed errors VC 2020-01-29 10:15:31 +01:00
artica 2f6fed368d Updated version and build strings. 2020-01-29 10:13:37 +01:00
Daniel Barbero Martin 3bd3ca00bf Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-29 08:20:11 +01:00
artica 395920f8eb Auto-updated build strings. 2020-01-29 00:01:09 +01:00
Daniel Barbero Martin e49ed85d03 fixed errors VC 2020-01-28 18:29:32 +01:00
Daniel Barbero Martin 5906273271 fixed errors VC 2020-01-28 17:52:40 +01:00
Daniel Barbero Martin 3f5e418d98 fixed errors VC 2020-01-28 16:42:51 +01:00
Daniel Barbero Martin 73dcabc48d fixed errors VC 2020-01-28 12:44:37 +01:00
Daniel Barbero Martin 0ad6e7842f fixed errors VC 2020-01-28 12:12:07 +01:00
Daniel Barbero Martin f459c6fb79 fixed errors VC 2020-01-28 11:05:15 +01:00
marcos d5016d4943 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-01-28 10:08:01 +01:00
alejandro-campos d79137148c fix bug in group alert report data visualization 2020-01-28 10:06:46 +01:00
Daniel Barbero Martin e2d610f22c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-28 09:13:29 +01:00
artica 71cc1f4951 Auto-updated build strings. 2020-01-28 00:01:07 +01:00
Daniel Barbero Martin 0dabab11cf Merge remote-tracking branch 'origin/develop' into new-vc-line-element
Conflicts:
	pandora_console/install.php
2020-01-27 16:19:32 +01:00
Daniel Barbero Martin 6ddb501b08 fixed errors VC 2020-01-27 16:15:54 +01:00
alejandro-campos 5913f815d1 Added possibility to display comments with line breaks in event detail 2020-01-27 13:37:34 +01:00
Daniel Barbero Martin 570ebd9a0a fixed errors VC 2020-01-27 13:16:01 +01:00
fbsanchez 50a2d74adb Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms
Conflicts:
	pandora_server/pandora_server.spec
2020-01-27 12:38:19 +01:00
Daniel Maya 1998db3317 Fixed date in availability graph 2020-01-27 11:52:13 +01:00
rafael e2bd041ba2 adding .htaccess files 2020-01-27 11:03: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
Daniel Maya c0d6ae1496 Fixed label Failover 2020-01-27 09:32:22 +01:00
Daniel Barbero Martin 8ee038667c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-27 08:22:36 +01:00
artica e35edd92b3 Auto-updated build strings. 2020-01-27 00:01:09 +01:00
artica 5dbb80287e Auto-updated build strings. 2020-01-26 00:01:10 +01:00
Daniel Barbero Martin 19964c8463 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-25 11:57:19 +01:00
Daniel Barbero Martin 5ff10ac514 fixed errors VC 2020-01-25 11:57:04 +01:00
artica b4b1fbb3c1 Auto-updated build strings. 2020-01-25 00:01:10 +01:00
Daniel Barbero Martin 5ec8c68aed fixed errors VC 2020-01-24 15:13:42 +01:00
alejandro-campos d21068e368 fix to display pandora tab subtitle based on condition and display rebranding product name in case database connection failed 2020-01-24 13:52:09 +01:00
Daniel Barbero Martin aea073b4d5 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-24 11:41:35 +01:00
Daniel Rodriguez 6a35ffa01b Merge branch 'ent-5322-SQL-Injection-leads-to-Login-Bypass' into 'develop'
Fixed injection sql in chart_generator

See merge request artica/pandorafms!3024
2020-01-24 10:52:02 +01:00
Daniel Maya aa3bf33607 Added treport_content_item in migrate 2020-01-24 09:28:16 +01:00
artica ea3a317a1b Auto-updated build strings. 2020-01-24 00:01:33 +01:00
Daniel Barbero Martin fe697a98ec fixed errors VC 2020-01-23 19:54:47 +01:00
Daniel Barbero Martin cd3691ecc3 fixed errors VC 2020-01-23 17:52:59 +01:00
Daniel Barbero Martin 481f08bd5f fixed errors VC 2020-01-23 16:21:31 +01:00
marcos 79a34ac756 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-01-23 11:06:15 +01:00
Daniel Rodriguez a0ef0e1ee1 Merge branch 'ent-5324-Remote-file-inclusion-phar-object-injection-as-lowest-privileged-user' into 'develop'
fixed vulnerability

See merge request artica/pandorafms!3023
2020-01-23 11:04:40 +01:00
Daniel Maya 9f9cc9beda Fixed injection sql in chart_generator 2020-01-23 10:40:55 +01:00
Daniel Barbero Martin 76dd28fbdc fixed errors VC 2020-01-23 10:24:46 +01:00
vgilc 2447514c41 Merge branch 'ent-4259-el-id-del-agente-con-remote-config-se-corta-en-la-vista-de-manage-resolucion-portatil' into 'develop'
Fix visual problems with agent details

See merge request artica/pandorafms!2625
2020-01-23 10:11:35 +01:00
Daniel Barbero Martin 3124e09c12 fixed errors VC 2020-01-23 09:20:40 +01:00
Daniel Barbero Martin 6c6403336f Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-23 08:14:24 +01:00
Daniel Barbero 203a91f065 fixed errors 2020-01-22 17:47:47 +01:00
alejandro-campos c44b595c8a fixed vulnerability 2020-01-22 17:20:13 +01:00
marcos 823fb30db7 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-01-22 13:42:58 +01:00
Daniel Rodriguez 5374a06cbf Merge branch 'ent-5150-errores-y-mejoras-generales-en-correlacion-de-alertas' into 'develop'
add wiki url alerts correlation

See merge request artica/pandorafms!3022
2020-01-22 13:41:47 +01:00
Daniel Barbero f3dbf6391f Add confirm dialog remove item VC 2020-01-22 13:00:19 +01:00
Daniel Barbero 69e750da13 Fixed error Color cloud VC 2020-01-22 12:48:31 +01:00
marcos 18a3a747bd add wiki url alerts correlation 2020-01-22 12:24:15 +01:00
Daniel Rodriguez 189ba74f01 Merge branch 'ent-5323-Phar-object-injection' into 'develop'
Prepend folder to image to avoid Phar injection

See merge request artica/pandorafms!3021
2020-01-22 12:20:35 +01:00
vgilc 69d9051339 Merge branch 'ent-5172-metaconcola-informes-ajustes-para-agrupados' into 'develop'
Fixed visual bug in grouped report item

See merge request artica/pandorafms!2992
2020-01-22 12:20:05 +01:00
Daniel Maya 5c3b6c7a69 Fix total check for failover 2020-01-22 12:18:11 +01:00
Daniel Rodriguez f6cb7eb3d7 Merge branch 'ent-5325-CSRF-XSS-realtime-graphs' into 'develop'
Added enconding to POST variables realtime graphs

See merge request artica/pandorafms!3019
2020-01-22 12:04:14 +01:00
Daniel Maya 32b28bea0c Added warning in update manager offline 2020-01-22 11:10:02 +01:00
Luis Calvo ca35bb64cc Prepend folder to image to avoid Phar injection 2020-01-22 10:17:35 +01:00
Daniel Barbero 8bcacf546c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-22 10:13:25 +01:00
artica 475517afd7 Auto-updated build strings. 2020-01-22 00:01:19 +01:00
Daniel Barbero Martin 4b5a754d2e Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-21 17:44:06 +01:00
Daniel Barbero Martin ac4c091c9e Fixed errors VC 2020-01-21 17:43:41 +01:00
Daniel Maya 428e0ffbd7 Fixed password policy 2020-01-21 17:31:21 +01:00
Daniel Maya 81fe77d9fd Added failover in templates 2020-01-21 16:26:36 +01:00
marcos 76ed257287 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-01-21 15:23:26 +01:00
Daniel Barbero Martin a557c25c31 Fixed errors VC 2020-01-21 12:55:54 +01:00
Daniel Rodriguez 2a4e7bcceb Merge branch 'ent-5329-9418-remote_cmd_string-busca-histórico-en-tagente_datos' into 'develop'
remote_cmd_string modules historical data look into tagente_datos_string

See merge request artica/pandorafms!3018
2020-01-21 11:15:34 +01:00
Luis Calvo 3d0b71d953 Added enconding to POST variables 2020-01-21 11:05:49 +01:00
Daniel Barbero Martin b2f356bd4b Fixed errors VC 2020-01-21 10:42:09 +01:00
Daniel Barbero Martin 8672629dd6 Fixed errors VC 2020-01-21 10:33:07 +01:00
Daniel Barbero Martin 578400aa92 change load modal ?????? 2020-01-21 08:37:30 +01:00
Daniel Barbero Martin 89e83e38e0 Merge remote-tracking branch 'origin/develop' into new-vc-line-element
Conflicts:
	pandora_console/include/javascript/pandora.js
2020-01-21 08:28:00 +01:00
artica 2a17065065 Auto-updated build strings. 2020-01-21 00:01:11 +01:00
Daniel Barbero Martin 98ddf3c6ee Fixed errors VC 2020-01-20 17:46:52 +01:00
Daniel Barbero Martin 3545e28581 Fixed errors VC 2020-01-20 16:01:53 +01:00
ismael.moreno 395d45cec9 remote_cmd_string modules historical data look into tagente_datos_string 2020-01-20 14:12:33 +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 738361d237 Merge branch 'ent-4876-pandora_ui.js' into 'develop'
first changes pandora.js to pandora_ui.js

See merge request artica/pandorafms!2909
2020-01-20 09:54:20 +01:00
Daniel Barbero Martin 03c1224563 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-20 08:00:46 +01:00
artica ba1f0b96b4 Auto-updated build strings. 2020-01-20 00:01:08 +01:00
Daniel Barbero Martin 861011257d Fixed errors VC 2020-01-19 22:57:31 +01:00
Daniel Barbero Martin 536af6f33a Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-19 11:37:18 +01:00
artica 8eb77fa6cc Auto-updated build strings. 2020-01-19 00:01:07 +01:00
artica 14de9f3c59 Auto-updated build strings. 2020-01-18 00:01:15 +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
alejandro-campos bb4d3abe6b change config default value 2020-01-17 12:42:29 +01:00
Daniel Rodriguez 92eb63891b Merge branch 'ent-4754-mensaje-de-error-informes-con-base-de-datos-historica-mal-configurada' into 'develop'
add historical data fialure message

See merge request artica/pandorafms!2925
2020-01-17 10:32:53 +01:00
Marcos Alconada 2968ce7658 update error message 2020-01-17 10:09:52 +01:00
artica cf4362e433 Auto-updated build strings. 2020-01-17 00:01:10 +01:00
Marcos Alconada de1407badc Update mysqlerr.php 2020-01-16 17:58:50 +01:00
alejandro-campos 8778553cca Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' of https://brutus.artica.es:8081/artica/pandorafms into ent-5135-No-funciona-la-exploracion-SNMP-remota 2020-01-16 17:42:45 +01:00
alejandro-campos fb7cb57f03 added check to disable satellite servers from exec servers available in snmp wizard in case it is not a satellite agent or has remote config 2020-01-16 17:42:31 +01:00
Daniel Barbero Martin 02199b19b5 fixed errors VC 2020-01-16 16:55:48 +01:00
Daniel Barbero Martin d5e21499c2 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-16 14:08:07 +01:00
Daniel Barbero Martin 5900e7ba4a fixed errors VC 2020-01-16 14:07:35 +01:00
Tatiana Llorente 0980c9a74a Ent 5261 cambio de control de intervalo en alertas 2020-01-16 13:50:39 +01:00
Marcos Alconada 5268c23c7a Merge branch 'develop' into 'ent-4705-encriptado-de-nuevos-tokens'
# Conflicts:
#   pandora_console/include/functions_config.php
2020-01-16 09:23:42 +01:00
Daniel Barbero Martin 4a1801bc50 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-16 08:04:18 +01:00
artica 40f03e5682 Auto-updated build strings. 2020-01-16 00:01:08 +01:00
Daniel Barbero Martin d8a09bf359 Fixed errors VC 2020-01-15 17:37:24 +01:00
Daniel Rodriguez 9777b687b4 Merge branch 'ent-5262-Mejoras-de-laylout-en-vista-de-alertas' into 'develop'
Ent 5262 mejoras de laylout en vista de alertas

See merge request artica/pandorafms!3011
2020-01-15 17:28:23 +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 d9062def99 Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' of https://brutus.artica.es:8081/artica/pandorafms into ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024 2020-01-15 16:01:11 +01:00
alejandro-campos 3f26f2ef6f fix bug when deleting custom units and changed default value for byte multiplier 2020-01-15 16:00:33 +01:00
alejandro-campos 8b6c1261a9 change order of form port input 2020-01-15 15:37:42 +01:00
Alejandro Campos 6dbe75169f Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/extras/mr/35.sql
2020-01-15 14:37:00 +01:00
Daniel Barbero Martin c3ae3f08a7 Fixed errors VC 2020-01-15 14:28:43 +01:00
Tatiana Llorente 28b585196b Ent 5099 dobles interfaces en mapas de red no se visualizan 2020-01-15 14:11:36 +01:00
vgilc 1b5dcd781f Merge branch 'support-mysql8.0' into 'develop'
support for MySQL 8.0

See merge request artica/pandorafms!2984
2020-01-15 13:53:49 +01:00
Luis 2926ead13b Fixed group change on networkmap.ACL and source group working separated 2020-01-15 12:14:37 +01:00
Tatiana Llorente c21682145c Changed value for constants 1year, 2years, 3years 2020-01-15 10:37:05 +01:00
Daniel Barbero Martin 121ac2e80e Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-15 07:57:22 +01:00
artica 6bf5d07a2c Auto-updated build strings. 2020-01-15 00:01:09 +01:00
Daniel Barbero 89b43f1aee loading on resize and update elements VC 2020-01-14 15:52:47 +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
Daniel Barbero e723c98275 Fix clocks 2020-01-14 15:02:38 +01:00
Tatiana Llorente 95600412e1 Minor visual changes in alert list 2020-01-14 13:14:09 +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 Barbero ed53399c3c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-14 09:34:31 +01:00
Tatiana Llorente 7c928b8100 Ent 4795 check seleccionar todos queda marcado 2020-01-14 08:37:04 +01:00
Daniel Rodriguez 587e53dbd0 Merge branch 'ent-5259-Cambiar-estado-In-process-de-evento-no-añade-comentario' into 'develop'
Ent 5259 cambiar estado in process de evento no añade comentario

See merge request artica/pandorafms!3009
2020-01-14 08:36:43 +01:00
artica 8038e16c25 Auto-updated build strings. 2020-01-14 00:01:11 +01:00
Daniel Rodriguez 5a6efdd141 Merge branch 'ent-4832-revision-de-exportacion-de-informes-a-csv' into 'develop'
Fixed bug in CSV export

See merge request artica/pandorafms!2835
2020-01-13 18:28:09 +01:00