Commit Graph

695 Commits

Author SHA1 Message Date
marcos e689813e2c fixed icons 2021-03-16 13:37:13 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Maya c7b33c9c9c Ent 7119 11478 ticket guardia snmp browser falla a la hora de visualizar datos 2021-03-11 11:18:13 +00:00
fbsanchez 95f1a2abcc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
2021-03-11 10:00:17 +01:00
Daniel Rodriguez ea7c7c88b2 Merge branch 'ent-7025-operaciones-masivas-error' into 'develop'
Ent 7025 operaciones masivas error

Closes pandora_enterprise#7025

See merge request artica/pandorafms!3833
2021-03-05 12:49:13 +00:00
Jose Gonzalez e68d2bfe5c Fixed issue with URLs 2021-02-23 14:32:51 +01:00
fbsanchez 85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/include/functions_ui.php
2021-02-22 12:01:29 +01:00
fbsanchez 0fb3ba9232 System status notifications filtered by subtype 2021-02-19 13:36:29 +01:00
Jose Gonzalez dac99fa4c6 Added more clear message 2021-02-19 12:29:48 +01:00
Jose Gonzalez e727f7c276 Added modals and fixed some bugs 2021-02-12 11:28:13 +01:00
Jose Gonzalez 2521b32f13 WIP: Backup upload 2021-02-08 16:33:54 +01:00
fbsanchez 679ada717e filter with preload - filtering improved 2021-02-05 15:10:31 +01:00
fbsanchez 9a439a96e5 filtering interfaces in wizard 2021-02-05 12:37:27 +01:00
fbsanchez dbc48852aa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
2021-01-28 16:12:47 +01:00
fbsanchez d24bcd700d Merge remote-tracking branch 'origin/develop' into ent-6158-mejoras-a-servicios-dinamicos-expresiones-regulares-y-varios-custom-field 2021-01-27 14:08:41 +01:00
fbsanchez c7706a6bfa WIP Historical database manager (setup) 2021-01-27 12:35:37 +01:00
fbsanchez 192a635599 WIP setup.hdb 2021-01-25 19:29:22 +01:00
fbsanchez 186b807ff7 Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery
Conflicts:
	pandora_console/include/styles/wizard.css
2021-01-07 10:50:57 +01:00
Daniel Rodriguez aee7ec4cb2 Merge branch 'ent-6897-estilos-rotos-metaconsola' into 'develop'
Fixed broken styles in meta

See merge request artica/pandorafms!3743
2020-12-24 10:30:01 +01:00
Luis Calvo d8900704ed Fixed broken styles in meta 2020-12-23 17:58:05 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
2020-12-23 06:48:22 +01:00
Daniel Rodriguez ee84644163 Merge branch 'ent-6687-Instalador-en-metaconsola' into 'develop'
fix check install meta

See merge request artica/pandorafms!3666
2020-12-22 13:48:13 +01:00
Daniel Rodriguez ad1ede437c Merge branch 'ent-5983-Bugs-y-cambios-en-el-nuevo-tree-view' into 'develop'
changes in treeview

See merge request artica/pandorafms!3654
2020-12-22 13:02:17 +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
Jose Gonzalez eeac1ca35e Merge 2020-12-02 11:28:46 +01:00
fbsanchez 7c298ae0a8 minor fixes 2020-12-01 17:19:34 +01:00
Daniel Rodriguez f869fbb7cd Merge branch 'ent-6406-No-se-ven-los-datos-string-en-el-tree' into 'develop'
fixed bad module id reference

See merge request artica/pandorafms!3505
2020-12-01 11:55:56 +01:00
fbsanchez 54d5529599 removed duplicated methods (unified in HTML class) added minor improvements 2020-11-30 17:50:36 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Barbero Martin b9c2db9825 fix check install meta 2020-11-27 13:21:14 +01:00
fbsanchez a419c2ec46 Minor fix avoid notice 2020-11-25 20:16:30 +01:00
alejandro-campos 448cc253b4 changes in treeview 2020-11-25 17:00:37 +01:00
alejandro-campos f5648d734d fixed snapshot in meta 2020-11-23 17:09:58 +01:00
Daniel Rodriguez 2718558b29 Merge branch 'ent-6398-Poner-ojito-mostrar-passwords' into 'develop'
Ent 6398 poner ojito mostrar passwords

Closes pandora_enterprise#6398

