marcos
|
18a3a747bd
|
add wiki url alerts correlation
|
2020-01-22 12:24:15 +01:00 |
|
Alejandro Campos
|
e7769b8bf4
|
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
# pandora_console/extras/mr/35.sql
|
2020-01-20 12:00:42 +01:00 |
|
Daniel Rodriguez
|
96eebe4310
|
Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' into 'develop'
Added port option on server configuration to be used when connecting to execution server
See merge request artica/pandorafms!3012
|
2020-01-17 14:40:58 +01:00 |
|
Tatiana Llorente
|
0980c9a74a
|
Ent 5261 cambio de control de intervalo en alertas
|
2020-01-16 13:50:39 +01:00 |
|
alejandro-campos
|
d9062def99
|
Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' of https://brutus.artica.es:8081/artica/pandorafms into ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024
|
2020-01-15 16:01:11 +01:00 |
|
alejandro-campos
|
3f26f2ef6f
|
fix bug when deleting custom units and changed default value for byte multiplier
|
2020-01-15 16:00:33 +01:00 |
|
alejandro-campos
|
5eb2953810
|
Added port option on server configuration to be used when connecting to execution server
|
2020-01-14 15:43:17 +01:00 |
|
Alejandro Campos
|
0468c85a4d
|
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
# pandora_console/godmode/setup/setup_visuals.php
|
2020-01-07 12:00:27 +01:00 |
|
daniel
|
3e58746cd5
|
Fixed errors PDF images relative routes
|
2019-12-17 18:18:00 +01:00 |
|
Daniel Barbero
|
a203da5a26
|
Fixed errors
|
2019-12-13 16:01:24 +01:00 |
|
daniel
|
3dbdfdb6eb
|
Fix Landscape reports
|
2019-12-11 15:07:38 +01:00 |
|
alejandro-campos
|
5880bec88a
|
changes in module data formatting when printed across the application and new setup options
|
2019-12-05 17:41:44 +01:00 |
|
daniel
|
960326b980
|
Add menu omnishell
|
2019-11-21 18:21:46 +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 |
|
alejandro-campos
|
a06f56a413
|
added function to convert cidr prefixes to mask
|
2019-10-23 17:22:18 +02:00 |
|
Daniel Barbero Martin
|
4e56f6751a
|
Continue work diagnostics
|
2019-10-17 15:17:28 +02:00 |
|
Daniel Rodriguez
|
c9cfbf0bf2
|
Merge branch 'ent-4461-Configuracion-integracion-integria' into 'develop'
Ent 4461 configuracion integracion integria
See merge request artica/pandorafms!2732
|
2019-09-26 14:34:50 +02:00 |
|
alejandro-campos
|
f73cd80336
|
minor changes in integria integration
|
2019-09-23 15:16:31 +02:00 |
|
alejandro-campos
|
9bf2980f01
|
fix minor bugs in integria integration
|
2019-09-23 12:48:20 +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
|
8acdde9f3a
|
Added date filter - #4642
|
2019-09-18 18:19:29 +02:00 |
|
Tatiana Llorente
|
eb271a93eb
|
Added button for export to csv - #4642
|
2019-09-18 15:32:36 +02:00 |
|
Daniel Barbero Martin
|
84d1979c9e
|
fixed error percentil label
|
2019-09-18 11:15:55 +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 |
|
Tatiana Llorente
|
ca6fe42298
|
Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria
|
2019-09-13 12:00:04 +02:00 |
|
alejandro-campos
|
11cb53582c
|
backup changes
|
2019-09-02 17:01:41 +02:00 |
|
Daniel Rodriguez
|
c46686981e
|
Merge branch 'ent-4547-Entities-extrañas-en-el-CSV-del-Review-Logs' into 'develop'
modified function to export audit csv to decode entities as separator
See merge request artica/pandorafms!2692
|
2019-08-30 14:29:44 +02:00 |
|
alejandro-campos
|
f423ddc42f
|
modified function to export audit csv to decode entities as separator
|
2019-08-30 09:42:58 +02:00 |
|
Alejandro Fraguas
|
fadccf0ff3
|
Merge branch 'ent-4509-AADCM-MCM-8206-Bug-en-consola-visual-link-a-consola-visual-publica' into 'develop'
Fixed bug in public visual console view
See merge request artica/pandorafms!2672
|
2019-08-26 13:12:31 +02:00 |
|
manuel
|
e439e7349f
|
Fixed bug in public visual console view
|
2019-08-21 09:22:13 +02:00 |
|
Jose Gonzalez
|
5ab2bfacbd
|
Modified date formatting to avoid entities
|
2019-07-25 15:43:46 +02:00 |
|
Jose Gonzalez
|
5cdfb871a1
|
Modified the divider in print_audit_csv function
|
2019-07-25 15:35:57 +02:00 |
|
Daniel Barbero Martin
|
7fa95d3e43
|
PHP-FPM
|
2019-07-17 17:20:09 +02:00 |
|
fbsanchez
|
fc0d9463d5
|
Fixed
|
2019-06-25 12:07:56 +02:00 |
|
Daniel Rodriguez
|
265202f1ed
|
Merge branch 'ent-4136-button-styles' into 'develop'
Review 1
See merge request artica/pandorafms!2470
|
2019-06-20 16:35:12 +02:00 |
|
fbsanchez
|
4424189632
|
Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor
|
2019-06-19 10:51:34 +02:00 |
|
fbsanchez
|
24025ebb74
|
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
|
2019-06-18 17:48:03 +02:00 |
|
fbsanchez
|
419a90d69c
|
wip event list
|
2019-06-07 17:35:13 +02:00 |
|
Daniel Maya
|
419b3f4fb1
|
Fixed module_manager with Agent limit surpassed or license expired
|
2019-06-03 10:47:54 +02:00 |
|
fbsanchez
|
eb5ee75d33
|
Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor
|
2019-06-03 09:18:49 +02:00 |
|
fbsanchez
|
94153b823f
|
Help links
|
2019-05-30 11:25:09 +02:00 |
|
fbsanchez
|
9eecc414dd
|
cps changes - switch core touched - test this commit carefully
|
2019-05-27 14:12:53 +02:00 |
|
fbsanchez
|
4fe7680694
|
Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor
|
2019-05-22 15:33:13 +02:00 |
|
fbsanchez
|
bd88cbd42d
|
1st approach simplifying MC management
|
2019-05-22 15:31:59 +02:00 |
|
manuel
|
ada49966e0
|
Merge branch 'develop' into ent-3468-Ayudas_online
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
|
2019-05-21 10:05:06 +02:00 |
|
Alejandro Fraguas
|
3548070ec1
|
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' into 'develop'
Add new message to News board
See merge request artica/pandorafms!2415
Former-commit-id: b0adfc73ac247cda59dea01e83429e06ba5747ee
|
2019-05-14 17:56:43 +02:00 |
|
marcos.alconada
|
35c7ea1f48
|
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4020-cambiar-mensaje-de-bienvenida-tnews
Former-commit-id: 3c10d8ecea2a6fdb44a6003d45ccf146972a92e1
|
2019-05-14 17:14:02 +02:00 |
|
marcos.alconada
|
bc849c16fb
|
Only one image for welcome new board
Former-commit-id: a8effda6019c394a9a2d15fbf4998490867b3b02
|
2019-05-14 17:13:44 +02:00 |
|