1089 Commits

Author SHA1 Message Date
Rafael Ameijeiras
06a3fa3f27 Merge branch 'ent-12636-error-con-los-iconos-y-cabecera-de-sistemas-operativos' into 'develop'
Ent 12636 error con los iconos y cabecera de sistemas operativos

See merge request artica/pandorafms!6872
2024-02-08 14:50:49 +00:00
Jonathan
2246fd8049 #12695 WIP warnings 2024-02-07 16:39:33 +01:00
Jonathan
3ea38c0455 #12621 dialog tips css 2024-02-05 08:43:26 +01:00
Jonathan
4c617acefc #12621 dialog tips on click 2024-02-02 13:43:04 +01:00
Daniel Cebrian
5b7a123086 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 13:21:44 +01:00
alejandro.campos@artica.es
2ba5dd767d visual changes in demo view 2024-01-26 12:41:32 +01:00
daniel
65385f36c1 fix visual errors in widgets dashboard pandora_enterprise#12267 2024-01-26 09:18:47 +01:00
Jonathan
a747308b26 #12636 fix errors 2024-01-22 16:21:51 +01:00
Daniel Cebrian
d504267460 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-22 15:18:01 +01:00
Daniel Cebrian
bb2d908de7 #12460 fixed deprecated log 2024-01-17 12:25:57 +01:00
Jonathan
8a9fbbac8b #12515 event title ... over 300 characters 2023-12-18 16:32:39 +01:00
Daniel Cebrian
1a9bdf97d1 #12566 changes in view events 2023-12-11 17:01:40 +01:00
Daniel Cebrian
7f4dc4fbe4 #12460 fixed log deprecated 2023-12-11 09:18:40 +01:00
Daniel Cebrian
ea474ecd89 #12566 changes in events table 2023-12-04 15:05:01 +01:00
Daniel Rodriguez
a7abf4add7 Merge branch 'ent-12382-16531-permitir-cambiar-la-url-del-pdf-para-que-el-chromium-pueda-acceder-a-ella' into 'develop'
fix chart_generator pdf pandora_enterprise#12382

See merge request artica/pandorafms!6679
2023-12-04 13:38:18 +00:00
Rafael Ameijeiras
67700a1ea2 Merge branch 'ent-12083-open-inventory-widget-no-carga' into 'develop'
Ent 12083 open inventory widget no carga

See merge request artica/pandorafms!6506
2023-11-27 14:46:47 +00:00
Rafael Ameijeiras
c3af86414f Merge branch 'ent-11650-aviso-emergente-no-acorde-con-la-nueva-interfaz' into 'develop'
Ent 11650 aviso emergente no acorde con la nueva interfaz

See merge request artica/pandorafms!6395
2023-11-27 11:56:57 +00:00
daniel
0f9facb999 fix chart_generator pdf pandora_enterprise#12382 2023-11-16 13:17:25 +01:00
Daniel Cebrian
e38246521d #12251 added info in security in agent contact 2023-11-14 09:33:04 +01:00
Daniel Cebrian
dc714a5b9f #12249 column secmon 2023-11-13 15:27:07 +01:00
Daniel Cebrian
b100d34985 #12249 new view vulnerabilities agent 2023-11-13 09:38:24 +01:00
miguel angel rasteu
0f32550f21 #11650 Fix conflict 2023-10-30 08:35:34 +01:00
Daniel Rodriguez
9aee38aa0b Merge branch 'ent-11391-pandora-indexer-cambios-en-el-collector-de-logs' into 'develop'
#11391 Fixed ace editor and log viewer

See merge request artica/pandorafms!6461
2023-10-23 07:19:51 +00:00
miguel angel rasteu
35cd554257 #12207 Fix status discovery task 2023-10-16 15:47:48 +02:00
Daniel Maya
528c5a726a Merge branch 'develop' into ent-11391-pandora-indexer-cambios-en-el-collector-de-logs 2023-10-02 10:27:14 +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
miguel angel rasteu
0d197e449e #12083 Fix inventory widget 2023-09-27 11:53:05 +02:00
Rafael Ameijeiras
03700d2653 Merge branch 'ent-12032-refactoring-visual-de-la-vista-de-clusters' into 'develop'
refactor cluster view pandora_enterprise#12032

See merge request artica/pandorafms!6476
2023-09-26 15:15:27 +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
Diego Muñoz-Reja
576ee1bf37 Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into 'develop'
Ent 11965 Security hardening: Console - Vistas estaticas

See merge request artica/pandorafms!6370
2023-09-21 14:57:06 +00:00
daniel
f46626e120 refactor cluster view pandora_enterprise#12032 2023-09-21 10:21:45 +02:00
miguel angel rasteu
6609571482 #12089 Add nowrap class to timestamp 2023-09-19 17:21:44 +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
Rafael Ameijeiras
b568085841 Merge branch 'ent-12035-la-edicion-de-alertas-no-deberia-ser-posible-en-la-vista-de-agentes' into 'develop'
not show edition buttons of alert detail pandora_enterprise#12035

See merge request artica/pandorafms!6444
2023-09-18 07:22:13 +00:00
daniel
af968b5e13 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-14 08:08:05 +02:00
Daniel Maya
a0dcdb88b0 #11391 Fixed ace editor and log viewer 2023-09-13 15:19:42 +02:00
miguel angel rasteu
91aee79ab2 #12037 Resolve conflicts 2023-09-12 15:07:00 +02:00
daniel
802f0bf83b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-12 12:37:31 +02:00
daniel
16f1d80919 not show edition buttons of alert detail pandora_enterprise#12035 2023-09-12 12:30:52 +02:00
Daniel Cebrian
1cd5d1b0fa #11965 new view hardening 2023-09-12 10:45:23 +02:00
miguel angel rasteu
55fa824792 #12037 Fix size of agent text and event text 2023-09-11 11:41:30 +02:00
miguel angel rasteu
99f92b9bec #10676 Fix truncate text 2023-09-11 10:09:34 +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
miguel angel rasteu
9cdc7273a6 #10676 increase chars in agents name in monitor view and truncate at the end 2023-09-08 10:42:40 +02:00
Pablo Aragon
87c02fd0a7 11801-Resolve conflict 2023-09-07 11:08:31 +02:00
daniel
fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
Rafael Ameijeiras
f2b99cf38e Merge branch 'ent-10639-unificacion-de-controles-de-fecha' into 'develop'
Ent 10639 unificacion de controles de fecha

See merge request artica/pandorafms!6212
2023-09-05 07:50:45 +00:00
daniel
1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/66.sql
2023-09-04 08:16:48 +02:00
miguel angel rasteu
083043eaba #11650 Change style for tooltip 2023-09-01 14:06:48 +02:00
Gorka Sanchez
7dcb38f382 Merge branch 'ent-11821-error-sql-en-vista-de-eventos-al-agregar-columna-de-comentarios' into 'develop'
Ent 11821 error sql en vista de eventos al agregar columna de comentarios

See merge request artica/pandorafms!6359
2023-09-01 09:24:10 +00:00