See merge request artica/pandorafms!3488
2020-11-23 16:17:35 +01:00
Luis 6931e15dd2 Fixed url with blakspace on pagination 2020-11-23 10:40:28 +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 bfa5b81ee8 Added server component status - crash - 2020-10-21 14:03:46 +02:00
Jose Gonzalez 3b14453d1e WIP: Added QueryResult ui type 2020-10-08 13:47:26 +02:00
Jose Gonzalez 00b289a557 Adapt functions for work in Metaconsole 2020-09-29 12:21:52 +02:00
Jose Gonzalez 6a21a668bf Added control for reveal passwords 2020-09-29 09:44:20 +02:00
Daniel Rodriguez b18bbbf237 Merge branch 'ent-3357-7329-comision-europea-ordenar-consolas-por-nombre-en-metaconsola-y-anadir-buscador' into 'develop'
mc search nodes

See merge request artica/pandorafms!3463
2020-09-18 14:37:10 +02:00
fbsanchez 90c7de86a3 RC1 filtering, ordering and pagination in node list view (MC) 2020-09-17 11:42:53 +02:00
fbsanchez 19831f833c more accurate fix 2020-09-14 17:59:41 +02:00
fbsanchez adafaa4db2 Applying date format from configuration to date specification 2020-09-14 17:56:09 +02:00
Alejandro Fraguas 2d25c19a5f Merge branch 'ent-6139-formatos-fecha-no-muestran-bien' into 'develop'
Fixed and added strfdate formats

See merge request artica/pandorafms!3383
2020-08-05 11:51:01 +02:00
daniel fdad32e4f0 Add public link dashboards 2020-07-22 10:56:16 +02:00
Luis Calvo 4b1d586ef0 Fixed and added strfdate formats 2020-07-16 14:07:29 +02:00
Daniel Rodriguez 846fd10ce1 Merge branch 'ent-5824-connection-lost-warn' into 'develop'
Ent 5824 connection lost warn

See merge request artica/pandorafms!3326
2020-07-14 18:10:11 +02:00
Daniel Rodriguez 9d6fff0850 Merge branch 'ent-5369-parseo-de-event-name-en-exportar-elementos' into 'develop'
Deleted columns s, options and m on csv datatables events

See merge request artica/pandorafms!3313
2020-07-10 10:16:34 +02:00
Luis Calvo d3087de163 Merge remote-tracking branch 'origin/develop' into ent-5824-connection-lost-warn 2020-07-06 10:49:24 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
Luis Calvo d346c76322 Connection error dialog working 2020-06-19 23:03:37 +02:00
marcos eed12be281 Deleted columns s, options and m on csv datatables events 2020-06-17 13:05:04 +02:00
fbsanchez 523212afb8 WIP cluster view 2020-05-20 19:04:42 +02:00
fbsanchez 57ccd783b0 Merge branch 'develop' into 'ent-5756-pantallas-de-configuracion-del-cluster' 2020-05-14 17:42:58 +02:00
Alejandro Fraguas e8461e19f3 Merge branch 'ent-5503-pop-up-imagenes-detras-de-un-server-proxy' into 'develop'
change url for pop up reverse proxy

See merge request artica/pandorafms!3168
2020-05-12 12:50:02 +02:00
Tatiana Llorente 1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
marcos e3f1f5fe6e change url for pop up reverse proxy 2020-04-16 13:44:23 +02:00
fbsanchez 3b71297d56 escaped single quotes (wmi) + refresh button 2020-04-14 11:57:18 +02:00
Jose Gonzalez faf7c5462e Applied solution for image size issues in toggle bar 2020-04-01 09:25:18 +02:00
fbsanchez 3a74e25068 PEN management 2020-03-27 11:41:56 +01:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Alejandro Campos b56076044b Merge branch 'develop' into 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado'
# Conflicts:
#   pandora_console/extras/mr/37.sql
2020-03-24 13:55:57 +01:00
alejandro-campos e05c292d7d show last status change of module 2020-03-23 12:47:58 +01:00
alejandro-campos 014688468c changes to show last status change of modules 2020-03-19 15:18:20 +01:00
fbsanchez 32c6e7f30c Minor fixes 2020-03-19 14:26:01 +01:00
alejandro-campos 254225b8ac order alphabetically modules 2020-03-17 14:23:52 +01:00
fbsanchez f3da919abc WIP multiple changes 2020-03-16 23:52:20 +01:00
alejandro-campos 421056e959 Sort modules alphabetically in module select 2020-03-16 14:07:54 +01:00
Luis Calvo c2e608f120 Added cont for module status alert triggered 2020-03-04 12:09:54 +01:00
Daniel Rodriguez 3342b7dd53 Merge branch 'ent-5403-XSS-vistas-por-Nokia-USA' into 'develop'
Fixed XSS vulnerability

