tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
34,332 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

1213 Commits

Author SHA1 Message Date
Daniel Rodriguez dbf7d4dcfe Merge branch 'ent-11054-15466-modo-legacy-con-problemas' into 'develop' 
fixed visual errors in legacy VC pandora_enterprise#11054

See merge request artica/pandorafms!5829
 2023-05-23 10:07:14 +00:00
Matias Didier 47430f926e Merge branch 'ent-11140-algunos-wizards-siguen-sin-tener-los-estilos-aplicados' into 'develop' 
Ent 11140 algunos wizards siguen sin tener los estilos aplicados

See merge request artica/pandorafms!5883
 2023-05-22 11:38:53 +00:00
Jonathan 5fe0f7fb08 #11140 fix style message warning 2023-05-22 11:39:59 +02:00
Diego Muñoz-Reja 4a8e8f4ae1 Merge branch 'ent-11103-15535-agente-debe-de-ser-aplicado-cuando-ya-esta-aplicado' into 'develop' 
fixed modules adopted pandora_enterprise#11103

See merge request artica/pandorafms!5836
 2023-05-18 09:20:31 +00:00
Rafael Ameijeiras d57e9c4f16 Merge branch 'ent-11094-modulo-tipo-plugin-usando-snmp_remote-no-muestra-opciones-de-configuracion-al-actualizar' into 'develop' 
Ent 11094 modulo tipo plugin usando snmp remote no muestra opciones de configuracion al actualizar

See merge request artica/pandorafms!5827
 2023-05-17 08:05:09 +00:00
Pablo Aragon f4cf8e769a 11094-Fix plugin data recovery 2023-05-16 16:00:17 +02:00
Rafael Ameijeiras eb0be5c2c7 Merge branch 'ent-11067-no-aparece-la-ip-al-hacer-hover-sobre-el-modulo' into 'develop' 
Ent 11067 no aparece la ip al hacer hover sobre el modulo

See merge request artica/pandorafms!5801
 2023-05-12 09:20:38 +00:00
Matias Didier e870f45e5c Merge branch 'ent-10947-cuando-un-modulo-esta-en-un-estado-que-no-sea-normal-en-la-vista-de-heatmap-se-descoloca' into 'develop' 
Ent 10947 cuando un modulo esta en un estado que no sea normal en la vista de heatmap se descoloca

See merge request artica/pandorafms!5769
 2023-05-11 12:36:55 +00:00
miguel angel rasteu f9b7ac523e #11067 Fix IP target title 2023-05-08 11:59:08 +02:00
daniel 77be60e4a3 fixed modules adopted pandora_enterprise#11103 2023-05-04 18:24:11 +02:00
daniel 5f3cbbb12a fixed visual errors in legacy VC pandora_enterprise#11054 2023-05-04 11:14:11 +02:00
Daniel Rodriguez 06b58d3dfc Merge branch 'ent-10191-nuevas-alertas-sonoras-son-poco-usables' into 'develop' 
Ent 10191 nuevas alertas sonoras son poco usables

See merge request artica/pandorafms!5689
 2023-04-28 06:04:18 +00:00
Pablo Aragon 20ff1692ae 10947-Change color heatmap notinit modules 2023-04-24 15:58:08 +02:00
Jorge Rincon 9ef46ec9d5 #18085 fixed up error message 2023-04-17 08:52:36 +02:00
Matias Didier 250d65d94a Merge branch 'ent-10740-mejoras-en-heatmap' into 'develop' 
Ent 10740 mejoras en heatmap

See merge request artica/pandorafms!5660
 2023-04-13 08:24:18 +00:00
Jonathan 3a96c60bac #10191 new event sound modal 2023-04-11 13:50:11 +02:00
Pablo Aragon b3becfc861 10889-500 acustic console 2023-04-11 10:06:47 +02:00
Daniel Maya dc654c0b6d #10740 heatmap improvements 2023-04-04 15:14:10 +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
Pablo Aragon 3a2cbb7a62 Datatables & styles fix 2023-03-30 16:50:30 +02:00
Pablo Aragon e03e1e45ed Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 12:26:06 +02:00
Pablo Aragon 5e24706f71 Style fix 2023-03-30 12:25:45 +02:00
daniel 1262fee2e8 fixed styles 2023-03-30 08:43:23 +02:00
Diego Muñoz-Reja 35a1c2332d Merge branch 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' into 'develop' 
implemented consoles management

See merge request artica/pandorafms!5558
 2023-03-28 15:33:37 +00:00
Alejandro Campos e909686ddc Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-03-28 14:09:33 +00:00
Pablo Aragon 5969928003 10408-Fix action column & 10398-Events pure mode 2023-03-28 12:39:02 +02:00
daniel ebffb004e9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-27 21:22:06 +02:00
Jonathan ea6aa8629b Module check force 2023-03-27 14:07:36 +02:00
Diego Muñoz-Reja 6bdecc43e7 Merge branch 'ent-8642-nuevo-widget-heatmap' into 'develop' 
Ent 8642 nuevo widget heatmap

See merge request artica/pandorafms!5557
 2023-03-27 10:43:48 +00:00
Daniel Maya e311c81f84 #8642 Fixed meta 2023-03-24 14:11:08 +01:00
daniel 95834b2de7 fixed styles 2023-03-23 12:41:39 +01:00
Pablo Aragon e2820d1ad7 9680-Fix widget 2023-03-23 09:18:39 +01:00
daniel 72c95a6274 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-22 19:12:16 +01:00
Rafael Ameijeiras 4535fb85a3 Merge branch 'ent-10568-14584-Comentarios-no-mostrados-en-eventos' into 'develop' 
fixes in event comments

See merge request artica/pandorafms!5591
 2023-03-22 17:05:54 +00:00
Pablo Aragon b0b2778c4a 10760-Setup 2023-03-22 16:42:03 +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 e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +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
Daniel Cebrian 90f0c3771f #10324 fixed deleted element fav menu 2023-03-13 17:21:28 +01:00
Daniel Cebrian 64cc261483 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 16:48:47 +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
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
daniel dcfaaea016 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-10 14:50:31 +01:00
daniel 8778fcea93 fixed styles 2023-03-10 14:49:38 +01:00
alejandro.campos@artica.es 39a119d150 Merge remote-tracking branch 'origin/develop' into ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob 2023-03-10 13:29:20 +01:00
Jose Gonzalez bb6bf85537 Minor visual fixes 2023-03-10 12:48:31 +01:00
Daniel Cebrian 841478a86c Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida' 
# Conflicts:
#   pandora_console/pandoradb.sql
 2023-03-10 10:41:08 +00:00