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
Daniel Barbero Martin
4e56f6751a
Continue work diagnostics
2019-10-17 15:17:28 +02:00
Alejandro Fraguas
be29f1dd55
Merge branch 'ent-4746-boton-de-aspecto-raro-en-forgot-your-password' into 'develop'
...
fixed minor error
See merge request artica/pandorafms!2782
2019-10-17 13:20:14 +02:00
Marcos Alconada
43d3f32d0c
Update help_feedback.css
2019-10-15 18:11:21 +02:00
Marcos Alconada
5a73b67545
Update help_feedback.css
2019-10-15 17:59:22 +02:00
marcos
a31e66a9bd
add feedback
2019-10-15 12:16:50 +02:00
manuel
a69cfb63f1
Fixed bug in histogram graph report
2019-10-11 09:04:13 +02:00
marcos.alconada
2938435988
fixed minor error
2019-10-03 17:46:26 +02:00
fbsanchez
79dca2fe6b
Php OO form load
2019-10-02 18:37:50 +02:00
marcos.alconada
2ea20c1605
fixed visual error
2019-10-02 14:42:51 +02:00
Daniel Barbero
d35a5d4f71
continue VC form create items
2019-09-27 15:44:39 +02:00
alejandro-campos
a5ea095734
Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria
2019-09-24 15:16:22 +02:00
Daniel Rodriguez
8e728eed6b
Merge branch 'ent-4632-alineamiento-erroneo-en-los-headers-y-footer-con-reported-pdf' into 'develop'
...
changed style on tables pdf report
See merge request artica/pandorafms!2718
2019-09-24 12:33:46 +02:00
fbsanchez
7d52614064
Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora
2019-09-24 11:25:53 +02:00
Alejandro Campos
20cebbe988
Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria'
...
# Conflicts:
# pandora_console/extras/mr/32.sql
2019-09-23 17:16:15 +02:00
Tatiana Llorente
51a1d7c0b7
Merge branch 'ent-4461-Configuracion-integracion-integria' of brutus.artica.lan:artica/pandorafms into ent-4461-Configuracion-integracion-integria
2019-09-23 13:18:08 +02:00
Tatiana Llorente
f9a903319c
Adding tabs and new functions - #4644
2019-09-23 13:14:20 +02:00
alejandro-campos
9bf2980f01
fix minor bugs in integria integration
2019-09-23 12:48:20 +02:00
alejandro-campos
be3de8dcfb
Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria
2019-09-20 12:45:22 +02:00
alejandro-campos
0df2447770
added comment management and fixed some errors in incident edition
2019-09-20 12:37:47 +02:00
Tatiana Llorente
375bfca6ff
New view - Dashboard details of Integria IMS tickets - #4644
2019-09-20 12:27:36 +02:00
alejandro-campos
f2a6dbb60e
Merge remote-tracking branch 'origin/ent-4642-Listado-de-tickets-integración-Integria' into ent-4461-Configuracion-integracion-integria
2019-09-17 14:56:54 +02:00
alejandro-campos
87f8badc18
completed integria setup and incident creation and update
2019-09-17 13:38:17 +02:00
Tatiana Llorente
027f9fd9d4
New view - List of Integria IMS tickets - #4642
2019-09-17 12:59:29 +02:00
marcos.alconada
b9b4230a6e
changed style on tables pdf report
2019-09-11 12:20:09 +02:00
Tatiana Llorente
8340a8a121
Merge branch 'develop' into 'ent-4572-Bugs-graficos-en-black-theme'
...
Conflicts:
pandora_console/include/styles/pandora_black.css
2019-09-10 10:34:47 +02:00
Tatiana Llorente
90b61533f8
Fixed visual bugs in black theme - #4572
2019-09-10 10:26:28 +02:00
fbsanchez
315d9728ec
quick fix short news titles
2019-09-05 10:54:14 +02:00
fbsanchez
9868462d43
Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha
2019-09-02 09:57:45 +02:00
Daniel Rodriguez
1ca7e03fa4
Merge branch 'ent-4523-fallos-en-black-theme' into 'develop'
...
Changed background-color in request new licence
See merge request artica/pandorafms!2673
2019-08-30 14:10:04 +02:00
marcos.alconada
a6037d8308
Changed background-color in request new licence
2019-08-21 09:27:55 +02:00
marcos.alconada
f2cf24cfb8
center content tables in pdf generator
2019-08-16 09:30:10 +02:00
marcos.alconada
61a1243213
center content tables in pdf generator
2019-08-16 09:29:40 +02:00
fbsanchez
adbb48ab87
pandora HA review
2019-08-10 02:13:01 +02:00
Alejandro Campos
12eacc1933
Merge branch 'develop' into 'ent-4388-Nuevos-eventos'
...
# Conflicts:
# pandora_console/extras/mr/31.sql
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-08-05 09:26:18 +02:00
marcos.alconada
6632efb068
se queda el boton de editar en la misma liniea y la i no queda por debajo de la linea intervalo
2019-07-31 16:19:59 +02:00
alejandro-campos
b4bd7f0f63
fixed problems in event view and event view custom fields
2019-07-30 16:10:34 +02:00
fbsanchez
6ac21acd39
wip agent deployment scan
2019-07-25 18:35:51 +02:00
fbsanchez
ce346bd604
agent deployment
2019-07-24 17:38:25 +02:00
fbsanchez
8d9c4682c7
WIP Agent repository
2019-07-17 20:37:13 +02:00
fbsanchez
17dc0b82ac
Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora
2019-07-17 17:19:58 +02:00
Daniel Rodriguez
c97074ea74
Merge branch 'ent-4354-Revision_completa_de_macros_de_reports' into 'develop'
...
fixed macros reports
See merge request artica/pandorafms!2595
2019-07-17 13:49:38 +02:00
Daniel Rodriguez
ab7743b578
Merge branch 'ent-4307-No-se-puede-copiar-agent_name-ni-ID-de-agente-en-vista-de-agente-Firefox' into 'develop'
...
Changed disabled to readonly in agent name and id- #4307
See merge request artica/pandorafms!2578
2019-07-16 11:52:12 +02:00
Daniel Rodriguez
304301a54a
Merge branch 'ent-4283-Elementos-superpuestos' into 'develop'
...
Fixed minor style bug in pagination events - #4283
See merge request artica/pandorafms!2569
2019-07-16 11:51:41 +02:00
fbsanchez
3bbd01026e
WIP agent deployment
2019-07-15 19:37:04 +02:00
Alejandro Fraguas
5498e1df3c
Merge branch 'ent-4038-warning-php-vodat' into 'develop'
...
Fixed wrong img paths
See merge request artica/pandorafms!2551
2019-07-15 14:51:23 +02:00
Daniel Barbero Martin
2f110b8e2e
Merge remote-tracking branch 'origin/develop' into ent-4354-Revision_completa_de_macros_de_reports
2019-07-15 11:37:02 +02:00
fbsanchez
9fb32c4699
Deployment area single targets
2019-07-12 18:29:58 +02:00
Daniel Rodriguez
91f55c326e
Merge branch 'ent-4351-Modificar-imagenes-con-bordes-blancos-para-que-sean-transparentes' into 'develop'
...
Changed images with transparent borders - #4351
See merge request artica/pandorafms!2597
2019-07-12 13:24:44 +02:00
Daniel Barbero
ecaba5ebd3
fixed errorsr macros reports
2019-07-12 10:24:46 +02:00
Tatiana Llorente
fca4a288a2
Changed gray image in discovery - #4351
2019-07-12 10:23:20 +02:00
Tatiana Llorente
cac34e3311
Changed gray image in discovery - #4351
2019-07-12 10:21:54 +02:00
fbsanchez
5fd7b87a06
Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora
2019-07-11 18:27:49 +02:00
Tatiana Llorente
fd24398219
Fixed several minor visual bugs - #4347
2019-07-11 14:46:41 +02:00
Daniel Rodriguez
ac3de84bda
Merge branch 'ent-4309-Falta-mensaje-de-Successfull-al-cambiar-el-owner-de-un-evento' into 'develop'
...
Added success and error messages when change the event owner - #4309
See merge request artica/pandorafms!2590
2019-07-11 11:36:03 +02:00
fbsanchez
47cc0d9d6e
WIP: Agent deployment center
2019-07-10 23:59:09 +02:00
Daniel Rodriguez
96fbca35a4
Merge branch 'ent-4194-Revision-de-CSS-alternativos' into 'develop'
...
Created black theme - #4194
See merge request artica/pandorafms!2564
2019-07-10 11:47:21 +02:00
Tatiana Llorente
7fd284f105
Fixed visual bugs in green and black theme - #4194
2019-07-09 17:36:40 +02:00
Tatiana Llorente
6af6aa179b
Changed background in update manager offline - #4194
2019-07-09 16:45:00 +02:00
Tatiana Llorente
084d1a229e
Added success and error messages when change the event owner - #4309
2019-07-09 16:41:00 +02:00
Tatiana Llorente
eaf29b798a
Fixed minor visual bugs in black theme- #4194
2019-07-09 15:03:38 +02:00
Tatiana Llorente
b6d551d583
Changed images with white background - #4194
2019-07-08 10:08:04 +02:00
Tatiana Llorente
745ab711de
Created green theme - #4194
2019-07-05 14:02:59 +02:00
Tatiana Llorente
d1bc6cc2ff
Created green theme - #4194
2019-07-05 13:59:48 +02:00
Tatiana Llorente
de6a0c2192
Changed disabled to readonly in agent name and id- #4307
2019-07-04 16:20:01 +02:00
Tatiana Llorente
89d00115e2
Fixed minor style bug in pagination events - #4283
2019-07-02 17:45:25 +02:00
Tatiana Llorente
dd8fc659ee
Created green theme - #4194
2019-07-02 15:15:19 +02:00
Tatiana Llorente
beace34567
Created black theme - #4194
2019-07-02 13:12:05 +02:00
Tatiana Llorente
1aa0131a81
Merge branch 'develop' into 'ent-4195-Status-sets-Visual'
...
Conflicts:
pandora_console/include/styles/pandora.css
2019-07-02 11:42:19 +02:00
Tatiana Llorente
9163f725ed
Created black theme - #4194
2019-07-01 16:57:33 +02:00
Alejandro Fraguas
8ec2ec9d0d
Merge branch 'ent-4112-Bug-visual-cuadro-de-datos-tipo-string' into 'develop'
...
Truncate long title in modal dialogs - #4112
See merge request artica/pandorafms!2508
2019-07-01 10:36:24 +02:00
Tatiana Llorente
c28185965a
Merge remote-tracking branch 'origin/develop' into ent-4112-Bug-visual-cuadro-de-datos-tipo-string
...
Conflicts:
pandora_console/include/styles/js/jquery-ui_custom.css
2019-06-28 12:28:13 +02:00
Tatiana Llorente
52f391667a
Style changes - #4250
2019-06-28 10:24:53 +02:00
Luis Calvo
1ffb435d5a
Fixed wrong img paths
2019-06-27 09:48:37 +02:00
Alejandro Fraguas
cda9cd6fe1
Merge branch 'ent-4234-Ventana-popup-que-muestra-graficas-no-tiene-en-cuenta-los-unknown-y-no-cabe' into 'develop'
...
Changed size for modal window for module graph- #4234
See merge request artica/pandorafms!2536
2019-06-26 13:43:57 +02:00
Daniel Rodriguez
4136f19190
Merge branch 'ent-4258-visual-console-movement-redimension-mode' into 'develop'
...
Visual Console's movement and redimension mode
See merge request artica/pandorafms!2527
2019-06-26 13:06:02 +02:00
Daniel Rodriguez
6976ba9c8e
Merge branch 'ent-3800-mal-enrutamiento-discovery' into 'develop'
...
Ent 3800 mal enrutamiento discovery
See merge request artica/pandorafms!2350
2019-06-26 12:02:43 +02:00
Alejandro Fraguas
7224974520
Merge branch 'ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion' into 'develop'
...
first steps credential store
See merge request artica/pandorafms!2523
2019-06-26 11:21:49 +02:00
fbsanchez
f66e5b5ef8
Fix class names to avoid addblock hide them
2019-06-26 11:11:21 +02:00
fbsanchez
4754e20784
Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion
2019-06-26 09:52:22 +02:00
Daniel Rodriguez
01514ba5b6
Merge branch 'ent-3699-descuadre-visual-recuperar-password' into 'develop'
...
Ent 3699 descuadre visual recuperar password
See merge request artica/pandorafms!2336
2019-06-25 14:26:57 +02:00
Tatiana Llorente
ea9540ddce
Changed size for modal window for module graph- #4234
2019-06-25 09:19:47 +02:00
fbsanchez
882aa67b3a
aws multi account viewer rc1
2019-06-24 20:35:24 +02:00
Alejandro Gallardo Escobar
b6f10f89d0
Fixed missing styles
2019-06-24 17:57:45 +02:00
Tatiana Llorente
43b83af2c6
Changed default images status set for css - #4195
2019-06-24 11:59:17 +02:00
Alejandro Gallardo Escobar
d9fee539a8
Merge branch 'develop' into 'ent-4258-visual-console-movement-redimension-mode'
...
# Conflicts:
# pandora_console/include/visual-console-client/vc.main.css
2019-06-24 10:31:53 +02:00
fbsanchez
38f72bed8d
AWS multi account
2019-06-22 13:11:35 +02:00
fbsanchez
c11cd556ce
WIP: AWS CS controller
2019-06-22 01:10:05 +02:00
fbsanchez
5658b98f0b
intuitive credential store
2019-06-21 23:51:22 +02:00
fbsanchez
e9ef9b64a3
credential_store
2019-06-21 19:34:47 +02:00
Daniel Maya
8f5a206027
Fixed vc-control in public visual console
2019-06-21 13:17:37 +02:00
Daniel Maya
379a0039ae
Fixed vc-control
2019-06-21 12:41:05 +02:00
fbsanchez
c3ebe88178
style review
2019-06-18 17:40:31 +02:00
Daniel Rodriguez
a87e3ce97e
Merge branch 'ent-3739-Vista-Agent-Module-view-no-funciona-en-pantalla-completa-y-autorefresco' into 'develop'
...
Fixed bug in Agent-Module fullscreen view
See merge request artica/pandorafms!2299
2019-06-18 17:00:15 +02:00
fbsanchez
d290b91b28
RC1 event viewer v2
2019-06-18 16:07:53 +02:00
fbsanchez
22272225b8
massive operations over events
2019-06-18 14:26:55 +02:00
fbsanchez
823581f398
export current page to csv fixed icon
2019-06-18 12:58:46 +02:00
fbsanchez
d8a331bf77
event filters tags, date, module name
2019-06-18 12:48:28 +02:00
fbsanchez
ab7d72a1c9
wip event vwr ui-box close tick
2019-06-17 17:02:33 +02:00
Daniel Rodriguez
a583da3de3
Merge branch 'ent-3992-anadir-el-modo-de-edicion-a-la-vista-de-la-consola-visual' into 'develop'
...
Añadir el modo de edición a la vista de la consola visual
Closes pandora_enterprise#3981
See merge request artica/pandorafms!2482
2019-06-17 15:07:12 +02:00
Tatiana Llorente
92dc7d4e8c
Truncate long title in modal dialogs - #4112
2019-06-14 13:48:35 +02:00
fbsanchez
7226a45df5
improved ui_progress now accepts ajax updates
2019-06-14 10:35:10 +02:00
fbsanchez
b08e8b595d
multiple fixes
2019-06-13 19:41:21 +02:00
fbsanchez
f3a0f37a1c
Events agent grouped
2019-06-12 18:19:39 +02:00
fbsanchez
4bb300889d
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-12 13:17:36 +02:00
Tatiana Llorente
31905f005a
Visual changes in Agent/Module View - #3739
2019-06-11 17:34:13 +02:00
Alejandro Fraguas
cb6d71b930
Merge branch 'ent-3474-Exportar-a-csv-custom-field-view' into 'develop'
...
Ent 3474 exportar a csv custom field view
See merge request artica/pandorafms!2483
2019-06-11 17:06:14 +02:00
fbsanchez
48e6fef0b7
Event filters
2019-06-11 12:58:18 +02:00
fbsanchez
ef3d299d58
wip event view
2019-06-10 15:18:35 +02:00
fbsanchez
f67bf8c2b7
wip event list filters
2019-06-07 22:44:02 +02:00
fbsanchez
d4d4509266
wip event view
2019-06-07 21:22:07 +02:00
fbsanchez
419a90d69c
wip event list
2019-06-07 17:35:13 +02:00
fbsanchez
23e6711f09
WIP Events
2019-06-06 17:50:47 +02:00
Tatiana Llorente
2d84081ca7
Add styles for metaconsole - #3614
2019-06-06 12:09:35 +02:00
fbsanchez
5b2eb8891b
tab moved
2019-06-04 22:43:26 +02:00
fbsanchez
6ed2a0636e
styles review
2019-06-04 22:34:17 +02:00
fbsanchez
a1be1e7332
styles review
2019-06-04 22:16:58 +02:00
Tatiana Llorente
1a8b09229c
Export csv from custom field view meta - #3474
2019-06-04 17:28:55 +02:00
Alejandro Gallardo Escobar
795542b311
Added a mode to enable the edit mode of the visual console client items
2019-06-04 17:21:54 +02:00
fbsanchez
2f5265fcbb
color updates
2019-06-04 14:08:07 +02:00
fbsanchez
c741020538
styles review
2019-06-04 13:57:55 +02:00
fbsanchez
cb1fb19b95
style review
2019-06-03 19:19:18 +02:00
fbsanchez
974db824a8
style review
2019-06-03 19:13:29 +02:00
fbsanchez
31257c02a4
style review
2019-06-03 14:50:22 +02:00
fbsanchez
7a09a80ace
style review
2019-06-03 14:30:23 +02:00
fbsanchez
b4dcf4a6f1
style review
2019-06-03 11:55:56 +02:00
fbsanchez
88b0802472
style review
2019-06-03 10:46:52 +02:00
fbsanchez
69054571ab
Style review
2019-05-31 09:50:59 +02:00
fbsanchez
40cca5e1e3
BIG style change, erased all important flags
2019-05-30 18:21:13 +02:00
fbsanchez
e37d120115
Review 1
2019-05-30 13:58:57 +02:00
Tatiana Llorente
44803b6403
Merge remote-tracking branch 'origin/develop' into ent-3614-Vista-de-Servicios
...
Conflicts:
pandora_console/include/styles/pandora.css
2019-05-30 11:09:15 +02:00
Tatiana Llorente
445cc8aab0
New styles for Services table view - #3614
2019-05-30 10:58:59 +02:00
fbsanchez
48094ffb2e
greater icons
2019-05-29 18:24:45 +02:00
fbsanchez
c2346842c9
ui_toggle revierw
2019-05-29 18:13:21 +02:00
fbsanchez
121ae89b1d
dyn style ui_print_help_tip
2019-05-29 17:34:11 +02:00
fbsanchez
53f6649a57
tip img sty
2019-05-29 16:49:51 +02:00
fbsanchez
e9198af17c
multiple changes
2019-05-29 16:45:53 +02:00
fbsanchez
4f27ae1021
minor style fix
2019-05-29 15:25:35 +02:00
fbsanchez
f58d1bc6ee
Styling review
2019-05-29 15:14:13 +02:00
fbsanchez
72999244c2
pandora_console/operation/agentes/estado_generalagente.php
2019-05-29 13:13:01 +02:00
fbsanchez
505229abe4
minor style change - box
2019-05-29 13:03:58 +02:00
fbsanchez
5131c24772
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 12:24:28 +02:00
fbsanchez
ca083556c3
minor alignment select-multiple
2019-05-29 12:23:54 +02:00
fbsanchez
37af0ad612
Styles
2019-05-29 12:06:05 +02:00
fbsanchez
c8649a8dc4
Styles
2019-05-29 11:21:57 +02:00
fbsanchez
22de7964c2
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-29 08:52:34 +02:00
fbsanchez
d64e2cfb8c
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-28 18:05:33 +02:00
Luis Calvo
58a0ef1bf7
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
2019-05-28 18:03:55 +02:00
fbsanchez
70469c4909
Event list agent view
2019-05-28 18:03:01 +02:00
Luis Calvo
e993dcc3a5
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
2019-05-28 17:37:20 +02:00
fbsanchez
445db7c43b
module list agent view
2019-05-28 16:20:24 +02:00
Tatiana Llorente
d68bb176cf
Merge branch 'develop' into 'ent-4102-Cambios-vista-detalle-de-evento'
...
Conflicts:
pandora_console/include/styles/pandora.css
2019-05-28 15:56:16 +02:00
fbsanchez
348f0c2a65
agent view styling
2019-05-28 13:27:17 +02:00
fbsanchez
2cd19aa0cb
updates styles
2019-05-28 10:47:31 +02:00
fbsanchez
bdd7cc1317
Flex agent view
2019-05-28 09:48:09 +02:00
fbsanchez
f57915285f
review styles agent view
2019-05-27 22:36:55 +02:00
fbsanchez
f1499082fa
agent view rebuilt
2019-05-27 21:30:46 +02:00
fbsanchez
5be124f315
Styles review
2019-05-27 19:00:48 +02:00
Luis Calvo
588d19102f
Resolve merge conflict
2019-05-27 18:30:24 +02:00
fbsanchez
f0fb6d7fd9
wip styles
2019-05-27 18:03:56 +02:00
Tatiana Llorente
2fd37b531e
Visual changes in module graph - #4104
2019-05-27 17:37:57 +02:00
fbsanchez
556c07ad99
Minor changes in configurar_agente
2019-05-27 17:12:35 +02:00
Tatiana Llorente
1eb1120c6e
Rename class events_show_more_table to table_modal_alternate - #4102
2019-05-27 16:18:10 +02:00
fbsanchez
0280547465
some changes
2019-05-27 15:41:23 +02:00
fbsanchez
9eecc414dd
cps changes - switch core touched - test this commit carefully
2019-05-27 14:12:53 +02:00
fbsanchez
7347324601
Minor fixes - discovery styles
2019-05-27 13:19:08 +02:00
Daniel Rodriguez
979f11ca8f
Merge branch 'ent-1668-update-manager' into 'develop'
...
Ent 1668 update manager
See merge request artica/pandorafms!2420
2019-05-22 15:25:49 +02:00
Alejandro Fraguas
ce359bfaf6
Merge branch 'ent-3937-eliminar-echos-y-prints-de-las-subclases-de-wizard' into 'develop'
...
Ent 3937 eliminar echos y prints de las subclases de wizard
See merge request artica/pandorafms!2430
2019-05-21 12:11:53 +02:00
fbsanchez
77fc1abe89
minor style updates and fixes in safe-output
2019-05-20 18:16:21 +02:00
alejandro-campos
a0b7164d9f
lint changes
2019-05-17 14:20:01 +02:00
fbsanchez
d871b599ef
General fixes and UM comm updates
...
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
2019-05-14 23:49:01 +02:00
fbsanchez
6ca07c0914
Merge remote-tracking branch 'origin/develop' into 1668-update-manager
...
Former-commit-id: 33d676ea02d3dfbb3f8c3c23aa8466192516eafb
2019-05-13 17:58:35 +02:00
fbsanchez
ced1b32915
Configuration, Registration and newsletter wizards
...
Former-commit-id: bbd367a10fd01c229c848b15572c4b1d6ccb75cf
2019-05-13 17:55:41 +02:00
Luis Calvo
8c1c337522
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
...
Former-commit-id: 1eac76c75f311a20f402859cf7b9a47b70765f75
2019-05-13 17:36:32 +02:00
Luis Calvo
ce34adb9d8
Fixed errors and corrected style
...
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
2019-05-13 17:28:23 +02:00
Tatiana Llorente
5f2bd0bc8d
Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: f04b28c642afe7fe1251ae966b3964c321b34c29
2019-05-13 13:17:17 +02:00
Tatiana Llorente
a9834dc415
Merge branch 'develop' into 'ent-4004-Estilos-Discovery'
...
Conflicts:
pandora_console/godmode/wizards/HostDevices.class.php
Former-commit-id: de7b4b069e1c5f673b567fcb3271ec867d0fbae1
2019-05-10 09:55:54 +02:00
Tatiana Llorente
f5114918b5
Unify the styles of Discovery with Pandora - #4004
2019-05-09 08:45:55 +02:00
Tatiana Llorente
5e0b53e3c2
New menu module graph - #3617
2019-05-08 09:35:28 +02:00
Tatiana Llorente
283be8f632
New menu module graph - #3617
2019-05-07 16:07:07 +02:00
Tatiana Llorente
9f3c586b55
Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
...
Former-commit-id: b60c4d8c438d79f20cc9dcdfac856bbaf0a4ada5
2019-05-03 13:11:26 +02:00
Tatiana Llorente
7721c0e605
New View Create/Update Agent - #3611
...
Former-commit-id: 5bcb4f0d94a05819e82cd636ef1683fbb4047495
2019-05-03 13:07:58 +02:00
Alejandro Fraguas
194f4400f7
Merge branch 'ent-3647-Revision-estilos-discovery-con-la-nueva-linea-de-estilos' into 'develop'
...
Ent 3647 revision estilos discovery con la nueva linea de estilos
See merge request artica/pandorafms!2370
Former-commit-id: 0f46544f8b05ee464c4dd85301f7a23a4067267a
2019-04-23 17:48:00 +02:00
alejandro-campos
4f6a81dc5b
visual changes to discovery
...
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
2019-04-22 17:46:04 +02:00
fbsanchez
cbdd8e7104
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
...
Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c
2019-04-22 09:01:24 +02:00
Tatiana Llorente
274c78f647
Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: 8beb92aea96f37340434f4a2e5e8012058d52b0a
2019-04-17 10:49:02 +02:00
Tatiana Llorente
ed3155c053
New View Create/Update Agent - #3611
...
Former-commit-id: e8c3576ca06561f5979c0151670115b697533843
2019-04-17 10:35:32 +02:00
Alejandro Fraguas
6594095de7
Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' into 'develop'
...
Ent 3707 nuevo diseño para las tablas
See merge request artica/pandorafms!2352
Former-commit-id: 684daf476bf288e294b67f97fc80fdf6a6ddcce4
2019-04-17 10:19:42 +02:00
Tatiana Llorente
83cda70e0a
Fixed styles of tables within tables with new class - #3707
...
Former-commit-id: 6775b6f96669d33fb2130bfca2448d40d2de0964
2019-04-17 09:34:24 +02:00
Tatiana Llorente
cfff9c065d
New View Create/Update Agent - #3611
...
Former-commit-id: 5a36e41a05341d5afa19917a99f34ac16cfc99e9
2019-04-17 09:27:15 +02:00
fbsanchez
45c9f6d51c
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
...
Former-commit-id: 4c13aa9288330584db108ab04fd9ac096b2714ce
2019-04-12 19:24:27 +02:00
Daniel Barbero Martin
26d5060232
fixed errors css
...
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
2019-04-12 10:10:04 +02:00
Tatiana Llorente
59c2734b5a
Deleted old files. Centered the map. Fixed broken image in meta. - #3806
...
Former-commit-id: 30ebc8e1afeb3401011ee359ecd8626436d85fb7
2019-04-12 09:20:55 +02:00
Tatiana Llorente
187bdb1701
New design for the tables - #3707
...
Former-commit-id: 7781a8b392919f38259aed142f01e786fc82698a
2019-04-11 09:57:07 +02:00
Luis Calvo
5998b30a16
Added css hint to discovery tasks when task list is empty
...
Former-commit-id: 1da71cda1b1ed376bb6bae0281b0dd882dbfbeff
2019-04-10 17:30:35 +02:00
Tatiana Llorente
2a37224653
New design for the tables - #3707
...
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
2019-04-10 10:06:27 +02:00
Tatiana Llorente
3da2f267a2
New design for the tables - #3707
...
Former-commit-id: 6b2550344a7748e210fdb81a26751e9e94cbbfa4
2019-04-05 13:51:35 +02:00
Tatiana Llorente
d91631e0e1
New design for the tables - #3707
...
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
Luis Calvo
9df4cb86dc
Added inline-block and fixed size to label
...
Former-commit-id: 40c1ca6d5c06fb771eb7e8d1ac81dde6e7012cfb
2019-04-04 09:45:29 +02:00
fbsanchez
798a2aad16
WIP discovery F3
...
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
2019-04-03 18:13:19 +02:00
Tatiana Llorente
f497d3bd2e
Added class to action buttons and moved checkbox to the left side
...
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +02:00
Tatiana Llorente
26451c41a1
New design for the tables - #3707
...
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +01:00
Tatiana Llorente
34598f391b
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
2019-03-27 17:05:50 +01:00
Tatiana Llorente
845cb85c55
New design for tables - #3707
...
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
fermin831
b2f046e4d6
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/include/class/ConsoleSupervisor.php
pandora_console/include/class/NetworkMap.class.php
pandora_console/include/styles/pandora.css
pandora_console/operation/menu.php
Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
2019-03-27 12:11:23 +01:00
fbsanchez
ba0ddfb826
style revission
...
Former-commit-id: d223662de64194115cf56264ceda987e732eb79a
2019-03-26 19:29:48 +01:00
alejandro-campos
ec999341ba
change discovery headers and add breadcrumbs to them
...
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
2019-03-26 15:42:33 +01:00
fermin831
a2f5b8502a
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: ad45f5bd3f07d6ef7a6d8d6a291d6a2fd75fda78
2019-03-26 10:11:13 +01:00
fbsanchez
4031ae9bf7
minor update in notification viewer
...
Former-commit-id: 990993ee0c2df7d9fb39a358b94c27b7df968426
2019-03-25 20:23:07 +01:00
fbsanchez
436e60c736
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 49dc95bbeca973fe13b0c82dc205778294c6066f
2019-03-25 20:14:24 +01:00
Daniel Rodriguez
dcf40fed3d
Merge branch 'ent-3610-Vista-Edicion-de-Usuario' into 'develop'
...
Ent 3610 vista edicion de usuario
See merge request artica/pandorafms!2278
Former-commit-id: bf55b5206e79b5747b4215a05569b58ae70a35b0
2019-03-25 18:16:07 +01:00
Tatiana Llorente
c682e5f326
Remove new font in edit user
...
Former-commit-id: dc7da7f1fe9df0abacfb267fb7b5c6773f35df2c
2019-03-25 16:27:25 +01:00
Tatiana Llorente
a841472bff
Changes in header
...
Former-commit-id: 6ef8f7fc6513562e782e7d89dc5a13a4369480c4
2019-03-25 12:50:43 +01:00
Tatiana Llorente
fe7103ba9c
Changes in header
...
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
2019-03-25 12:41:39 +01:00