Commit Graph

1038 Commits

Author SHA1 Message Date
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
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
fbsanchez 65d02d4529 Merge remote-tracking branch 'origin/ent-EDF' into ent-4774-welcome-to-pandorafms 2019-11-13 17:40:45 +01:00
fbsanchez 345eb48fd7 save the green lines 2019-11-13 17:38:48 +01:00
fbsanchez 83590146b1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 2019-11-13 17:38:24 +01:00
fbsanchez 670df456f5 wip results omnishell 2019-11-13 16:39:24 +01:00
fbsanchez 672ce6db22 first task omnishell and minor style checks 2019-11-13 15:24:44 +01:00
Daniel Rodriguez f844c660af Merge branch 'ent-4766-feedback-de-ayudas' into 'develop'
add feedback

See merge request artica/pandorafms!2813
2019-11-13 13:43:08 +01:00
Daniel Barbero Martin 5f8ec8f89c fixed errors 2019-11-13 13:29:09 +01:00
fbsanchez 875d4430a7 Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell 2019-11-13 12:21:42 +01:00
fbsanchez b11dbc639f Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
Conflicts:
	pandora_console/general/header.php
2019-11-13 12:20:29 +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
Daniel Barbero Martin 28c9718c26 WIP alerts-log 2019-11-13 12:07:23 +01:00
fbsanchez d1fbd36a97 WIP omnishell 2019-11-12 19:31:38 +01:00
Daniel Barbero Martin 25f879df00 add step 3 2019-11-12 18:45:20 +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
fbsanchez b9633933e1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/general/header.php
2019-11-12 14:17:45 +01:00
Daniel Barbero Martin 02677849ce add new css 2019-11-12 13:17:00 +01:00
Daniel Barbero Martin 9d3c9febad Add alert correlation wizard 2019-11-12 13:16:25 +01:00
marcos ec05b52fb4 update omnishell.css 2019-11-12 10:08:35 +01:00
fbsanchez 1637b09b1e Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-11 15:23:35 +01:00
fbsanchez 946ef2fae4 icon review tick badge 2019-11-11 15:23:23 +01:00
Daniel Barbero Martin c78e3f4184 fixed minor error 2019-11-08 08:55:58 +01:00
fbsanchez d9d8cbfd35 Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell 2019-11-07 19:43:18 +01:00
fbsanchez a8bdb68cac Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF 2019-11-07 19:40:23 +01:00
fbsanchez 4905b18888 Fulfill help path and mail check 2019-11-07 19:39:50 +01:00
fbsanchez 9387f59979 Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF 2019-11-07 18:39:06 +01:00
fbsanchez 424aa10555 style minor changes 2019-11-07 18:38:52 +01:00