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

1498 Commits

Author SHA1 Message Date
Jonathan ae526d5df0 #10598 New wizard welcome 2023-05-23 16:54:40 +02:00
Matias Didier 59a4920877 Merge branch 'ent-11221-15587-se-visualizan-componentes-de-otros-grupos' into 'develop' 
Ent 11221 15587 se visualizan componentes de otros grupos

See merge request artica/pandorafms!5917
 2023-05-23 14:27:13 +00:00
Diego Muñoz-Reja 98344296aa Merge branch 'ent-10719-wrong-macro-description-of-plugin-module-with-snmp-wizard' into 'develop' 
Fixed encoding multibyte characters

See merge request artica/pandorafms!5611
 2023-05-22 14:14:53 +00:00
Daniel Cebrian a6415b1d8e #11281 fixed agent installer 2023-05-22 10:45:26 +02:00
Jonathan cebe92296b #11001 fix languaje tips window 2023-05-18 16:32:30 +02:00
Daniel Rodriguez e696fddb48 Merge branch 'ent-11214-deploy-agent-wizard' into 'develop' 
Ent 11214 deploy agent wizard

See merge request artica/pandorafms!5897
 2023-05-18 11:34:36 +00:00
Daniel Rodriguez 00983dfe16 Merge branch 'ent-11176-no-funciona-debug-de-modulos-web' into 'develop' 
Ent 11176 no funciona debug de modulos web

See merge request artica/pandorafms!5888
 2023-05-18 11:19:34 +00:00
Daniel Cebrian 6a2210b0d5 #11221 fixed filter in Module Template Manager 2023-05-17 14:51:54 +02:00
Rafael Ameijeiras 4d3fe02601 Merge branch 'ent-11155-guardia-15439-problemas-al-carga-la-vista-de-tips' into 'develop' 
Ent 11155 guardia 15439 problemas al carga la vista de tips

See merge request artica/pandorafms!5866
 2023-05-16 14:17:21 +00:00
Daniel Rodriguez e2ef02081a Merge branch 'ent-11179-15577-errores-en-varios-widgets-de-dashboard' into 'develop' 
Ent 11179 15577 errores en varios widgets de dashboard

See merge request artica/pandorafms!5884
 2023-05-16 09:43:38 +00:00
miguel angel rasteu 478f9d3b68 #11214 Add link to deploy mac agent 2023-05-16 09:32:35 +02:00
Daniel Cebrian 5195c6acaf #11176 fixed dialog debug module 2023-05-11 15:39:58 +02: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
Matias Didier 62b4ffb30b Merge branch 'ent-10591-vista-auditoria-gif-cargando-infinito' into 'develop' 
Ent 10591 vista auditoria gif cargando infinito

See merge request artica/pandorafms!5757
 2023-05-11 11:52:53 +00:00
Daniel Maya 45d6f2b5f5 #11179 Fixed heatmap and latest events 2023-05-11 12:05:00 +02:00
Daniel Maya 9861aa527c #11155 Fixed language 2023-05-09 15:25:15 +02:00
Pablo Aragon 886bde919b 11135-Move js code from ui_print_datatable 2023-05-08 14:25:57 +02:00
Daniel Rodriguez 9b69ec4393 Merge branch 'ent-10179-wizard-deploy-agentes' into 'develop' 
Ent 10179 wizard deploy agentes

See merge request artica/pandorafms!5692
 2023-05-04 14:37:48 +00:00
Alejandro Campos 9e1caceb11 Merge branch 'develop' into 'ent-10908-Fallo-en-el-editor-de-tips' 
# Conflicts:
#   pandora_console/extras/mr/63.sql
 2023-05-03 07:11:28 +00:00
Alejandro Campos 539ff07aec Merge branch 'develop' into 'ent-10179-wizard-deploy-agentes' 
# Conflicts:
#   pandora_console/include/styles/pandora.css
 2023-04-28 08:07:10 +00:00
Diego Muñoz-Reja 3e0c06b4b7 Merge branch 'ent-10769-Errores-en-Trap-console-y-Trap-editor' into 'develop' 
several minor fixes

See merge request artica/pandorafms!5638
 2023-04-26 08:57:03 +00:00
alejandro.campos@artica.es ee5f79bb7a change text 2023-04-25 09:16:48 +02:00
Pablo Aragon 20ff1692ae 10947-Change color heatmap notinit modules 2023-04-24 15:58:08 +02:00
Matias Didier d7ee0ca2da Merge branch 'ent-10910-a-veces-se-ven-las-bolas-de-los-mapas-de-red-con-fondo-negro' into 'develop' 
Ent 10910 a veces se ven las bolas de los mapas de red con fondo negro

