Commit Graph

888 Commits

Author SHA1 Message Date
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 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 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
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
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
Jonathan 80076434b3 SNMP visual fix staticts 2023-03-13 10:29:03 +01:00
Jose Gonzalez bbec6a92a4 Minor fixes 2023-03-13 09:35:12 +01:00
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
daniel 3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
Pablo Aragon 000874ea6e CSV button datatable. IPAM fix 2023-03-10 12:29:13 +01:00
Jonathan 068f23f278 Tables icon svg correction reports 2023-03-09 16:33:58 +01:00
Jonathan 7b3ed98d4b Agent inventory fix graph 2023-03-09 16:28:08 +01:00
daniel 63d83b3f97 fixed styles 2023-03-09 11:25:43 +01:00
daniel e21d9968e8 fixed styles 2023-03-08 19:25:25 +01:00
Jose Gonzalez 1d3d2fc5fd Minor fixes 2023-03-08 15:01:41 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
Jose Gonzalez f7aab35082 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 15:59:51 +01:00
Jose Gonzalez 226b80b7c7 Icon revision 2023-03-07 15:59:10 +01:00
Daniel Maya 6b9175ea0d Merge branch 'develop' into ent-9662-second-round 2023-03-07 15:05:28 +01:00