33117 Commits

Author SHA1 Message Date
Jonathan
2424e5009c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 15:42:02 +01:00
Jonathan
dac980e55e PDFs visual changes 2023-03-14 15:41:55 +01:00
Pablo Aragon
6e4fe7bc48 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 14:56:52 +01:00
Pablo Aragon
658f2853f7 Dashboards widgets 2023-03-14 14:56:33 +01:00
Jose Gonzalez
2955df3b9c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 13:47:21 +01:00
Jose Gonzalez
bd9ec31c2b User list and other fixes 2023-03-14 13:46:49 +01:00
Jonathan
9f953809a0 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 13:26:31 +01:00
Jonathan
00ba02e23e Visual changes PDFs slicebar 2023-03-14 13:26:21 +01:00
Jose Gonzalez
b428e77e7c User management for meta 2023-03-14 13:11:57 +01:00
Jose Gonzalez
93a912b76b Fix MR 2023-03-14 10:01:09 +01:00
Jose Gonzalez
3eced53695 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 09:06:08 +01:00
Jose Gonzalez
e71014607a 10669 fix revision 2023-03-14 09:05:59 +01:00
daniel
5028574e7d Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-14 08:54:01 +01:00
Jose Gonzalez
397c4bd720 Fix plugin icon 2023-03-14 08:35:05 +01:00
Jose Gonzalez
3ab0b1c4cb Minor fixes 2023-03-14 08:04:48 +01:00
Jose Gonzalez
f0a424a493 Module manager fix 2023-03-14 08:04:05 +01:00
artica
cf23817a7f Auto-updated build strings. 2023-03-14 01:00:35 +01:00
Jose Gonzalez
ca39fa8560 #10669 Fix configure_user issue 2023-03-13 21:21:25 +01:00
Jose Gonzalez
79fbab3696 Tubercles removal 2023-03-13 21:17:55 +01:00
daniel
92ab4c3ca8 Merge branch 'ent-9662-second-round' into 'develop'
Ent 9662 second round

See merge request artica/pandorafms!5594
2023-03-13 18:33:26 +00:00
daniel
d092495482 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-13 19:31:26 +01:00
daniel
c96ac79726 fixed styles 2023-03-13 19:30:51 +01:00
Jose Gonzalez
154c97d653 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 17:50:45 +01:00
Jose Gonzalez
3b36545cec New icon 2023-03-13 17:50:36 +01:00
Pablo Aragon
1d6e33f371 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 17:40:06 +01:00
Pablo Aragon
2215097100 Manage agent, modules 2023-03-13 17:39:58 +01:00
Jonathan
fcdd585042 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 17:36:11 +01:00
Jonathan
4f2ab51252 UI Reporting PDF Changes 2023-03-13 17:36:04 +01:00
Jose Gonzalez
fe20b4c49c Plugins view 2023-03-13 17:32:20 +01:00
Jose Gonzalez
b6251edb79 Minor fix 2023-03-13 17:31:43 +01:00
Diego Muñoz-Reja
fa2918e8ed Merge branch 'ent-10229-AXITY-Update-jquery-para-solventar-vulnerabilidades' into 'develop'
updated jquery-ui library

See merge request artica/pandorafms!5564
2023-03-13 16:03:04 +00:00
Jose Gonzalez
3ebfee9ccb Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 16:21:35 +01:00
Jose Gonzalez
c2ba5cfdd3 Agent status 2023-03-13 16:21:14 +01:00
Pablo Aragon
51ab985784 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 16:14:02 +01:00
Pablo Aragon
6450100f23 Manage agent, setup view 2023-03-13 16:13:49 +01:00
Jose Gonzalez
a7cfa310a3 Agents alias in header 2023-03-13 15:52:28 +01:00
Jose Gonzalez
1c85038ffa Discovery progress bars 2023-03-13 15:44:55 +01:00
Jose Gonzalez
3ae465c1fe Fix header help icons 2023-03-13 14:33:42 +01:00
Jose Gonzalez
0624f16ce9 Minor fix 2023-03-13 14:23:54 +01:00
Jonathan
a0bffb79bd Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 14:21:17 +01:00
Jonathan
10c0d95f34 Reports PDFS changes 2023-03-13 14:21:10 +01:00
Jose Gonzalez
1b4136d91e Minor fix 2023-03-13 14:10:20 +01:00
Jose Gonzalez
45ba4cdd15 Netflow 2023-03-13 14:03:00 +01:00
Jose Gonzalez
7bedd86e25 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 13:26:03 +01:00
Jose Gonzalez
5466cb5995 Netflow live view 2023-03-13 13:25:42 +01:00
Rafael Ameijeiras
6545c72d85 Merge branch 'ent-10485-fix-inconsistency-between-lag-calculation-on-server-and-cosole' into 'develop'
Ent 10485 fix inconsistency between lag calculation on server and cosole

See merge request artica/pandorafms!5577
2023-03-13 12:22:06 +00:00
Calvo
8bdc528dc4 Merge remote-tracking branch 'origin/develop' into ent-10485-fix-inconsistency-between-lag-calculation-on-server-and-cosole 2023-03-13 12:58:14 +01:00
daniel
0643b4e0ba fixed styles 2023-03-13 12:19:27 +01:00
Pablo Aragon
0203e5eba9 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 12:03:43 +01:00
Pablo Aragon
2cd09d7618 Datatable message info 2023-03-13 12:03:33 +01:00