See merge request artica/pandorafms!5736
 2023-04-24 10:44:21 +00:00
alejandro.campos@artica.es a453ed7cea changes regarding encoding of tables 2023-04-21 15:16:51 +02:00
miguel angel rasteu c70082e12d Fix limit in SQL query 2023-04-21 09:40:14 +02:00
alejandro.campos@artica.es 6dfbe394a4 fixed custom oids 2023-04-20 19:15:32 +02:00
Rafael Ameijeiras f2be417a5e Merge branch 'ent-10955-fallos-de-estilos-en-discovery-netscan' into 'develop' 
Ent 10955 fallos de estilos en discovery netscan

See merge request artica/pandorafms!5739
 2023-04-20 08:32:37 +00:00
Diego Muñoz-Reja 07cc7372b8 Merge branch 'ent-10339-15025-Filtro-de-busqueda-de-SNMP-console-no-funciona' into 'develop' 
fixed free string search

See merge request artica/pandorafms!5690
 2023-04-20 08:03:23 +00:00
alejandro.campos@artica.es a73c8347ed changed icons 2023-04-20 10:01:35 +02:00
miguel angel rasteu b7a7b4b597 Fix js code line that forced the selected version to 1 2023-04-20 09:09:34 +02:00
alejandro.campos@artica.es b293587aa9 implemented agent deploy wizard 2023-04-19 19:25:22 +02:00
alejandro.campos@artica.es 9553c42496 implemented agent deploy wizard 2023-04-19 19:21:38 +02:00
Jorge Rincon e1e72ca882 #10955 Fixed Netscan styling bugs. Group, module templates, Description 2023-04-19 15:51:51 +02:00
Matias Didier 53c69f1176 Merge branch 'ent-10926-falta-boton-add-en-manage-scan-scripts' into 'develop' 
Ent 10926 falta boton add en manage scan scripts

See merge request artica/pandorafms!5715
 2023-04-19 10:51:00 +00:00
Diego Muñoz-Reja 60f895c2c7 Merge branch 'ent-10550-parametros-snmp-perduran-al-cambiar-opciones-en-credential-store' into 'develop' 
Ent 10550 parametros snmp perduran al cambiar opciones en credential store

See merge request artica/pandorafms!5651
 2023-04-19 08:18:14 +00:00
Diego Muñoz-Reja 541de77b17 Merge branch 'ent-10585-diagnostic-info-no-tiene-en-cuenta-los-path-personalizados' into 'develop' 
Ent 10585 diagnostic info no tiene en cuenta los path personalizados

See merge request artica/pandorafms!5571
 2023-04-19 08:09:42 +00:00
Daniel Maya b39f4a2f04 #10910 Fix old image 2023-04-18 15:14:40 +02:00
Matias Didier e4fd12f6de Merge branch 'ent-10067-anadir-filtro-alerts-triggered-en-tree-view-y-widget-tree-view' into 'develop' 
Ent 10067 anadir filtro alerts triggered en tree view y widget tree view

See merge request artica/pandorafms!5662
 2023-04-17 11:06:10 +00:00
Pablo Aragon 0fa03f28b3 10067-Alerts triggered filter tree view 2023-04-16 20:21:29 +02:00
Jonathan bc8528f511 #10926 fix visual - add button add netscanscripts 2023-04-13 11:49:10 +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
daniel 07207ea8af fix size icons wizard snmp pandora_enterprise#10901 2023-04-12 14:07:31 +02:00
alejandro.campos@artica.es 5f0e9aac69 fixed free string search 2023-04-11 13:48:08 +02:00
alejandro.campos@artica.es 472c342f81 fixed collation compatibily with older mysql versions 2023-04-11 11:24:42 +02:00
Pablo Aragon 8c1fa4b245 10835-Logs icons 2023-04-10 14:16:15 +02:00
Pablo Aragon 8dfb01c7da 10854-Break word SNMP Console trap 2023-04-10 10:26:15 +02:00
Pablo Aragon 5f6213f0f0 10863-Buttons Network maps 2023-04-05 14:15:23 +02:00
Daniel Maya 91f2336ff4 #10740 heatmap improvements 2 2023-04-05 12:25:33 +02:00
Pablo Aragon 73d7345844 10067-Alerts triggered filter tree view 2023-04-05 09:14:01 +02:00
Daniel Maya dc654c0b6d #10740 heatmap improvements 2023-04-04 15:14:10 +02:00
Pablo Aragon fdcdde6c78 10550-Credential store clean snmp fields 2023-04-03 15:35:46 +02:00
Rafael Ameijeiras 2a5bf21621 Merge branch 'ent-10793-fallo-de-filtro-en-welcome-tips' into 'develop' 
Ent 10793 fallo de filtro en welcome tips

