2020 Commits

Author SHA1 Message Date
Daniel Barbero
a6dfdb796a Fixed errors Form VC 2019-12-19 20:47:52 +01:00
marcos
43d08f354a Ajustes CSS 2019-12-19 16:53:45 +01:00
Daniel Barbero
49ab5e95aa Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-18 07:50:08 +01:00
daniel
3e58746cd5 Fixed errors PDF images relative routes 2019-12-17 18:18:00 +01:00
Daniel Barbero
d77d50bb74 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-17 08:26:04 +01:00
Luis Calvo
b5bc431d7b Changed pdf report header colours(lighter) 2019-12-16 18:19:34 +01:00
Jose Gonzalez
d8f232d814 Added control for MS Edge and Internet Explorer browsers for disallow linear gradient 2019-12-16 16:39:13 +01:00
Jose Gonzalez
c57ef7e6a0 Added images and CSS file for new demo installation screen 2019-12-16 15:45:27 +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
marcos
480673521c Can select with keyboard list items 2019-12-13 14:08:44 +01:00
fbsanchez
bd1954ce38 Setup Websocket engine, unified 2019-12-13 13:11:38 +01:00
Jose Gonzalez
6f9d400d03 Changed to 2px active tab 2019-12-13 11:50:59 +01:00
Daniel Barbero
319b3e604f Merge remote-tracking branch 'origin' into new-vc-line-element 2019-12-13 08:15:23 +01:00
Daniel Barbero
63dd3c48f8 Merge remote-tracking branch 'origin/develop' into new-vc-line-element
Conflicts:
	pandora_console/include/javascript/pandora.js
2019-12-12 16:32:32 +01:00
marcos
1f3fc1f908 add more pages in order interpreter 2019-12-12 16:27:11 +01:00
alejandro-campos
7f79a50c33 visual changes in html report headers 2019-12-12 14:55:27 +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
marcos
8ca473b2a7 ajust search input 2019-12-11 18:42:46 +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
marcos
1430e6ee11 Update orderinterpreter class and css 2019-12-05 16:10:31 +01:00
marcos
1f97fcef40 update css and preg_match 2019-12-03 18:31:13 +01:00
marcos
7eec91b946 Show result in normal window 2019-12-03 18:19:32 +01:00
marcos
d4720c2260 add firts changes 2019-12-03 13:59:03 +01:00
Daniel Barbero
867f0cfbe9 WIP Rules alert correlation 2019-11-25 20:06:42 +01:00
Daniel Barbero
f24034e729 Add styles Rules 2019-11-25 09:09:59 +01:00
fbsanchez
ae5d7b8944 minor style fix rulebuilder 2019-11-23 13:20:19 +01:00
fbsanchez
9bfe3f3152 minor style fix rulebuilder 2019-11-23 13:16:30 +01:00
fbsanchez
d3b5e7a2b0 minor style fix rulebuilder 2019-11-23 13:13:24 +01:00
fbsanchez
2f0b2c1766 minor fix css 2019-11-23 13:06:58 +01:00
fbsanchez
64e481187f RuleBuilder Style updates 2019-11-23 12:48:47 +01:00
fbsanchez
8001ba0d41 minor fix 2019-11-22 15:37:32 +01:00
Daniel Barbero
d6ce54cddf fixed errors Alert correlation 2019-11-22 15:26:30 +01:00
Daniel Barbero
4caf84da25 WIP alert correlations 2019-11-22 10:24:12 +01:00
Daniel Barbero
66035a8b67 fixed errors css 2019-11-21 15:27:47 +01:00
Daniel Barbero Martin
cd8f52fd92 WIP alert correlations 2019-11-20 09:11:03 +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
46c42ef8a4 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-15 16:52:26 +01:00
fbsanchez
84c6640032 minor style fix 2019-11-15 16:51:53 +01:00
fbsanchez
9440570548 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-15 13:08:09 +01:00
fbsanchez
e561b1f906 omnishell multiselect 2019-11-15 13:07:23 +01:00
fbsanchez
547e0c4364 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-14 20:58:16 +01:00
fbsanchez
546b8dc448 omnishell minor changes 2019-11-14 20:55:55 +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
b0920d93af Merge branch 'ent-4772-omnishell' into ent-EDF
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-11-13 18:15:19 +01:00
fbsanchez
78443a029d Omnishell rc1 2019-11-13 18:10:16 +01:00
fbsanchez
0e2a3d0f47 minor style fix after feedback cleanup 2019-11-13 17:42:14 +01:00