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

716 Commits

Author SHA1 Message Date
José González 9ab027b286 WIP: Upload 2021-04-29 13:28:03 +02:00
Daniel Rodriguez 7b9c638f0d Merge branch 'ent-7349-error-500-importar-recursos-resource-registration' into 'develop' 
Fix reource registraton error 500 on empty or bad ptr file

See merge request artica/pandorafms!4051
 2021-04-27 11:48:17 +00:00
alejandro.campos@artica.es 1c8e73df9d fixed count in several views 2021-04-21 17:11:32 +02:00
Calvo 888915a1c1 Fix reource registraton error 500 on empty or bad ptr file 2021-04-21 17:04:11 +02:00
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
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
fbsanchez 6478c7a51f minor tips quickshell 2019-10-29 15:55:39 +01:00
fbsanchez 06c7544041 minor fixes 2019-10-29 15:44:46 +01:00
Jose Gonzalez c4c7d916e7 Applying of better way for save config 2019-10-24 17:21:21 +02:00
Jose Gonzalez b0db7c729d Solved minor issues 2019-10-24 16:23:58 +02:00
Jose Gonzalez 742329336e Added link with visual consoles 2019-10-24 14:30:34 +02:00
fbsanchez 045d42d2bb quickShell auth 2019-10-24 12:05:00 +02:00
Jose Gonzalez 29bcd379f7 Added changes for liking with visual consoles 2019-10-24 11:53:35 +02:00
fbsanchez df576a3b86 ws gotty credentials and ws gotty proxy redirection 2019-10-24 10:59:08 +02:00
fbsanchez 709f4cac81 WebSocket configuration, quickShell settings, quickShell proxied url compatibility 2019-10-23 19:56:48 +02:00
fbsanchez 0d67d23cb6 quickShell support for ws_proxy_url 2019-10-23 19:19:38 +02:00
fbsanchez 66ceb93d04 minor changes and init.d script for websocket engine 2019-10-23 15:23:21 +02:00
fbsanchez c963681098 Quick shell telnet improvements 2019-10-21 21:10:26 +02:00
fbsanchez 9d8bb880fa Modular WebSocket engine, added ssh and telnet to quickshell extension 2019-10-21 17:36:50 +02:00
fbsanchez 6c52462c8c Modular WebSocket engine, added ssh and telnet to quickshell extension 2019-10-21 17:36:26 +02:00
fbsanchez e24024d2f4 WS gotty extension - global 2019-10-17 15:31:17 +02:00
fbsanchez 4cceb38762 1st RC WebSocketProxy 2019-10-15 22:16:54 +02:00
fbsanchez 06f8f920b8 wip WS redirection 2019-10-15 17:20:23 +02:00
fbsanchez 3a9e5fa477 wip: gotty redirection experiment p2 2019-10-14 19:33:00 +02:00
fbsanchez 86170b3ad8 experiments 2019-10-14 07:59:29 +02:00
marcos.alconada 93941f334a the itil type is removed in the report types 2019-09-25 16:12:57 +02:00
Jose Gonzalez d7ca703c99 Cleaned the javascript call 2019-09-20 10:53:09 +02:00
Jose Gonzalez 914ac28151 Changed checkboxes for combo multiselect in File repository manager 2019-09-03 12:59:24 +02:00
Tatiana Llorente eaf29b798a Fixed minor visual bugs in black theme- #4194 2019-07-09 15:03:38 +02:00
Alejandro Fraguas 39ac83ae5e Merge branch 'ent-4250-Cambios-de-estilo-pendientes_2' into 'develop' 
Style changes - #4250

See merge request artica/pandorafms!2557
 2019-07-01 10:02:02 +02:00
Alejandro Fraguas 47838a1134 Merge branch 'ent-4213-SNMP-Walk-dede-modulo-creado-no-muestra-parametros-v3' into 'develop' 
Ent 4213 snmp walk dede modulo creado no muestra parametros v3

See merge request artica/pandorafms!2511
 2019-07-01 09:48:33 +02:00
Tatiana Llorente 52f391667a Style changes - #4250 2019-06-28 10:24:53 +02:00
fbsanchez fc0d9463d5 Fixed 2019-06-25 12:07:56 +02:00
fbsanchez 24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +02:00
Daniel Rodriguez a87e3ce97e Merge branch 'ent-3739-Vista-Agent-Module-view-no-funciona-en-pantalla-completa-y-autorefresco' into 'develop' 
Fixed bug in Agent-Module fullscreen view

See merge request artica/pandorafms!2299
 2019-06-18 17:00:15 +02:00
Tatiana Llorente 46f64f75c8 Fixed autorefresh in full screen - #3739 2019-06-18 14:54:40 +02:00
Luis Calvo 9bdf048fae Fixed and refactored duplicated functions SNMP Browser not showing v3 paramethers 2019-06-17 16:39:27 +02:00