See merge request artica/pandorafms!5626
 2023-04-03 10:19:11 +00: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
Jonathan ace79d3ac1 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 10:26:36 +02:00
Jonathan da08d4e802 SNMP Wizard visual changes 2023-03-30 10:26:29 +02:00
daniel 1262fee2e8 fixed styles 2023-03-30 08:43:23 +02:00
daniel 6a6c99dcab fixed styles 2023-03-29 16:31:25 +02:00
daniel 5d952a83fe fixed styles 2023-03-29 12:39:23 +02:00
daniel ebffb004e9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-27 21:22:06 +02:00
Pablo Aragon 55ff0e0597 wux and wmi 2023-03-27 17:03:38 +02:00
Daniel Maya e311c81f84 #8642 Fixed meta 2023-03-24 14:11:08 +01:00
Daniel Cebrian 31fd4a616c #10793 fixed pagination filter 2023-03-23 16:36:06 +01:00
Daniel Cebrian d3408442d3 #10793 fixed collation in sql 2023-03-23 16:25:08 +01:00
Daniel Maya 52231615f6 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-23 11:51:54 +01:00
Pablo Aragon b0b2778c4a 10760-Setup 2023-03-22 16:42:03 +01:00
daniel 64fc4bcd46 fixed styles 2023-03-21 14:06:28 +01:00
Daniel Cebrian bb794d603b fixed button create tips and icon remove 2023-03-17 09:13:00 +01:00
daniel 3f09fd16a7 fixed styles 2023-03-16 18:51:54 +01:00
Jose Gonzalez bbb1855d81 External Tools 2023-03-16 17:38:51 +01:00
Daniel Cebrian 20b177d121 changed in welcome tips forms 2023-03-16 17:23:48 +01:00
daniel a22b5479d9 fixed styles 2023-03-16 16:48:03 +01:00
Jonathan f417772642 TipsWindow blacktheme 2023-03-16 13:31:16 +01:00
KANAYAMA Akihiro 6ad160685b Fixed encoding multibyte characters 2023-03-16 19:55:41 +09:00
Pablo Aragon 797f43ff3c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 15:58:34 +01:00
Pablo Aragon bed1e34fd2 Dashboards widgets 2023-03-15 15:58:28 +01:00
Jonathan 19b295060b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 13:53:34 +01:00
Jonathan 17ba51d2bf cluster view 2023-03-15 13:53:23 +01:00
Daniel Cebrian c346aefeaa #10685 changed in system fav, tips and Tactical group view 2023-03-15 12:46:09 +01:00
Daniel Maya a7a283fe22 #8642 Fixed heatmap widget 2023-03-14 12:52:44 +01:00
Daniel Maya 62d1249fe0 #8642 Added heatmap widget 4 2023-03-14 12:47:10 +01:00
Jose Gonzalez 3ab0b1c4cb Minor fixes 2023-03-14 08:04:48 +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
Daniel Maya 0e4d423825 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-13 15:17:18 +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
daniel 0643b4e0ba fixed styles 2023-03-13 12:19:27 +01:00
Jonathan 80076434b3 SNMP visual fix staticts 2023-03-13 10:29:03 +01:00
daniel dcfaaea016 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-10 14:50:31 +01:00
daniel 3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
Daniel Maya 030a37a5da Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-10 12:19:00 +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
Jose Gonzalez 3f884d9aff Tree View fixed 2023-03-10 11:09:36 +01:00
Jose Gonzalez edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
daniel 9aa5d76963 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-09 20:00:32 +01:00
daniel 312efeaa1e Merge branch 'ent-10281-descuadre-vista-snmp-console' into 'develop' 
Ent 10281 descuadre vista snmp console

See merge request artica/pandorafms!5526
 2023-03-09 18:59:36 +00:00
Rafael Ameijeiras bcc1775b1b Merge branch 'ent-10350-GISS-Pierden-acceso-a-Metaconsola-mientras-dura-la-ejecucion-de-pandoradb' into 'develop' 
handling synchronizer instantiation when metaconsole is merging

See merge request artica/pandorafms!5580
 2023-03-09 15:28:20 +00:00
Pablo Aragon cbc05f7ea0 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 15:15:06 +01:00
Pablo Aragon 2a97b26cfe Admin tools 2023-03-09 15:14:47 +01:00
Rafael Ameijeiras 6ecb49bbda Merge branch 'ent-10548-No-se-puede-acceder-a-las-colecciones-del-satalite' into 'develop' 
fixed license check

