Jonathan
|
0dcced8b53
|
#12695 wip removing warnings
|
2024-02-12 17:59:27 +01:00 |
|
Jonathan
|
5f00166b74
|
#12847 remove entities title and name
|
2024-02-05 16:52:12 +01:00 |
Daniel Rodriguez
|
3db0090c0e
|
Merge branch 'ent-12351-16497-Mejoras-Ampliacion-de-los-informes-monitorizacion-Netflow-Top-N-Connection' into 'develop'
implement several changes in top-n connection report item
See merge request artica/pandorafms!6833
|
2024-01-29 11:14:58 +00:00 |
Rafael Ameijeiras
|
e19f520eb0
|
Merge branch 'ent-12522-mejoras-en-audit-log' into 'develop'
Ent 12522 Mejoras en audit log
See merge request artica/pandorafms!6816
|
2024-01-25 14:00:56 +00:00 |
|
Rafael Ameijeiras
|
23c63e2c3f
|
Merge branch 'ent-12674-selectores-sin-accion-en-custom-graphs' into 'develop'
Ent 12674 selectores sin accion en custom graphs
See merge request artica/pandorafms!6798
|
2024-01-19 08:21:43 +00:00 |
|
Rafael Ameijeiras
|
d98c264640
|
Merge branch 'ent-11900-16100-contador-de-items-en-distintas-vistas' into 'develop'
Ent 11900 16100 contador de items en distintas vistas
See merge request artica/pandorafms!6792
|
2024-01-18 12:53:43 +00:00 |
Daniel Cebrian
|
7d1e06ce30
|
#12571 resolve conflics
|
2024-01-18 10:39:07 +01:00 |
alejandro.campos@artica.es
|
9a7ef16f9c
|
implement several changes in top-n connection report item
|
2024-01-08 17:31:52 +01:00 |
|
Daniel Cebrian
|
05ec992fac
|
#12522 enhanced audit log
|
2023-12-27 16:05:34 +01:00 |
|
Jonathan
|
87cfc51793
|
#12674 fix sort custom reports
|
2023-12-20 17:19:18 +01:00 |
|
Jonathan
|
d68daca985
|
#11900 counter items
|
2023-12-19 16:50:36 +01:00 |
daniel
|
855fc32a7d
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
pandora_console/include/javascript/pandora.js
pandora_console/include/styles/pandora.css
|
2023-12-19 09:39:24 +01:00 |
|
daniel
|
ae43f8a948
|
fix rerors selectors pandora_enterprise#12665
|
2023-12-18 16:29:56 +01:00 |
|
Daniel Cebrian
|
8df792f11b
|
#12571 custom graphs refactored
|
2023-12-15 10:41:21 +01:00 |
|
daniel
|
2890fd3dab
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
pandora_console/include/styles/pandora.css
|
2023-12-14 11:05:29 +01:00 |
|
Jonathan
|
53b56b31af
|
Merge branch 'develop' into ent-8365-ncm-fase-3
|
2023-12-14 08:38:52 +01:00 |
|
Jonathan
|
5fa9cd5877
|
Merge branches 'develop' and 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3
|
2023-12-13 11:19:32 +01:00 |
|
daniel
|
cc12c77008
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
pandora_console/include/styles/pandora.css
|
2023-12-13 10:39:48 +01:00 |
miguel angel rasteu
|
fec7bf8b90
|
Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed
|
2023-12-12 09:45:36 +01:00 |
|
miguel angel rasteu
|
94256559f1
|
#11495 Fix agent name in metaconsole module selector
|
2023-12-11 16:46:19 +01:00 |
|
Rafael Ameijeiras
|
8b0d96bab7
|
Merge branch 'ent-12606-no-deja-editar-tiempo-en-reportes-sla' into 'develop'
Ent 12606 no deja editar tiempo en reportes sla
See merge request artica/pandorafms!6744
|
2023-12-11 14:23:53 +00:00 |
|
miguel angel rasteu
|
3a00ba0fd6
|
Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed
|
2023-12-11 12:41:37 +01:00 |
Diego Muñoz-Reja
|
5c0435d226
|
Merge branch 'ent-11846-rehacer-vista-list-of-elements-consolas-visuales-relacionado-con-11835' into 'develop'
Ent 11846 rehacer vista list of elements consolas visuales relacionado con 11835
See merge request artica/pandorafms!6563
|
2023-12-11 10:34:10 +00:00 |
|
miguel angel rasteu
|
8e69326e3c
|
Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed
|
2023-12-11 08:43:37 +01:00 |
Daniel Maya
|
b99b0d4708
|
#12606 Fixed period
|
2023-12-07 12:49:20 +01:00 |
|
Jonathan
|
78bb8e0bae
|
#8365 ix merge conflict
|
2023-12-07 10:58:45 +01:00 |
|
daniel
|
77cf0ce6ca
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
pandora_console/include/styles/pandora.css
|
2023-12-05 08:02:55 +01:00 |
|
miguel angel rasteu
|
0ef4685569
|
#12123 Resolve conflicts
|
2023-12-01 09:35:50 +01:00 |
|
Jonathan
|
837f1ff73c
|
Merge branch 'develop' into ent-8365-ncm-fase-3
|
2023-11-28 13:04:13 +01:00 |
|
Rafael Ameijeiras
|
8b6a4733cf
|
Merge branch 'ent-12253-informe-de-vulnerabilidades' into 'develop'
Ent 12253 Informe de vulnerabilidades
See merge request artica/pandorafms!6686
|
2023-11-28 11:14:48 +00:00 |
|
daniel
|
f6f0f15731
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
pandora_console/include/graphs/fgraph.php
pandora_console/include/lib/Dashboard/Widgets/single_graph.php
pandora_console/include/styles/pandora.css
|
2023-11-28 08:29:10 +01:00 |
Matias Didier
|
4dc84d58e3
|
Merge branch 'ent-12023-en-create-custom-report-al-seleccionar-write-access-no-aparece-lista-de-grupo' into 'develop'
Ent 12023 en create custom report al seleccionar write access no aparece lista de grupo
See merge request artica/pandorafms!6460
|
2023-11-28 07:12:51 +00:00 |
|
Jonathan
|
def169abb8
|
Merge branch 'develop' into ent-8365-ncm-fase-3
|
2023-11-28 07:58:50 +01:00 |
|
Rafael Ameijeiras
|
5825a95eae
|
Merge branch 'ent-11855-bug-custom-graphs-el-icono-graph-container-desaparece' into 'develop'
Ent 11855 bug custom graphs el icono graph container desaparece
See merge request artica/pandorafms!6428
|
2023-11-27 14:47:55 +00:00 |
|
Daniel Cebrian
|
27d78ef049
|
Merge branch 'develop' into ent-12253-informe-de-vulnerabilidades
|
2023-11-27 13:29:05 +01:00 |
|
Daniel Cebrian
|
7cd163b01e
|
#12253 new reports
|
2023-11-27 13:25:52 +01:00 |
|
Rafael Ameijeiras
|
7b4423148e
|
Merge branch 'ent-11655-fe-de-erratas-en-idioma-ingles-por-consola-web' into 'develop'
Ent 11655 fe de erratas en idioma ingles por consola web
See merge request artica/pandorafms!6416
|
2023-11-27 11:53:17 +00:00 |
|
Rafael Ameijeiras
|
e5df1a5285
|
Merge branch 'ent-12122-CVE-2023-44088-SQL-Injection-en-Consola-Visual' into 'develop'
Ent 12122 cve 2023 44088 sql injection en consola visual
See merge request artica/pandorafms!6525
|
2023-11-27 10:26:30 +00:00 |
Jorge Rincon
|
2c0a88f7da
|
Merge branch 'develop' into ent-11691-15801-feature-token-para-ignorar-desconocidos-en-grafica-simple
|
2023-11-27 09:14:04 +01:00 |
|
miguel angel rasteu
|
1b09f61aab
|
#11495 Resolve conflict
|
2023-11-23 09:31:04 +01:00 |
|
Daniel Cebrian
|
8350bdcec8
|
#12253 fixed input order
|
2023-11-22 16:41:20 +01:00 |
|
Daniel Cebrian
|
5996af094e
|
Merge branch 'ent-12250-informe-detallado-de-seguridad' into ent-12253-informe-de-vulnerabilidades
|
2023-11-22 16:36:57 +01:00 |
|
Daniel Cebrian
|
d0185c7a10
|
#12250 unified fields selects
|
2023-11-22 16:36:32 +01:00 |
|
Daniel Cebrian
|
7d962bc494
|
Merge branch 'ent-12250-informe-detallado-de-seguridad' into ent-12253-informe-de-vulnerabilidades
|
2023-11-22 16:33:26 +01:00 |
|
Daniel Cebrian
|
47420e06c4
|
#12250 fixed order all in select
|
2023-11-22 16:31:51 +01:00 |
|
Daniel Cebrian
|
4c673ea530
|
#12253 report vulnerabilibies agent
|
2023-11-22 08:58:47 +01:00 |
|
Daniel Cebrian
|
bb9cd81244
|
#12253 added reports vulnerabilities
|
2023-11-21 10:31:06 +01:00 |
|
Daniel Cebrian
|
5104d706f6
|
Merge branch 'ent-12250-informe-detallado-de-seguridad' into ent-12253-informe-de-vulnerabilidades
|
2023-11-20 12:23:08 +01:00 |
|
Daniel Maya
|
de905b2e95
|
#12453 Fixed interval 4
|
2023-11-16 12:47:33 +01:00 |
|
Daniel Maya
|
7219471ff8
|
#12453 Fixed interval 3
|
2023-11-15 16:10:00 +01:00 |