Matias Didier
|
eba0ce9e80
|
Merge branch 'ent-12624-cambio-estilo-de-ventanas-modales' into 'develop'
Ent 12624 cambio estilo de ventanas modales
See merge request artica/pandorafms!6826
|
2024-01-23 09:44:21 +00:00 |
Daniel Cebrian
|
fadb70d740
|
Merge branch 'develop' into ent-12537-display-de-mensajes-no-tiene-en-cuenta-los-tipos
|
2024-01-19 13:06:37 +01:00 |
Rafael Ameijeiras
|
1f64fb6115
|
Merge branch 'ent-12320-wizard-de-bienvenida-mas-molon-visualmente' into 'develop'
Ent 12320 wizard de bienvenida mas molon visualmente
See merge request artica/pandorafms!6842
|
2024-01-18 11:16:08 +00:00 |
Enrique Martin
|
cca1392000
|
Updated some discovery apps logos
|
2024-01-11 12:01:51 +01:00 |
Pablo Aragon
|
12f6f2e02b
|
12320-Welcome wizard new styles
|
2024-01-11 09:33:51 +01:00 |
Daniel Maya
|
b220cc1eb4
|
#12624 Added close_dialog.svg
|
2024-01-08 16:19:37 +01:00 |
|
Daniel Cebrian
|
22baa45387
|
#12537 new icons for notifications
|
2024-01-03 11:39:15 +01:00 |
Alejandro Campos
|
c700633fce
|
Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
# pandora_console/extras/mr/67.sql
# pandora_console/pandoradb.sql
|
2023-12-18 10:54:27 +00:00 |
Daniel Rodriguez
|
3fe41179e0
|
Merge branch 'ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline' into 'develop'
Ent 12216 entradas fantasma para elementos de discovery offline
See merge request artica/pandorafms!6740
|
2023-12-15 09:22:10 +00:00 |
Jonathan
|
49fd9435dd
|
Merge branch 'develop' into ent-8365-ncm-fase-3
|
2023-12-11 10:13:46 +01:00 |
|
Jonathan
|
78bb8e0bae
|
#8365 ix merge conflict
|
2023-12-07 10:58:45 +01:00 |
|
Alejandro Campos
|
0bdc6978e6
|
Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
# pandora_console/extras/mr/67.sql
# pandora_console/pandoradb.sql
|
2023-12-05 15:30:06 +00:00 |
|
alejandro.campos@artica.es
|
08e514e12c
|
Merge branch 'ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline' of brutus.artica.es:artica/pandorafms into ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline
|
2023-12-05 12:40:50 +01:00 |
|
alejandro.campos@artica.es
|
28d230433a
|
upload image
|
2023-12-05 12:40:21 +01:00 |
|
Enrique Martin
|
1a473d3846
|
Added applications images
|
2023-12-05 12:33:42 +01:00 |
miguel angel rasteu
|
41b92cc55f
|
Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail
|
2023-12-01 10:34:43 +01:00 |
|
Jonathan
|
def169abb8
|
Merge branch 'develop' into ent-8365-ncm-fase-3
|
2023-11-28 07:58:50 +01:00 |
|
alejandro.campos@artica.es
|
a1916dc4b9
|
implement demo data load
|
2023-11-24 12:56:21 +01:00 |
daniel
|
b497e573fe
|
fix modal events sound bottom bar pandora_enterprise#12378
|
2023-11-23 14:18:29 +01:00 |
|
miguel angel rasteu
|
b8574cf689
|
#11494 Resolve conflicts
|
2023-11-23 08:24:15 +01: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 Maya
|
287b983ce9
|
#12371 Fixed events
|
2023-11-02 15:39:55 +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
|
f00ac9ea89
|
#8365 added donut icon in svg
|
2023-10-26 12:19:42 +02:00 |
Calvo
|
715f6abc69
|
Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine
|
2023-10-24 14:02:36 +02:00 |
|
Daniel Cebrian
|
490e39c2d8
|
Merge branch 'develop' into ent-11126-vulnerability-scanner-interface
|
2023-10-24 13:43:31 +02:00 |
|
Daniel Rodriguez
|
1f8554e8d1
|
Merge branch 'ent-11914-editor-de-alertas-de-logs' into 'develop'
Ent 11914 editor de alertas de logs
See merge request artica/pandorafms!6505
|
2023-10-23 12:34:32 +00:00 |
|
Calvo
|
1ef42182a7
|
Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine
|
2023-10-20 10:46:34 +02:00 |
|
Daniel Cebrian
|
d54a6faede
|
#10194 adjust bars 24 hrs in events and changed numbers
|
2023-10-16 20:47:47 +02:00 |
|
Daniel Cebrian
|
9237e4038a
|
Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion
|
2023-10-16 17:10:33 +02:00 |
|
Daniel Cebrian
|
2a4f8ce646
|
Merge branch 'develop' into ent-11126-vulnerability-scanner-interface
|
2023-10-16 16:56:29 +02:00 |
|
Calvo
|
16cecdf82b
|
Fix image names
|
2023-10-16 16:39:01 +02:00 |
|
Calvo
|
98003c81f9
|
Added MADE server and icons to server list
|
2023-10-16 16:32:35 +02:00 |
|
Daniel Cebrian
|
533201197a
|
#11126 new view vulnerabilities scanner
|
2023-10-13 12:25:25 +02:00 |
|
Daniel Maya
|
ddc29e9bb9
|
#11914 Added icon
|
2023-10-13 09:40:28 +02:00 |
|
miguel angel rasteu
|
5060398661
|
#11206 Fix conflict
|
2023-10-13 09:00:03 +02:00 |
|
Daniel Cebrian
|
9b675868b9
|
Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion
|
2023-10-09 16:43:25 +02:00 |
|
Alejandro Campos
|
0f381b0db7
|
Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada'
# Conflicts:
# pandora_console/extras/mr/66.sql
|
2023-10-03 13:11:09 +00:00 |
|
Daniel Cebrian
|
b8df74dace
|
Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion
|
2023-09-28 16:22:58 +02:00 |
|
Daniel Cebrian
|
9f5836e2cc
|
#10194 new sections in general tactical view
|
2023-09-28 16:10:57 +02:00 |
|
Daniel Rodriguez
|
05cd8142bf
|
Merge branch 'ent-11471-integracion-pandora-integria' into 'develop'
wip integration integriaIMS pandora_enterprise#11471
Closes pandora_enterprise#11471
See merge request artica/pandorafms!6131
|
2023-09-28 10:05:15 +00:00 |
|
daniel
|
91393c9e39
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/include/styles/pandora.css
|
2023-09-25 17:06:08 +02:00 |
|
Daniel Cebrian
|
7c201d2855
|
#10194 new structure for general tactical view
|
2023-09-21 17:58:18 +02:00 |
|
alejandro.campos@artica.es
|
ae74caf7b1
|
Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada
|
2023-09-20 15:52:56 +02:00 |
|
Daniel Cebrian
|
940447d2b0
|
#12050 new icon security hardening widget
|
2023-09-19 16:43:55 +02:00 |
|
Daniel Cebrian
|
b85d622d51
|
Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas
|
2023-09-18 16:52:57 +02:00 |
|
miguel angel rasteu
|
0140183ae4
|
#11494 Fix service level function and add widget icon
|
2023-09-13 10:15:34 +02:00 |
|
Pablo Aragon
|
959a2e9110
|
11806-Add alert icon in Manage agent
|
2023-09-13 08:14:11 +02:00 |
|
daniel
|
ce0468b37e
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/include/functions_menu.php
|
2023-09-08 13:11:52 +02:00 |
|
alejandro.campos@artica.es
|
318fa38721
|
Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada
|
2023-09-07 17:44:51 +02:00 |