See merge request artica/pandorafms!5585
 2023-03-09 08:05:51 +00:00
Jonathan 69cc3bbd22 #10281 snmp browser details view 2023-03-09 08:37:58 +01:00
daniel e21d9968e8 fixed styles 2023-03-08 19:25:25 +01:00
Pablo Aragon bb1d9c323d Admin tools 2023-03-08 17:12:15 +01:00
Pablo Aragon 87e82c0410 10457-Audit log, save/load filters 2023-03-08 15:30:48 +01:00
Daniel Cebrian 11250bd59b Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-08 13:00:18 +01:00
Daniel Cebrian abf8792ec9 #9073 fixed error error for multiple io_safe_input 2023-03-08 09:13:04 +01:00
Daniel Cebrian 27005158ba #9073 resolve conflics and bugs 2023-03-07 17:57:09 +01:00
Jose Gonzalez 5925cb0b2c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 17:50:57 +01:00
Jose Gonzalez 2dbc2e801f Minor icon fixes 2023-03-07 17:24:36 +01:00
alejandro.campos@artica.es 7e5dee5418 fixed license check 2023-03-07 16:27:14 +01:00
Pablo Aragon 3ecbf1e4fa Alerts 2023-03-07 16:17:01 +01:00
Pablo Aragon d529e6f384 Alerts 2023-03-07 15:59:36 +01:00
Daniel Cebrian a4634717d8 Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-07 13:49:39 +01:00
Jose Gonzalez 28a003706b Action messages in modals 2023-03-07 12:50:09 +01:00
daniel c3a297e096 fixed styles 2023-03-07 12:18:51 +01:00
Jose Gonzalez 8f2a2f12c6 Templates view 2023-03-07 11:48:14 +01:00
Jose Gonzalez 70cf44cb8f Module Templates 2023-03-07 11:15:58 +01:00
Jose Gonzalez e860dea8ca Manage agent groups 2023-03-07 09:41:24 +01:00
Jose Gonzalez d9913818cb Private Enterprise Numbers minor fixes 2023-03-06 23:47:05 +01:00
daniel 70d2223a46 fixed styles 2023-03-06 17:51:49 +01:00
alejandro.campos@artica.es f47e2dda8c handling synchronizer instantiation when metaconsole is merging 2023-03-06 17:27:21 +01:00
daniel 5ba9e0e9aa fixed styles 2023-03-06 16:21:10 +01:00
Jose Gonzalez e33a9bc3e4 Services TreeView 2023-03-06 13:32:21 +01:00
Daniel Cebrian 6a54b814f3 #9073 added arrow images and fixed format php 2023-03-06 13:07:39 +01:00
Jose Gonzalez 3c1c14576e Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-06 11:34:10 +01:00
Jose Gonzalez e4f63206eb Network maps minor fixes 2023-03-06 11:33:42 +01:00
Jose Gonzalez 6a35eb9950 Network map minor fixes 2023-03-06 11:12:59 +01:00
Jose Gonzalez c48ec28743 Minor fixes 2023-03-06 10:35:34 +01:00
Pablo Aragon f77f635b8d div>ul>li styles 2023-03-06 10:09:21 +01:00
daniel f6e063b981 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/include/class/SnmpConsole.class.php
 2023-03-06 08:09:29 +01:00
Jimmy Olano 6b55c65330 Merge branch 'ent-10092-14739-peticion-de-filtro-en-widget-tree-view' into 'develop', JJOS. 
Ent 10092 14739 peticion de filtro en widget tree view

See merge request artica/pandorafms!5532
 2023-03-05 22:56:35 +00:00
daniel 08dca1a83c fixed styles 2023-03-05 13:46:27 +01:00
Jimmy Olano aea0aa3fb9 Merge branch 'ent-10282-desactivar-la-edicion-de-traps-en-la-version-open' into 'develop', JJOS. 
Draft: Ent 10282 desactivar la edicion de traps en la version open

See merge request artica/pandorafms!5483
 2023-03-03 14:00:40 +00: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
daniel 310ad88707 fixed styles 2023-03-02 19:25:31 +01:00
Pablo Aragon 816f0f4770 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 17:10:01 +01:00
Pablo Aragon 0e9f7331db Ipam 2023-03-02 17:08:47 +01:00
daniel 5f8e9a3e3c fixed styles 2023-03-02 12:46:47 +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 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
Daniel Maya a19856b18d 10585 Fixed server log dir 2023-02-27 17:43:21 +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