1055 Commits

Author SHA1 Message Date
Daniel Cebrian
8183f7aa5d Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-17 15:48:23 +02:00
Jonathan
cbf122f4c6 #10714 csv inventory button 2023-04-17 14:11:16 +02:00
Jonathan
f6be23c353 #10899 json_ucescaped_unicode to inventory manage and visual fix 2023-04-14 12:24:39 +02:00
daniel
976633bc4f fix profiles and users pandora_enterprise#10803 2023-04-14 10:02:41 +02:00
Daniel Cebrian
60700000fe Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-12 18:28:55 +02:00
Daniel Rodriguez
7ae8f185b0 Merge branch 'ent-10909-se-han-roto-los-iconos-de-grupo-de-agentes-en-v770' into 'develop'
Ent 10909 se han roto los iconos de grupo de agentes en v770

See merge request artica/pandorafms!5701
2023-04-12 15:29:44 +00:00
Daniel Rodriguez
01e831312d Merge branch 'ent-10917-iconos-de-so-personalizados-se-ven-rotos' into 'develop'
Ent 10917 iconos de so personalizados se ven rotos

See merge request artica/pandorafms!5707
2023-04-12 13:50:30 +00:00
Daniel Maya
7570e0d3fb #10909 Fix icon group 3 2023-04-12 15:10:05 +02:00
Daniel Maya
a42c235cab #10917 Fix icon 2023-04-12 14:44:01 +02:00
miguel angel rasteu
425da3b36d #10913 Fix metaconsole favicon path 2023-04-12 13:01:53 +02:00
Daniel Cebrian
3652317270 Merge branch 'develop' 2023-04-12 12:37:39 +02:00
Jonathan
aa9fefd30c #10899 entities inventory and correction visual style 2023-04-12 10:25:35 +02:00
daniel
eaf71f39ec fix comments events pandora_enterprise#10631 2023-04-11 15:43:21 +02:00
Pablo Aragon
45ca03245c 10873-Mini mobile console review 2023-04-10 08:56:44 +02:00
Jimmy Olano
89aa227b98 Merge branch 'ent-10734-sistema-de-favoritos-no-actualiza-nombre-en-el-menu-lateral-del-objeto-favorito-consola-visual' into 'develop', JJOS.
Ent 10734 sistema de favoritos no actualiza nombre en el menu lateral del objeto favorito consola visual

See merge request artica/pandorafms!5613
2023-04-04 11:57:45 +00:00
Daniel Cebrian
9ae1b1b18f Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-03 08:53:53 +02:00
Daniel Cebrian
9c4c9c5f93 #9771 refactor 2023-03-31 13:46:28 +02:00
daniel
c315a7f8c5 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-31 13:31:39 +02:00
Pablo Aragon
426690bc35 10843 & 10844 2023-03-31 10:44:51 +02:00
Daniel Rodriguez
ca16c5dd61 Merge branch 'ent-10441-control-de-cache-en-actualizaciones' into 'develop'
Ent 10441 control de cache en actualizaciones

See merge request artica/pandorafms!5623
2023-03-31 07:33:26 +00:00
Daniel Cebrian
b78f633853 #9771 new function for draw tree and fixed bugs 2023-03-30 18:27:03 +02:00
daniel
24e5fca884 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-30 17:34:06 +02:00
Pablo Aragon
3a2cbb7a62 Datatables & styles fix 2023-03-30 16:50:30 +02:00
Daniel Cebrian
f442272177 Merge branch 'develop' into ent-10633-pantalla-de-timeout 2023-03-30 09:30:38 +02:00
Daniel Cebrian
b9fc352578 merge develop into ent-10633-pantalla-de-timeout 2023-03-30 09:15:10 +02:00
daniel
8458716ba9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-29 17:27:57 +02:00
Pablo Aragon
f26e70630a Blue background & Datatable fix 2023-03-29 17:09:41 +02:00
Matias Didier
4297481c35 Merge branch 'ent-10819-guardia-15316-alertas-en-vista-de-alertas-tienen-icono-de-politica-sin-estar-en-ellas' into 'develop'
Ent 10819 guardia 15316 alertas en vista de alertas tienen icono de politica sin estar en ellas

See merge request artica/pandorafms!5633
2023-03-29 12:32:44 +00:00
Daniel Maya
3af2637a7c #10819 Fixed img 2023-03-29 13:37:07 +02:00
Daniel Maya
eac71560cb #10819 Fixed policy alert img 2023-03-28 17:22:25 +02:00
Pablo Aragon
ce014e4c6b Datatables. Treeview graph meta 2023-03-28 17:07:06 +02:00
Daniel Cebrian
075d0a1c4f #10441 added version file in css 2023-03-24 12:06:40 +01:00
Daniel Cebrian
69b573e266 #10441 added version in import files js and css 2023-03-23 14:43:13 +01:00
daniel
5eaa4a10bb fixed styles 2023-03-22 11:13:56 +01:00
daniel
732000f7bd fixed styles 2023-03-21 18:42:31 +01:00
daniel
64fc4bcd46 fixed styles 2023-03-21 14:06:28 +01:00
Jonathan
72778eb97c Wizzard template fix 2023-03-21 12:07:10 +01:00
daniel
594d34931c fixed styles 2023-03-17 13:20:58 +01:00
Daniel Cebrian
b81b7ce7af #fixed in fav menu when change name the original name 2023-03-17 12:25:43 +01:00
Pablo Aragon
00a5e8e84b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 11:30:40 +01:00
Pablo Aragon
938e8cd777 Dashboards widgets 2023-03-15 11:30:22 +01:00
Daniel Cebrian
1b0477bd1f Merge branch 'develop' into ent-10633-pantalla-de-timeout 2023-03-15 09:06:00 +01:00
Daniel Cebrian
e0c5921d59 #10633 fixed size icon connection_check 2023-03-15 09:01:49 +01:00
daniel
cec81f1cc2 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
Conflicts:
	pandora_console/extras/mr/62.sql
2023-03-14 18:17:54 +01:00
Jonathan
f9fe35e0c3 log viewer and sort reporting 2023-03-14 17:28:17 +01:00
Pablo Aragon
658f2853f7 Dashboards widgets 2023-03-14 14:56:33 +01:00
Daniel Cebrian
e4d6737192 #10324 fixed system fav in meta 2023-03-14 09:42:26 +01:00
Daniel Cebrian
e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +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