Commit Graph

1231 Commits

Author SHA1 Message Date
daniel a758528968 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/class/AuditLog.class.php
2023-03-01 07:56:32 +01:00
daniel 8ac9df14ab fixed styles 2023-02-28 19:01:37 +01:00
Matias Didier 9def6eb6d5 Merge branch 'ent-9047-vista-de-auditoria-mejoras-funcionales-y-esteticas' into 'develop'
Ent 9047 vista de auditoria mejoras funcionales y esteticas

See merge request artica/pandorafms!5500
2023-02-28 13:28:45 +00:00
Jose Gonzalez 114e9a366f Networkmap 2023-02-28 10:39:31 +01:00
Jose Gonzalez ce5ccbec5d Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 09:36:21 +01:00
daniel f00f974c60 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/alert_templates.php
	pandora_console/godmode/groups/configure_modu_group.php
	pandora_console/godmode/groups/modu_group_list.php
	pandora_console/godmode/modules/manage_network_components.php
	pandora_console/godmode/users/user_list.php
2023-02-28 07:32:43 +01:00
daniel f38adff73a fixed styles 2023-02-27 18:05:51 +01:00
Jose Gonzalez 973444014a Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-27 16:37:17 +01:00
Jose Gonzalez 5df442e83e Network maps improve 2023-02-27 16:37:00 +01:00
Jonathan 1d930dccc7 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-27 16:34:02 +01:00
Jonathan dcdf0a5188 SNMP and reporting visual changes 2023-02-27 16:33:54 +01:00
Daniel Cebrian c8096d73b2 Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola 2023-02-27 14:58:25 +01:00
Pablo Aragon 32cf508633 10457-System audit log 2023-02-27 14:38:39 +01:00
daniel 12212fff02 restyling 2023-02-27 13:41:44 +01:00
Daniel Cebrian 2c7d00a664 Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola 2023-02-27 13:34:41 +01:00
Daniel Cebrian 5d4c61f8c4 #10253 added notify enforcement in metaconsole 2023-02-27 13:26:32 +01:00
Jonathan 87f17890f9 SNMP visual changes 2023-02-27 12:13:38 +01:00
Jonathan 74c0dbb39f SNMP black theme 2023-02-27 10:31:50 +01:00
Jonathan 9ed46e3b52 SNMP fix view 2023-02-27 09:41:39 +01:00
daniel 65ed10be1a restyling 2023-02-24 13:43:34 +01:00
Jonathan 0a5571cd4d SNMP browser icons 2023-02-24 13:21:00 +01:00
Daniel Cebrian b367284d72 Merge branch 'develop' into 'ent-10259-control-de-configuracion-en-tagent_acess'
# Conflicts:
#   pandora_console/include/class/ConsoleSupervisor.php
2023-02-24 11:09:16 +00:00
Daniel Cebrian c7e53f5a1a #10259 resolve conflics 2023-02-24 12:07:37 +01:00
Jonathan 84e3f11b7b Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 12:00:12 +01:00
Jonathan c56aac317a SNMP console view fix 2023-02-24 12:00:02 +01:00
daniel afbbb57a53 restyling 2023-02-24 10:48:30 +01:00
daniel 6381aaa9a8 restyling 2023-02-24 10:18:52 +01:00
Jose Gonzalez fbca56500a TreeView minor fixes 2023-02-23 16:24:20 +01:00
daniel ff9ee7a4f0 restyling 2023-02-23 10:24:03 +01:00
Jose Gonzalez ec58cb4593 Plugins view 2023-02-22 14:19:57 +01:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
2023-02-22 12:35:34 +01:00
Matias Didier 8b8414be52 Merge branch 'ent-10305-ultima-ejecucion-de-pandora-db-en-vista-about-da-53-anos-como-dato' into 'develop'
Ent 10305 ultima ejecucion de pandora db en vista about da 53 anos como dato

See merge request artica/pandorafms!5501
2023-02-21 15:31:31 +00:00
Jimmy Olano 34f66ae6f8 Merge branch 'ent-10283-arreglar-layout-de-filtro-de-la-vista-de-consola-de-traps' into 'develop'
Ent 10283 arreglar layout de filtro de la vista de consola de traps

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/10283

See merge request artica/pandorafms!5495
2023-02-20 16:11:29 +00:00
Jimmy Olano 30604d50a6 Merge branch 'ent-10296-anadir-hora-del-servidor-live-en-general-setup-de-la-consola' into 'develop'
Ent 10296 anadir hora del servidor live en general setup de la consola

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/10296

See merge request artica/pandorafms!5515
2023-02-20 13:56:55 +00:00
Jose Gonzalez 8f21229246 Ticket 10467 Improve External Tools view 2023-02-20 14:50:17 +01:00
Jonathan 521f7ad0ce Menu go to images correction 2023-02-20 08:57:04 +01:00
Jonathan b8432a8a55 Search go to icons 2023-02-16 15:03:45 +01:00
Diego Muñoz-Reja e34677e5f6 Merge branch 'ent-10195-offset-de-mapas' into 'develop'
Ent 10195 offset de mapas

See merge request artica/pandorafms!5539
2023-02-15 14:34:17 +00:00
Diego Muñoz-Reja 472ffdf443 Merge branch 'ent-10118-creacion-de-mapas-de-red' into 'develop'
Ent 10118 creacion de mapas de red

See merge request artica/pandorafms!5531
2023-02-15 12:55:43 +00:00
Daniel Maya cac9f67153 #10195 Fixed minimap drawing 2023-02-15 10:49:31 +01:00
Rafael Ameijeiras f4c94e2a86 Merge branch 'ent-9509-agregar-mensaje-notificacion-de-omnishell-si-falta-libreria' into 'develop'
Omnishell error xml if YAML::Tiny not installed on agent

See merge request artica/pandorafms!5529
2023-02-14 17:00:13 +00:00
Jose Gonzalez 36308b1be0 Minor visual fixes 2023-02-14 16:41:24 +01:00
Daniel Maya ccb0cda305 #10118 changed CIDR input 2023-02-14 12:16:38 +01:00
Calvo 9c4a0f8a2b Agent library error notification 2023-02-14 09:03:51 +01:00
Daniel Maya 5b263981c4 #10118 Added group multiselector 2023-02-13 17:06:09 +01:00
Calvo a9832e9886 WIP: Added pandora notification if missing library on agent 2023-02-13 15:40:55 +01:00
Daniel Rodriguez 57dd29063c Merge branch 'ent-10228-tsessions_php-crece-indefinidamente' into 'develop'
Added cookie management to api curl and wget calls

See merge request artica/pandorafms!5502
2023-02-13 09:50:41 +00:00
Jose Gonzalez 98736c1ab4 Merge 2023-02-13 10:24:07 +01:00
Jose Gonzalez d6eedf07aa Merge 2023-02-13 10:03:09 +01:00
Daniel Cebrian 1457dffe6c #10296 added getSystemDate in AJAXMethods 2023-02-07 10:30:22 +01:00