Commit Graph

647 Commits

Author SHA1 Message Date
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
daniel 35bfd765f3 fix SNMP v3 show realtime charts 2020-11-30 14:26:49 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Rodriguez 8471f170fb Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop'
Fix

See merge request artica/pandorafms!3652
2020-11-25 14:40:38 +01:00
Jose Gonzalez 7187c54730 Fix 2020-11-25 14:33:52 +01:00
Daniel Rodriguez b1fd90ae58 Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop'
Ent 6542 agents alerts view fallos visuales

Closes pandora_enterprise#6542

See merge request artica/pandorafms!3594
2020-11-25 13:35:17 +01:00
Jose Gonzalez f081a6e376 Merge remote-tracking branch 'origin/develop' into ent-6542-agents-alerts-view-fallos-visuales
Merge with last updates
2020-11-23 10:08:16 +01:00
José González 32dcd8a7ca Merge branch 'develop' into 'ent-6398-Poner-ojito-mostrar-passwords'
# Conflicts:
#   pandora_console/include/javascript/pandora_ui.js
2020-11-19 15:21:58 +01:00
Jose Gonzalez d172aad1d2 Fix error with category 2020-11-10 16:51:28 +01:00
Jose Gonzalez 702b5025e9 Ended development 2020-11-10 16:48:09 +01:00
Jose Gonzalez f501d19539 Solved issue with main view 2020-11-10 10:58:06 +01:00
Jose Gonzalez b5dc75ce93 WIP: Backup upload 2020-11-04 16:40:18 +01:00
Daniel Rodriguez 2063849dd0 Merge branch 'ent-6569-Exportado/importado-de-informes' into 'develop'
fix exportation/exportation

See merge request artica/pandorafms!3563
2020-10-30 13:29:04 +01:00
Daniel Rodriguez 83233b6192 Merge branch 'ent-6485-bug-en-la-recursion-de-grupos-del-item-agents-modules-de-informes' into 'develop'
groups_get_children and propagate update

See merge request artica/pandorafms!3545
2020-10-29 12:36:49 +01:00
Daniel Barbero Martin bebac548d3 fix exportation/exportation 2020-10-23 10:47:03 +02:00
fbsanchez 42cca865ac groups_get_children and propagate update 2020-10-21 11:38:57 +02:00
Daniel Maya 0f379a2888 Fixed pagination counter 2020-10-20 12:38:42 +02:00
fbsanchez 2187f9d0c9 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
2020-10-02 14:56:07 +02:00
fbsanchez ea3f147bad minor fixes group selector 2020-10-02 14:31:41 +02:00
daniel 0db539c444 fix visual windows charts 2020-10-01 15:29:54 +02:00
fbsanchez 5d63bc547e Group selection review 2020-09-29 14:22:58 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
Jose Gonzalez 9d0becc012 Added other password fields 2020-09-29 10:12:49 +02:00
fbsanchez f69166bd53 Updates style width group selector 2020-09-28 18:04:46 +02:00
manuel.montes f7fe604914 Fixed entities in resource exporting 2020-08-28 14:43:20 +02:00
Daniel Rodriguez 1adcce21af Merge branch 'ent-5386-9454-Graficas-en-tiempo-real-modulos-snmp-no-funcionan-con-caracteres-especiales-en-comunidad' into 'develop'
fix broken snmp modules real time graphs when community string has certain chars

See merge request artica/pandorafms!3131
2020-06-26 13:28:04 +02:00
alejandro-campos 1243968872 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:12:52 +02:00
alejandro-campos ab61cf1fc5 changed console and audit log locations 2020-06-08 10:48:48 +02:00
Alejandro Fraguas bf66724c9f Merge branch 'ent-5217-websocket-settings-en-open-no-funciona-bien' into 'develop'
Form fixes

See merge request artica/pandorafms!3242
2020-06-08 10:16:58 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
fbsanchez fae026a089 Form fixes 2020-05-26 13:48:43 +02:00
fbsanchez 2ca9e6fb4a 1st approach avoid quick_shell vulnerability (telnet) 2020-04-17 11:18:49 +02:00
alejandro-campos a12851d0a2 fix broken snmp modules real time graphs when community string has certain chars 2020-04-01 16:37:30 +02:00
alejandro-campos 674f2a2873 minor fix: data string not being displayed correctly when module unknown 2020-02-03 18:04:52 +01:00
alejandro-campos d05551f85a fix characters breaking html 2020-02-03 16:17:46 +01:00
Luis Calvo 3d0b71d953 Added enconding to POST variables 2020-01-21 11:05:49 +01:00
Daniel Rodriguez ffce6399b0 Merge branch '5249-Fallo-seguridad-gestor-uploads' into 'develop'
Secured get_file script for unauthorized file download

See merge request artica/pandorafms!2999
2020-01-13 16:46:20 +01:00
Daniel Rodriguez 1cef8aa62f Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop'
Changed the mode of obtain the title

See merge request artica/pandorafms!2743
2020-01-09 16:46:58 +01:00
Jose Gonzalez f6163f4f80 Secured get_file script for unauthorized file download 2020-01-07 17:31:14 +01:00
Luis Calvo 2c37ef4acb dbmanager blankspaces transparent to user 2019-12-20 14:18:48 +01:00
fbsanchez 4631d9ea64 minor style fix 2019-12-16 16:48:29 +01:00
fbsanchez bd1954ce38 Setup Websocket engine, unified 2019-12-13 13:11:38 +01:00
fbsanchez 3b5ebd0bf7 Better quickshell integration and fixes 2019-12-13 11:46:44 +01:00
manuel a799b22a5c Fixed bug in network tools 2019-11-27 14:06:52 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
Tatiana Llorente 15aaf0cae6 Added acl checks to module groups view 2019-11-18 17:18:40 +01:00
fbsanchez 1a7165f751 allow to remove user/pass from quick_shell configuration 2019-11-12 13:19:03 +01:00
fbsanchez e583b71a99 missaligned tips 2019-11-05 11:51:26 +01:00
fbsanchez b1d4bfe149 Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
Conflicts:
	pandora_console/pandoradb_data.sql
2019-11-05 11:16:26 +01:00
Tatiana Llorente c83b85c225 Ent 4801 error informes pdf csv 2019-11-04 18:41:03 +01:00