2570 Commits

Author SHA1 Message Date
miguel angel rasteu
0f32550f21 #11650 Fix conflict 2023-10-30 08:35:34 +01:00
miguel angel rasteu
98da82aadf #11652 Fix conflict 2023-10-30 08:30:29 +01:00
Daniel Cebrian
48e1782910 Merge branch 'develop' into ent-11126-vulnerability-scanner-interface 2023-10-26 15:18:17 +02:00
Daniel Cebrian
23a55a9f66 #11126 fixed styles datatable 2023-10-25 17:48:25 +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
Matias Didier
88deb7bd83 Merge branch 'ent-9814-nuego-item-graficas-de-capacity-planning-en-dashboard' into 'develop'
Ent 9814 nuego item graficas de capacity planning en dashboard

See merge request artica/pandorafms!6591
2023-10-25 13:42:53 +00:00
Jonathan
76c6567432 #8635 massive ncm add 2023-10-25 11:10:55 +02:00
Daniel Cebrian
490e39c2d8 Merge branch 'develop' into ent-11126-vulnerability-scanner-interface 2023-10-24 13:43:31 +02:00
Jonathan
d772e75a7d #9814 margin dashboard graph left 2023-10-24 09:34:59 +02:00
daniel
d8dfaf0fe3 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-10-23 17:02:51 +02:00
daniel
ef70444d71 add sliced mode simple graph widget pandora_enterprise#9640 2023-10-23 17:02:08 +02:00
Daniel Cebrian
8d624fe371 Merge branch 'develop' into ent-12288-varios-bugs-en-netflow 2023-10-23 14:59:20 +02:00
Jonathan
202ad6f4f8 #12270 widget min height 2023-10-23 10:54:06 +02:00
Diego Muñoz-Reja
48c314669a Merge branch 'ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion' into 'develop'
Ent 10194 Nueva pantalla táctica (relacionado con mejoras en la automonitorización)

See merge request artica/pandorafms!6485
2023-10-23 07:24:20 +00: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
Jonathan
10fcf9fdb3 #12271 style dashboard widgets 2023-10-20 13:00:02 +02:00
daniel
6ad9b27df8 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-10-20 10:08:20 +02:00
Daniel Cebrian
7bba90cd4f #12288 added spinner in netflow and fixed bug filter 2023-10-19 17:18:13 +02:00
daniel
eb5e56cc78 Merge remote-tracking branch 'origin/develop' into ent-12196-problemas-con-la-vista-mobile 2023-10-19 08:16:33 +02:00
daniel
4fb7e1719b add periodicity graph pandora_enterprise#9640 2023-10-18 12:49:47 +02:00
Jonathan
5cfc89c05f #12254 align text and icons menu 2023-10-17 17:07:46 +02:00
Daniel Cebrian
af0d311e1c #10194 fixed black theme 2023-10-17 09:40:50 +02:00
Daniel Cebrian
48ffbc6c08 #10194 fixed bug in responsive 2023-10-16 21:09:33 +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
Daniel Cebrian
4c14a5ee16 #11126 added datatable 2023-10-16 16:45:03 +02:00
Daniel Cebrian
533201197a #11126 new view vulnerabilities scanner 2023-10-13 12:25:25 +02:00
miguel angel rasteu
5060398661 #11206 Fix conflict 2023-10-13 09:00:03 +02:00
daniel
d19b506781 fix cv in mobile pandora_enterprise#12196 2023-10-11 10:48:26 +02:00
miguel angel rasteu
3e20ff7eaa #12218 Fix show hide password button 2023-10-11 09:59:26 +02:00
miguel angel rasteu
1c1d2cf1c1 #12208 Improve widget html editor 2023-10-10 16:35:36 +02:00
Daniel Cebrian
e3e7328a01 #10194 change in graph 2023-10-10 15:51:48 +02:00
Daniel Cebrian
a02482ac5d #10194 added links 2023-10-10 15:15:43 +02:00
Daniel Cebrian
2c352ad9dd #10194 new graph for license and changes in design 2023-10-09 19:04:01 +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
daniel
588f19fa18 fix cv in mobile pandora_enterprise#12196 2023-10-06 12:59:33 +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
Daniel Cebrian
1a89761727 #10194 adjust max height divs 2023-10-05 18:15:33 +02: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 Cebrian
e64eadcb37 #10194 hide widget not activated 2023-10-03 10:31:57 +02:00
miguel angel rasteu
384a66dc0d #12137 Fix refact 2023-10-03 09:35:10 +02:00
Daniel Cebrian
438cb11f95 #10194 added automonitoritation modules and interval refresh async 2023-10-02 16:44:53 +02:00
miguel angel rasteu
340288d785 #12137 visual refactoring for main agent view 2023-10-02 15:25:24 +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 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