18479 Commits

Author SHA1 Message Date
Jonathan
f9fe35e0c3 log viewer and sort reporting 2023-03-14 17:28:17 +01:00
Daniel Cebrian
26c08ebe0f #10650 fixed bug when user access in view maintenance and show modules select 2023-03-14 17:13:19 +01:00
Pablo Aragon
302e3c8bf7 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 15:59:27 +01:00
Pablo Aragon
620bff28af Dashboards widgets 2023-03-14 15:59:20 +01:00
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
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
Daniel Cebrian
d315d4cda7 #10633 added token for control check conexion interval 2023-03-14 13:16:58 +01:00
Jose Gonzalez
b428e77e7c User management for meta 2023-03-14 13:11:57 +01:00
Daniel Maya
a7a283fe22 #8642 Fixed heatmap widget 2023-03-14 12:52:44 +01:00
Daniel Maya
62d1249fe0 #8642 Added heatmap widget 4 2023-03-14 12:47:10 +01:00
Daniel Cebrian
e4d6737192 #10324 fixed system fav in meta 2023-03-14 09:42:26 +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
Daniel Cebrian
e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +01:00
Jose Gonzalez
3ab0b1c4cb Minor fixes 2023-03-14 08:04:48 +01:00
artica
cf23817a7f Auto-updated build strings. 2023-03-14 01:00:35 +01: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
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
Daniel Cebrian
90f0c3771f #10324 fixed deleted element fav menu 2023-03-13 17:21:28 +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
Daniel Cebrian
64cc261483 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 16:48:47 +01: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
1c85038ffa Discovery progress bars 2023-03-13 15:44:55 +01:00
Daniel Maya
0e4d423825 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-13 15:17:18 +01:00
Daniel Maya
b446e89728 Merge branch 'develop' into ent-9893-nuevo-sistema-de-ha 2023-03-13 15:08:44 +01:00
Daniel Maya
695f3fb282 #9893 Added img disabled 2023-03-13 15:07:38 +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
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
Jose Gonzalez
590e7a3978 Netflow improvements 2023-03-13 11:25:43 +01:00
daniel
503a1b2c22 Merge remote-tracking branch 'origin/develop' into ent-9680-widget-para-mostrar-modulos-por-estados
Conflicts:
	pandora_console/include/lib/Dashboard/Widget.php
2023-03-13 10:43:38 +01:00
Jonathan
80076434b3 SNMP visual fix staticts 2023-03-13 10:29:03 +01:00
Daniel Cebrian
f79d22b781 #9624 clear log 2023-03-13 09:57:57 +01:00
Jose Gonzalez
bbec6a92a4 Minor fixes 2023-03-13 09:35:12 +01:00
daniel
80c81daafa Merge remote-tracking branch 'origin/develop' into ent-985t push
9-nuevos-widgets-para-mostrar-datos-en-dashboard-avg-sum-max-min

Conflicts:
	pandora_console/operation/agentes/estado_agente.php
2023-03-13 09:23:53 +01:00
Daniel Cebrian
3c614c7c46 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 09:01:59 +01:00