Commit Graph

662 Commits

Author SHA1 Message Date
marcos ec4f23e502 fixed visual error 2021-03-25 14:36:51 +01:00
Jose Gonzalez 5b1517f767 Merge 2021-03-12 11:07:44 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
José González 69e1f1fb33 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general'
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
#   pandora_console/include/styles/pandora.css
2021-03-09 14:39:15 +00:00
Alejandro Campos 66e4e2b173 Merge branch 'develop' into 'ent-6848-Varios-bugs-en-la-vista-Connected-users'
# Conflicts:
#   pandora_console/extensions/users_connected.php
2021-03-02 16:34:10 +00:00
Luis 29913883ae Fixed connected users seeing all users 2021-01-26 13:35:46 +01:00
Daniel Rodriguez 64ec705f2c Merge branch 'ent-6736-guardia-ticket-10925-omnishell-falla-con-certificados-autofirmados' into 'develop'
allowing self signed certs for quickshell

See merge request artica/pandorafms!3625
2021-01-25 09:26:04 +01:00
Jose Gonzalez 1fc1752b01 Solved merge 2021-01-12 13:26:48 +01:00
Daniel Rodriguez 86794af7b4 Merge branch 'ent-6889-vista-usuarios-aparece-ip' into 'develop'
Removed ip from connected user list

See merge request artica/pandorafms!3741
2021-01-11 18:11:28 +01:00
Daniel Rodriguez 2a2e63fedb Merge branch 'ent-6209-10494-quickshell-duplica-pantalla-en-firefox' into 'develop'
Fix firefox double load of quickshell

See merge request artica/pandorafms!3686
2021-01-04 11:15:26 +01:00
Luis Calvo 69c33b45fa Removed ip from connected user list 2020-12-23 14:33:20 +01:00
Jose Gonzalez 5f0d686034 Changed Network Tools for External Tools 2020-12-18 12:31:44 +01:00
alejandro-campos 7a74ae4d20 changes in connected users view 2020-12-15 17:40:15 +01:00
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
fbsanchez e501b018e4 Fix firefox double load of quickshell 2020-12-02 13:42:23 +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
fbsanchez ea346afcc5 allowing self signed certs for quickshell 2020-11-17 17:06:36 +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