Commit Graph

303 Commits

Author SHA1 Message Date
miguel angel rasteu fddc709aee #11219 Fix transaltes 2023-08-02 14:48:02 +02:00
Daniel Maya 858a6230b3 resolved conflict 2023-07-31 09:02:58 +02:00
miguel angel rasteu a1965de2ea #11386 Fix sound alert modal 2023-07-24 12:25:06 +02:00
Daniel Cebrian d993674c12 Merge branch 'develop' into ent-11567-ventana-about 2023-07-06 11:30:45 +02:00
Miguel Angel Rasteu 82f6c6c0da Merge branch 'develop' into 'ent-10563-mejoras-personalizacion-interfaz'
# Conflicts:
#   pandora_console/godmode/agentes/module_manager.php
2023-07-03 07:45:32 +00:00
Gorka Sanchez 28f99d2c27 Merge branch 'ent-10741-15263-cuadro-de-busqueda-de-modulos-en-agente-limitado-a-5-caracteres' into 'develop'
Ent 10741 15263 cuadro de busqueda de modulos en agente limitado a 5 caracteres

See merge request artica/pandorafms!5713
2023-06-30 11:39:50 +00:00
miguel angel rasteu ac92b5979c #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality 2023-06-30 08:35:37 +02:00
Daniel Cebrian 01d48c7ba4 #11567 new about window in operation 2023-06-19 15:09:30 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Daniel Cebrian 2a7eb1e069 #11280 fixed acoustic console name 2023-05-30 17:17:34 +02:00
Daniel Cebrian e1f995744b #10998 fixed acl edit my user 2023-04-25 10:57:21 +02:00
miguel angel rasteu c26db22fa5 #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality 2023-04-13 11:07:09 +02:00
Matias Didier 2daea0e5c4 Merge branch 'ent-10764-favoritos-y-nuevos-menus' into 'develop'
Ent 10764 favoritos y nuevos menus

See merge request artica/pandorafms!5618
2023-03-27 09:01:48 +00:00
Rafael Ameijeiras a30ba4cf27 Merge branch 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' into 'develop'
Ent 9624 meter soporte a sflow en nuestro gestor de flujos

See merge request artica/pandorafms!5587
2023-03-24 07:25:52 +00:00
Daniel Maya 94c843dac2 #9662 Fixed gis map menu 2023-03-23 10:41:08 +01:00
Daniel Cebrian a21e43a452 #10764 ignore selected action in fav menu 2023-03-21 15:40:46 +01:00
Daniel Cebrian 9dea38f440 Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos 2023-03-21 09:38:56 +01:00
Daniel Cebrian ca78f069f6 #9624 added support sflow 2023-03-10 17:12:38 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
daniel 5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
2023-03-03 08:20:44 +01:00
Jonathan fdab2cff8e Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos 2023-03-02 08:26:53 +01:00
Daniel Cebrian e76d8606dc #10324 added star in menu 2023-02-27 09:45:15 +01:00
Daniel Cebrian d6645ee283 #10324 added fav menu in network map and visual console 2023-02-23 11:37:23 +01:00
Daniel Cebrian 0990fe672e #10324 added system fav menu in agent and events 2023-02-23 09:48:13 +01:00
Daniel Maya a615d2d98f #9662 minor fixed 2023-02-20 17:08:36 +01:00
Daniel Maya c6e32e278b #9662 fixed favourites 2023-02-20 16:41:54 +01:00
Daniel Maya f5044e5673 #9662 Added new user edit link and changed label 2023-02-13 13:16:51 +01:00
Jose Gonzalez d45a631ea5 Final merge with new menu 2023-02-13 10:37:37 +01:00
Jose Gonzalez 98736c1ab4 Merge 2023-02-13 10:24:07 +01:00
Daniel Maya be3c7bca6c resolved conflict 2023-02-10 11:55:45 +01:00
Daniel Maya 758f906616 #9663 menu redesing 4 2023-02-07 15:22:51 +01:00
Jonathan b88f26500b #9819 Change labels Accoustic console 2023-01-31 08:35:47 +01:00
Jonathan 624463d573 #9819 change setcion menu configuration sound 2023-01-30 08:27:03 +01:00
Jonathan 34fede2ce1 #9819 New section configuration sound event 2023-01-27 12:42:23 +01:00
daniel 95575b4e90 remove old format events sounds pandora_enterprise#10208 2023-01-27 12:37:25 +01:00
Calvo 2ad8fac652 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-22 11:35:25 +01:00
Calvo 63840b1d55 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-19 11:31:02 +01:00
Alejandro Campos 960d8be258 Merge branch 'develop' into 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open'
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
2022-12-15 14:05:27 +00:00
Alejandro Campos 867e1cc2b3 Merge branch 'develop' into 'ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional'
# Conflicts:
#   pandora_console/extras/mr/60.sql
2022-12-13 11:42:41 +00:00
alejandro.campos@artica.es 6a173664d4 Removed transactional server 2022-11-11 12:09:03 +01:00
Daniel Barbero ccc2e830f4 add sound events to metaconsole pandora_enterprise#8854 2022-11-03 15:12:50 +01:00
alejandro.campos@artica.es 17d7261173 implement cluster in open project 2022-10-20 13:17:26 +02:00
jose.gonzalez@pandorafms.com f2ebd96cc8 WIP: Created new way to do the menus 2022-10-20 09:43:02 +02:00
Daniel Barbero a21048c4c5 Merge remote-tracking branch 'origin/develop' into ent-9425-agrupar-eventos-por-id_extra 2022-10-14 08:11:51 +02:00
Daniel Barbero 9e2c6edfeb new group by events for extraid pandora_enterprise#9425 2022-09-27 15:08:09 +02:00
Calvo 8174925a91 Delete favourite vc from menu when vc is deleted 2022-09-26 11:32:07 +02:00
Calvo da0dad0148 WIP:Move inventory to open 2022-09-14 18:12:39 +02:00