2411 Commits

Author SHA1 Message Date
miguel angel rasteu
5060398661 #11206 Fix conflict 2023-10-13 09:00:03 +02:00
Rafael Ameijeiras
e1d8f862ae Merge branch 'ent-12166-estilos-calendarios' into 'develop'
Ent 12166 estilos calendarios

See merge request artica/pandorafms!6529
2023-10-06 07:32:11 +00:00
Jorge Rincon
80807ae085 #12166 fixed style of selected item in calendar 2023-10-04 16:46:43 +02:00
Daniel Maya
ae0bb2022d #12029 Fixed font size 2023-10-04 15:42:19 +02:00
Jorge Rincon
a685a04493 #12166 fixed calendar button and border styles 2023-10-03 15:42: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
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
Rafael Ameijeiras
60c3bb456a Merge branch 'ent-12099-cabecera-de-filtros-descuadrada-en-informes-vista-html' into 'develop'
Ent 12099 cabecera de filtros descuadrada en informes vista html

See merge request artica/pandorafms!6480
2023-09-25 11:22:08 +00:00
miguel angel rasteu
4b999b79d3 #12099 Fix filter position 2023-09-25 10:57:46 +02:00
miguel angel rasteu
9a5a1f02bf #12099 Fix filter position 2023-09-25 09:55:55 +02:00
Rafael Ameijeiras
56cb2c3232 Merge branch 'ent-12060-quitar-subrayado-curvo-en-las-pestanas-de-eventos' into 'develop'
Ent 12060 quitar subrayado curvo en las pestanas de eventos

See merge request artica/pandorafms!6453
2023-09-21 15:45:50 +00:00
daniel
f46626e120 refactor cluster view pandora_enterprise#12032 2023-09-21 10:21:45 +02:00
Jonathan
aea61a6144 #12060 fix border radius sound events 2023-09-20 11:57:16 +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
Daniel Rodriguez
6ecd8ca899 Merge branch 'ent-10065-post-filtros-de-eventos-privados' into 'develop'
Draft: Ent 10065 post filtros de eventos privados

See merge request artica/pandorafms!6318
2023-09-18 07:55:18 +00:00
daniel
09bcedde62 ITSM pandora_enterprise#11471 2023-09-14 16:36:52 +02:00
Jonathan
5f35bbc1c0 #12060 fix line active 2023-09-14 13:01:54 +02:00
daniel
af968b5e13 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-14 08:08:05 +02:00
Rafael Ameijeiras
69030a9e3b Merge branch 'ent-12010-header-de-los-welcome-tips-se-corta' into 'develop'
Ent 12010 Header de los Welcome Tips se corta

See merge request artica/pandorafms!6445
2023-09-13 12:46:07 +00:00
daniel
8e29973128 ITSM pandora_enterprise#11471 2023-09-12 13:10:23 +02:00
Daniel Cebrian
1a9b770a9e #12010 fixed header modal 2023-09-12 12:42:40 +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
Jorge Rincon
764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +02:00
Daniel Cebrian
2a56b63f2a #11965 new filters for hardening 2023-09-08 14:06:33 +02:00
Daniel Cebrian
a8b107bb92 #11965 new structure for hardening 2023-09-07 17:08:27 +02:00
Daniel Cebrian
133c1676c0 Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas 2023-09-07 15:28:55 +02:00
Daniel Cebrian
e3050c2933 #11965 change css in hardening 2023-09-06 15:09:42 +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 Cebrian
12ebf45f87 #11965 adjust css for column with 70% in hardening 2023-09-04 16:04:26 +02:00
Daniel Cebrian
586a5523b6 #11965 added new screen auditing 2023-09-04 11:07:33 +02:00
Jorge Rincon
ba1a3da03a #10065 fixed checkbox switch style 2023-09-04 10:03:53 +02:00
Rafael Ameijeiras
6e60eeb09b Merge branch 'ent-11490-nuevo-widget-group-status-map' into 'develop'
Ent 11490 Nuevo widget: group status map

See merge request artica/pandorafms!6252
2023-09-04 07:05:49 +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
c2e6dd378d #11206 Fix buttons 2023-08-31 13:36:26 +02:00
miguel angel rasteu
2c62de02f7 Fix conflict 2023-08-31 12:49:48 +02:00
Gorka Sanchez
6102cb5015 Merge branch 'ent-11423-nueva-herramienta-graph-analytics' into 'develop'
Ent 11423 nueva herramienta graph analytics

See merge request artica/pandorafms!6327
2023-08-31 10:30:27 +00:00
Daniel Cebrian
d90f2b8cad #11965 new view audit and hardening in menu 2023-08-31 10:47:18 +02:00
Daniel Cebrian
1fa0bc0ab1 #11965 new section security in menu 2023-08-29 15:09:41 +02:00
Daniel Cebrian
dee5667783 Merge branch 'develop' into ent-11490-nuevo-widget-group-status-map 2023-08-29 10:57:43 +02:00
miguel angel rasteu
f5d20dc8eb #11206 Fix custom field view 2023-08-25 12:20:07 +02:00
miguel angel rasteu
1afed9f262 Merge branch 'develop' into ent-11206-anadir-la-custom-field-view-de-la-meta-a-los-nodos 2023-08-25 10:13:43 +02:00
miguel angel rasteu
bb3a45050f Merge branch 'develop' into ent-10637-mejora-informe-grupo 2023-08-24 12:38:23 +02:00
Pablo Aragon
670cf7d9a7 11423-Graph analytics. Remove graphs & several changes 2023-08-24 12:27:06 +02:00
Jonathan
d9e897568a Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-24 10:06:19 +02:00
Jonathan
ab50a519ea #10639 version 2 datepicker 2023-08-24 09:36:15 +02:00
daniel
dca15b5637 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-23 18:54:01 +02:00
Pablo Aragon
6757e69a75 11423-Graph analytics. Resolve Confict 2023-08-23 11:55:41 +02:00