Daniel Maya
|
7390336da0
|
#12697 Fixed search
|
2023-12-22 12:55:21 +01:00 |
daniel
|
e07f66885d
|
Merge remote-tracking branch 'origin/develop' into ent-12067-huevo-de-pascua-piensa-en-verde
Conflicts:
pandora_console/index.php
|
2023-12-19 14:56:04 +01:00 |
|
daniel
|
8aeee6d876
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
|
2023-12-18 11:15:18 +01:00 |
|
Daniel Maya
|
971db37147
|
#12649 remove trace
|
2023-12-15 10:19:52 +01:00 |
|
daniel
|
70dd1719db
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
|
2023-12-15 09:13:07 +01:00 |
Diego Muñoz-Reja
|
b545cfec23
|
Merge branch 'ent-11802-giss-y-entornos-pesados-optimizar-la-query-de-la-seccion-vista-de-alertas-y-vista-de-monitores' into 'develop'
Optimiized monitors view
See merge request artica/pandorafms!6627
|
2023-12-15 07:18:13 +00: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
|
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 |
|
Jonathan
|
5279bb3e17
|
Merge branch 'develop' into ent-12296-mejorar-aspecto-filtros-de-busqueda-en-la-vista-principal-de-agentes
|
2023-12-13 08:24:43 +01:00 |
Rafael Ameijeiras
|
d072187a2c
|
Merge branch 'ent-12605-vista-de-agentes-error-500-en-develop' into 'develop'
fix error 500 and warnings pandora_enterprise#12605
See merge request artica/pandorafms!6738
|
2023-12-11 14:27:39 +00:00 |
|
daniel
|
a418673489
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
|
2023-12-11 11:09:54 +01:00 |
|
Jonathan
|
49fd9435dd
|
Merge branch 'develop' into ent-8365-ncm-fase-3
|
2023-12-11 10:13:46 +01:00 |
|
Rafael Ameijeiras
|
1e2f573a3b
|
Merge branch 'ent-12385-filtro-de-grupo-al-anadir-nodos-a-un-mapa-de-red-vacio-no-funciona' into 'develop'
Ent 12385 filtro de grupo al anadir nodos a un mapa de red vacio no funciona
See merge request artica/pandorafms!6673
|
2023-12-11 08:28:56 +00:00 |
|
Jonathan
|
78bb8e0bae
|
#8365 ix merge conflict
|
2023-12-07 10:58:45 +01:00 |
|
daniel
|
1d36d8a436
|
fix error 500 and warnings pandora_enterprise#12605
|
2023-12-05 09:14:02 +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 |
|
Jonathan
|
1fb98d34ae
|
#12296 fix conflict merge develop
|
2023-12-01 11:59:03 +01:00 |
miguel angel rasteu
|
5ee6eb7306
|
#12052 Resolve conflicts
|
2023-12-01 10:19:39 +01:00 |
|
Jonathan
|
b99c9240de
|
#8365 NCM Merge conflict
|
2023-11-30 08:32:15 +01:00 |
|
Rafael Ameijeiras
|
60d9fffe22
|
Merge branch 'ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente' into 'develop'
Ent 12137 propuesta de refactoring visual de vista ppal de agente
See merge request artica/pandorafms!6520
|
2023-11-29 14:26:53 +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 |
|
Jonathan
|
def169abb8
|
Merge branch 'develop' into ent-8365-ncm-fase-3
|
2023-11-28 07:58:50 +01:00 |
|
Rafael Ameijeiras
|
4ac9316391
|
Merge branch 'ent-12079-no-se-aplican-los-filtros-por-defecto-al-hacer-clic-en-el-numero-de-alertas' into 'develop'
Ent 12079 no se aplican los filtros por defecto al hacer clic en el numero de alertas
See merge request artica/pandorafms!6475
|
2023-11-27 14:51:02 +00:00 |
|
miguel angel rasteu
|
cac31cc482
|
#12137 Resolve conflicts
|
2023-11-27 13:05:43 +01:00 |
Matias Didier
|
c7d28b9a77
|
Merge branch 'ent-12356-botones-de-paginacion-de-la-vista-de-interfaces-duplicados' into 'develop'
Fix pagination interfaces pandora_enterprise#12356
See merge request artica/pandorafms!6626
|
2023-11-27 11:38:19 +00:00 |
|
miguel angel rasteu
|
b0125d943e
|
#12138 Resolve conflict
|
2023-11-27 11:51:00 +01:00 |
|
Rafael Ameijeiras
|
5d94be5e7f
|
Merge branch 'ent-12134-contador-de-agentes-modulos-en-las-vistas' into 'develop'
Ent 12134 contador de agentes modulos en las vistas
See merge request artica/pandorafms!6566
|
2023-11-27 10:42:01 +00:00 |
|
miguel angel rasteu
|
262affeb74
|
Merge branch 'develop' into ent-12138-eliminar-agent-access-graph
|
2023-11-27 08:18:35 +01:00 |
Jorge Rincon
|
b4e07c8ce7
|
#12067 Added easter egg, think green
|
2023-11-23 17:31:11 +01:00 |
|
miguel angel rasteu
|
99c5da677d
|
#12137 Fix entities
|
2023-11-16 08:37:41 +01:00 |
|
miguel angel rasteu
|
8b9d52646c
|
Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente
|
2023-11-16 08:06:20 +01:00 |
|
Daniel Maya
|
804970719d
|
#12385 Fixed group
|
2023-11-15 16:32:02 +01:00 |
|
Daniel Maya
|
6059f4dea0
|
#12453 Changed string
|
2023-11-15 13:10:19 +01:00 |
|
Jonathan
|
4fec6a1ccb
|
#12296 restyling agent detail filters
|
2023-11-14 17:04:31 +01:00 |
Daniel Rodriguez
|
7fdca7aa12
|
Merge branch 'ent-11125-pandora-security-monitoring-vulnerability-scanner' into 'develop'
Add support for inventory vulnerability scans.
See merge request artica/pandorafms!6487
|
2023-11-13 08:24:48 +00:00 |
Ramon Novoa
|
8ec1432414
|
Merge remote-tracking branch 'origin/develop' into ent-11125-pandora-security-monitoring-vulnerability-scanner
|
2023-11-10 09:53:17 +01:00 |
|
daniel
|
9ccb6a98c6
|
fix alert details pandora_enterprise#12423
|
2023-11-08 12:49:45 +01:00 |
|
daniel
|
c81b42cc95
|
Remove filter group for alert pandora_enterprise#12423
|
2023-11-07 16:17:13 +01:00 |
Calvo
|
92ee718f91
|
Optimiized monitors view
|
2023-11-03 17:48:15 +01:00 |
|
daniel
|
84d450e35e
|
Fix pagination interfaces pandora_enterprise#12356
|
2023-11-03 13:10:09 +01:00 |
|
miguel angel rasteu
|
88f1b964e3
|
Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente
|
2023-11-02 15:22:57 +01:00 |
|
miguel angel rasteu
|
3822ffc0f0
|
#12137 Fix agent view
|
2023-11-02 15:22:49 +01:00 |
|
miguel angel rasteu
|
47aeb3cc39
|
#12137 Fix Description
|
2023-11-02 13:22:42 +01:00 |
|
Daniel Maya
|
4c368e5da5
|
#12344 Fixed filter 3
|
2023-11-02 12:33:30 +01:00 |
|
Daniel Maya
|
ed1ae83770
|
#12344 Fixed log source
|
2023-10-30 15:15:53 +01:00 |
|
Jonathan
|
c01af3e9b6
|
Merge branch 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3
|
2023-10-30 08:37:37 +01:00 |
|
Jorge Rincon
|
407a505a3e
|
#8365 Added reports for ncm backups.
|
2023-10-27 14:32:48 +02:00 |
|
daniel
|
04a8717aed
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
pandora_console/include/lib/Dashboard/Widgets/single_graph.php
|
2023-10-25 15:58:10 +02:00 |
|
daniel
|
868700f9f1
|
add sliced mode simple graph reports and CV pandora_enterprise#9640
|
2023-10-25 15:55:54 +02:00 |