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
|
762ad3106d
|
Improvements and fixes H&D with review
|
2020-04-07 18:50:56 +02:00 |
Jose Gonzalez
|
396c93c8b8
|
WIP: Refactor and solve visual issues
|
2020-04-07 17:46:12 +02:00 |
|
fbsanchez
|
eb64fd8758
|
minor fixes
|
2020-04-06 16:10:37 +02:00 |
|
fbsanchez
|
3f9bdf65df
|
minor fixes and target selection (buttons)
|
2020-04-06 13:00:09 +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
|
e249233205
|
minor fixes
|
2020-04-01 16:43:04 +02:00 |
|
fbsanchez
|
acabe543c4
|
csv recon0
|
2020-03-30 19:44:44 +02:00 |
|
fbsanchez
|
3a74e25068
|
PEN management
|
2020-03-27 11:41:56 +01: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 |
|
fbsanchez
|
fecff8aa93
|
Discovery review advanced
|
2020-03-25 18:02:58 +01:00 |
|
Jose Gonzalez
|
7bf5764081
|
Added CSS changes. WIP: Backup upload
|
2020-03-19 18:24:52 +01:00 |
|
fbsanchez
|
b860c49383
|
target selections
|
2020-03-17 18:34:30 +01:00 |
|
fbsanchez
|
f3da919abc
|
WIP multiple changes
|
2020-03-16 23:52:20 +01:00 |
|
fbsanchez
|
ce11d89953
|
Frontent changes
|
2020-03-13 14:03:50 +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 |
Tatiana Llorente
|
ec57540fb0
|
Ent 5432 libreria de modulos de pandora integrada en consola
|
2020-02-27 11:20:24 +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 |
|
Daniel Barbero Martin
|
5ff10ac514
|
fixed errors VC
|
2020-01-25 11:57:04 +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 Barbero Martin
|
cd3691ecc3
|
fixed errors VC
|
2020-01-23 17:52:59 +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
|
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
|
ed53399c3c
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-14 09:34:31 +01:00 |
|
Daniel Maya
|
7204e7c0f2
|
Ent 4862 mas opciones en los filtros de severidad
|
2020-01-13 18:24:29 +01:00 |
|
Daniel Barbero Martin
|
4f6ed7c39f
|
Fix tinyMCE background grey
|
2020-01-13 10:14:51 +01:00 |
|
Daniel Barbero Martin
|
14e4e37c2a
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-10 08:09:13 +01:00 |
|
Daniel Barbero
|
7e4cb02ceb
|
fixed styles and more
|
2020-01-09 18:05:21 +01:00 |
Manuel Montes
|
5e058df052
|
Fixed z-index header
|
2020-01-09 11:52:27 +01:00 |
|
Daniel Barbero Martin
|
c4f0305f9b
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-08 08:29:59 +01:00 |
Daniel Rodriguez
|
d16ecc54b6
|
Merge branch '5148-Tabs-vista-eventos' into 'develop'
Changed to 2px active tab
Closes pandora_enterprise#5148
See merge request artica/pandorafms!2959
|
2020-01-07 11:46:18 +01:00 |
|
Daniel Rodriguez
|
456fbc096e
|
Merge branch 'ent-4572-Bugs-graficos-en-black-theme' into 'develop'
Fixed visual bugs in black theme - #4572
See merge request artica/pandorafms!2713
|
2020-01-07 09:43:45 +01:00 |
|
Daniel Barbero Martin
|
5e008e684d
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-02 17:45:52 +01:00 |
|
Jose Gonzalez
|
6422e34782
|
Modified General tab in META events
|
2020-01-02 12:50:35 +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
|
9d318a8612
|
Merge branch '5144-IE-Edge-Login-Background' into 'develop'
Added control for MS Edge and Internet Explorer browsers for disallow linear gradient
See merge request artica/pandorafms!2967
|
2019-12-23 17:13:42 +01:00 |
|
Alejandro Fraguas
|
ecb190910b
|
Merge branch '3812-Pantalla-Instalacion-DB-Demos' into 'develop'
Added images and CSS file for new demo installation screen
See merge request artica/pandorafms!2965
|
2019-12-23 11:27:55 +01:00 |
|
Daniel Barbero
|
d4207ef67c
|
Fixed form php VC
|
2019-12-20 13:58:47 +01:00 |
|
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 |
|
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 |
|
fbsanchez
|
c4779f6f91
|
Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF
|
2019-11-07 18:33:51 +01:00 |
|
fbsanchez
|
763ec6772c
|
Help feedback style improved
|
2019-11-07 17:26:32 +01:00 |
|
fbsanchez
|
7c68595241
|
Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
|
2019-11-07 10:43:24 +01:00 |
|
fbsanchez
|
d080f1d6a7
|
Welcome pack
|
2019-11-07 10:42:46 +01:00 |
|
Daniel Barbero Martin
|
b18878148c
|
change load modal
|
2019-11-07 09:38:52 +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 Martin
|
e5f24ca884
|
Merge develop
|
2019-11-05 15:27:06 +01:00 |
|
fbsanchez
|
ed6dd2983f
|
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
Conflicts:
pandora_console/include/javascript/pandora.js
|
2019-11-05 15:21:21 +01:00 |
|
Daniel Barbero Martin
|
ebb7cbfe6c
|
Fix styles css
|
2019-11-05 15:12:24 +01:00 |
|
fbsanchez
|
3eb0a6bb95
|
minor fixes after internal meeting
|
2019-10-30 18:33:33 +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
|
334cea472e
|
add method ui_progress_extend(work in progress)
|
2019-10-30 14:47:28 +01:00 |
|
marcos
|
bb7ba67dab
|
changes in omnishell.css
|
2019-10-29 17:49:04 +01:00 |
|
Daniel Barbero Martin
|
2bb81a839a
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/menu.php
pandora_console/pandoradb_data.sql
|
2019-10-29 17:15:19 +01:00 |
|
fbsanchez
|
c07baa614f
|
Merge remote-tracking branch 'origin/ent-4766-feedback-de-ayudas' into ent-EDF
|
2019-10-29 17:00:57 +01:00 |
|
Marcos Alconada
|
613e5741fb
|
Merge branch 'develop' into 'ent-4766-feedback-de-ayudas'
# Conflicts:
# pandora_console/include/functions_ui.php
|
2019-10-29 17:00:39 +01:00 |
|
marcos
|
487da50d31
|
add omnishell.css
|
2019-10-29 16:56:11 +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 |
|
marcos
|
e725a0185b
|
cambios semi finales
|
2019-10-24 16:56:13 +02:00 |
|
Daniel Barbero Martin
|
de22fb70e3
|
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
|
2019-10-23 19:51:49 +02:00 |
|
Daniel Barbero Martin
|
f06a55c6bb
|
continue feedback mail
|
2019-10-23 19:50:57 +02:00 |
|
Alejandro Fraguas
|
ee0eee06f6
|
Merge branch 'ent-4724-estilo-vista-pandora-wux' into 'develop'
fixed visual error
See merge request artica/pandorafms!2779
|
2019-10-22 12:54:28 +02:00 |
|
marcos
|
ca49cefb0d
|
fixed
|
2019-10-22 12:19:25 +02:00 |
|
marcos
|
79a1a1b2a3
|
add wux.css
|
2019-10-22 10:23:53 +02:00 |
|
marcos
|
ee97ed8a5e
|
segunda ronda
|
2019-10-21 18:36:02 +02:00 |
|
Daniel Barbero
|
e37af1598a
|
continue feedback diagnostics
|
2019-10-21 18:11:04 +02:00 |
|
marcos
|
353246f9f6
|
first changed to welcome window
|
2019-10-18 10:30:19 +02:00 |