Commit Graph

727 Commits

Author SHA1 Message Date
fbsanchez 3d493f14da massive services 2020-07-07 19:10:24 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
fbsanchez b3cf532c16 Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster 2020-05-29 12:30:49 +02:00
Tatiana Llorente b99298786e Ent 5754 editor de usuarios de godmode que sea visualmente similar al editor de usuarios el propio usuario 2020-05-19 08:20:04 +02:00
fbsanchez 57ccd783b0 Merge branch 'develop' into 'ent-5756-pantallas-de-configuracion-del-cluster' 2020-05-14 17:42:58 +02:00
fbsanchez 92ff713651 1st approach 2020-05-05 18:58:45 +02:00
fbsanchez 7024863fd7 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
Conflicts:
	pandora_console/extras/mr/37.sql
2020-04-14 16:06:17 +02:00
Jose Gonzalez 6f0b1c005f Added invisible class 2020-04-13 15:41:35 +02:00
fbsanchez 5c405b1d32 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-04-08 10:18: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
alejandro-campos 60c766ca29 minor visual changes on user notifications editor 2020-04-02 10:37:59 +02:00
fbsanchez 452f5253e2 merge develop 2020-03-26 14:43:57 +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 7bf5764081 Added CSS changes. WIP: Backup upload 2020-03-19 18:24:52 +01:00
fbsanchez 843f4f3f50 Wux style review 2020-03-10 15:39:44 +01:00
Luis 82fe47cfd9 Ent 5312 snmp browser enchancements 2020-02-27 16:31:09 +01:00
Daniel Barbero Martin ac4c091c9e Fixed errors VC 2020-01-21 17:43:41 +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
Tatiana Llorente 95600412e1 Minor visual changes in alert list 2020-01-14 13:14:09 +01:00
Daniel Barbero Martin 4f6ed7c39f Fix tinyMCE background grey 2020-01-13 10:14:51 +01:00
Manuel Montes 5e058df052 Fixed z-index header 2020-01-09 11:52:27 +01:00
daniel 3e58746cd5 Fixed errors PDF images relative routes 2019-12-17 18:18:00 +01:00
artica b71752ea03 Merge remote-tracking branch 'remotes/origin/ent-5108-ws-cookie-parser' into develop 2019-12-16 11:23:06 +01:00
fbsanchez bd1954ce38 Setup Websocket engine, unified 2019-12-13 13:11:38 +01:00
Daniel Rodriguez 01db6dd3b2 Merge branch 'ent-5094-selector-fechas-informes-html' into 'develop'
Added margin to date selector elements in reporting viewer

See merge request artica/pandorafms!2945
2019-12-12 09:10:35 +01:00
daniel 3dbdfdb6eb Fix Landscape reports 2019-12-11 15:07:38 +01:00
vgilc 325eff607e Merge branch 'ent-3903-Dashboard-mostrar-leyenda-en-mapa-de-servicio' into 'develop'
changes in service map widget: always show legend and fix visual problem

See merge request artica/pandorafms!2889
2019-12-10 11:53:37 +01:00
Luis Calvo a184b50eb2 Added margin to date selector elements in reporting viewer 2019-12-05 18:55:15 +01:00
Daniel Barbero 867f0cfbe9 WIP Rules alert correlation 2019-11-25 20:06:42 +01:00
fbsanchez 8001ba0d41 minor fix 2019-11-22 15:37:32 +01:00
fbsanchez 443eb1168c Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs 2019-11-18 12:48:31 +01:00
fbsanchez 0d3817d64d dynamic toggle in wizard input printForm 2019-11-14 17:45:45 +01:00
alejandro-campos 994b3a9bff changes in service map widget: always show legend and fix visual problem 2019-11-14 15:21:24 +01:00
Daniel Barbero Martin c17acefc49 Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
Conflicts:
	pandora_console/extras/mr/33.sql
2019-11-14 12:22:11 +01:00
fbsanchez 875d4430a7 Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell 2019-11-13 12:21:42 +01:00
Daniel Barbero Martin 7103317bc2 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/styles/pandora.css
2019-11-13 12:12:17 +01:00
fbsanchez d1fbd36a97 WIP omnishell 2019-11-12 19:31:38 +01:00
Tatiana Llorente 484ec9ea60 Ent 4845 revision de skins 2019-11-12 18:10:58 +01:00
Daniel Barbero Martin fa6bc254a1 Fixed errors 2019-11-12 16:22:58 +01:00
Daniel Barbero Martin 9d3c9febad Add alert correlation wizard 2019-11-12 13:16:25 +01:00
fbsanchez 79d165b164 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-06 20:01:28 +01:00
manuel a486738920 Fixed visual styles ticket 4809 2019-11-06 10:31:26 +01:00
Daniel Barbero c4aea1ac59 add styles validation form of modal 2019-10-25 13:28:01 +02:00
Daniel Barbero Martin 3dee6888d6 fix 2019-10-24 17:42:37 +02:00
Daniel Barbero Martin f06a55c6bb continue feedback mail 2019-10-23 19:50:57 +02:00
Daniel Barbero e37af1598a continue feedback diagnostics 2019-10-21 18:11:04 +02:00
Daniel Barbero Martin 4e56f6751a Continue work diagnostics 2019-10-17 15:17:28 +02:00
manuel a69cfb63f1 Fixed bug in histogram graph report 2019-10-11 09:04:13 +02:00
fbsanchez 315d9728ec quick fix short news titles 2019-09-05 10:54:14 +02:00