See merge request artica/pandorafms!3041
2020-02-04 17:30:21 +01:00
Daniel Maya bf53eb5a6b Fixed XSS vulnerability 2020-01-30 17:29:07 +01:00
alejandro-campos d21068e368 fix to display pandora tab subtitle based on condition and display rebranding product name in case database connection failed 2020-01-24 13:52:09 +01:00
Daniel Rodriguez 738361d237 Merge branch 'ent-4876-pandora_ui.js' into 'develop'
first changes pandora.js to pandora_ui.js

See merge request artica/pandorafms!2909
2020-01-20 09:54:20 +01:00
Luis Calvo 6742881009 Fixed ui message icon bug on meta 2020-01-10 13:16:53 +01:00
Daniel Rodriguez 7bfd29da6f Merge branch 'ent-5183-error-con-logo-de-so-en-informes-pdf-meta' into 'develop'
Fixed bug in pdf metaconsole os icon

See merge request artica/pandorafms!2987
2020-01-07 09:45:56 +01:00
manuel 9e0168cd6c Fixed bug in metaconsole alerts view 2019-12-27 10:24:48 +01:00
Alejandro Fraguas 46f02a6c53 Merge branch 'ent-4935-CSV-eventos-tooltip' into 'develop'
Added tooltip to CSV datatable button

See merge request artica/pandorafms!2881
2019-12-26 12:27:55 +01:00
manuel 58beb51401 Fixed bug in pdf metaconsole os icon 2019-12-23 10:53:33 +01:00
Daniel Rodriguez 24838cad0f Merge branch 'ent-4233-Modificación-en-la-función-genérica-de-render-de-fecha-hora' into 'develop'
Added compact mode to show timestamp - #4233

See merge request artica/pandorafms!2688
2019-12-16 11:48:09 +01:00
Tatiana Llorente b38c396837 Change date in hover in compact mode 2019-12-13 13:40:19 +01:00
Marcos Alconada 888988572a Merge branch 'develop' into 'ent-4876-pandora_ui.js'
# Conflicts:
#   pandora_console/include/javascript/pandora.js
2019-11-27 11:39:11 +01:00
fbsanchez 1b57b279fb minor changes 2019-11-25 13:03:55 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
marcos 1640c03fc3 first changes pandora.js to pandora_ui.js 2019-11-21 16:42:39 +01:00
Luis 41e818334e Ent 4954 urls documentacion soporte al fallar base datos 2019-11-21 11:14:50 +01:00
Alejandro Fraguas 7e8f22b1de Merge branch 'ent-4936-Comillas-dobles-en-comentarios-de-eventos-no-funcionan' into 'develop'
Ent 4936 comillas dobles en comentarios de eventos no funcionan

See merge request artica/pandorafms!2869
2019-11-15 13:20:13 +01:00
Alejandro Fraguas 0199c6312a Merge branch 'ent-4752-Herramientas-de-diagnostico' into 'develop'
refactoriced diagnostics pandoraFMS

See merge request artica/pandorafms!2809
2019-11-14 11:49:23 +01:00
Daniel Rodriguez f844c660af Merge branch 'ent-4766-feedback-de-ayudas' into 'develop'
add feedback

See merge request artica/pandorafms!2813
2019-11-13 13:43:08 +01:00
Daniel Barbero Martin 7103317bc2 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/styles/pandora.css
2019-11-13 12:12:17 +01:00
Luis Calvo f9215af803 Added tooltip to CSV datatable button 2019-11-12 17:33:58 +01:00
Daniel Barbero Martin fa6bc254a1 Fixed errors 2019-11-12 16:22:58 +01:00
fbsanchez 763ec6772c Help feedback style improved 2019-11-07 17:26:32 +01:00
Tatiana Llorente 54c6f3965d Fixed bug with doubles quotes in comments of events 2019-11-07 15:25:19 +01:00
Tatiana Llorente 05e424a24e Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo
Conflicts:
	pandora_console/include/functions_ui.php
2019-11-05 17:25:56 +01:00
Tatiana Llorente 87c5d0025b Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo 2019-11-05 17:24:10 +01:00
Luis b707ebd4a4 Added docs and support urls in console. Fixed bugs 2019-11-05 17:09:29 +01:00
Daniel Rodriguez 0e628a365d Merge branch 'ent-4625-Cambiar-titulo-a-archivo-CSV-de-la-vista-de-eventos' into 'develop'
Ent 4625 cambiar titulo a archivo csv de la vista de eventos

See merge request artica/pandorafms!2783
2019-11-05 16:57:23 +01:00
Marcos Alconada 613e5741fb Merge branch 'develop' into 'ent-4766-feedback-de-ayudas'
# Conflicts:
#   pandora_console/include/functions_ui.php
2019-10-29 17:00:39 +01:00