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

1395 Commits

Author SHA1 Message Date
Marcos Alconada d6ecce1ce9 fixed visual error 2021-06-21 14:06:29 +00:00
José González 00d4f0c57d Clean code and fix issue with lateral main menu 2021-06-16 15:29:28 +02:00
fbsanchez 9ed895d457 Fixes in pie coauth: daniel 2021-06-16 11:41:57 +02:00
Daniel Rodriguez 08011d60b2 Merge branch 'ent-7122-nuevo-update-manager' into 'develop' 
Embebed UMC in Pandora FMS

See merge request artica/pandorafms!3894
 2021-06-14 11:56:43 +00:00
fbsanchez cdad04f9cd Update the DB schema when upgrading from RPMs. 
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
 2021-06-14 11:56:42 +00:00
marcos 1165ea11b9 cambio de fuentes css 2021-06-10 17:42:39 +02:00
marcos 45667da362 cambio de fuentes css 2021-06-10 16:21:06 +02:00
marcos e75abd1d2f cambio de fuentes css 2021-06-10 16:13:45 +02:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
Daniel Rodriguez d58e9f634a Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop' 
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4132
 2021-06-09 13:59:29 +00:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Marcos Alconada 8814b1f971 changed icons for black theme 2021-06-09 13:12:47 +00:00
Marcos Alconada 3bc2844b4d fixed visual error black theme 2021-06-04 11:03:35 +00:00
marcos 29f1a8a720 resolve merge conflcit 2021-05-28 08:10:14 +02:00
Daniel Rodriguez 791f007ff6 Merge branch 'ent-7502-11735-problemas-visuales-tema-oscuro' into 'develop' 
fixed visual error on alerts black theme

See merge request artica/pandorafms!4113
 2021-05-27 16:22:19 +00:00
Marcos Alconada e2cfc5d615 fixed visual error on alerts black theme 2021-05-27 16:22:19 +00:00
Daniel Rodriguez f93ff84123 Merge branch 'ent-7474-boton-descolocado-en-modal-de-update-online-open' into 'develop' 
fixed visual error with update manager online open

See merge request artica/pandorafms!4105
 2021-05-27 16:17:47 +00:00
Marcos Alconada 87dd11f99c fixed visual error with update manager online open 2021-05-27 16:17:47 +00:00
marcos 403f326f55 resolve merge conflcit 2021-05-27 09:57:06 +02:00
Luis 8c100e8809 Resize vertical on textarea web/data server modules css 2021-05-26 13:39:25 +00:00
Daniel Rodriguez 305941bb1d Merge branch 'ent-7361-fallos-visuales-agent-alerts' into 'develop' 
Fixed visual issues

Closes pandora_enterprise#7361

See merge request artica/pandorafms!4061
 2021-05-25 15:52:22 +00:00
Daniel Rodriguez d4dceb0a6c Merge branch 'ent-7344-Selector-de-Dashboards-desplazado' into 'develop' 
Ent 7344 selector de dashboards desplazado

See merge request artica/pandorafms!4089
 2021-05-25 15:51:16 +00:00
Daniel Maya e6713c2f2c #6917 metaconsole config changes 2021-05-25 09:58:18 +00:00
fbsanchez 26acafac47 Alert correlatioin some improvements 2021-05-21 12:57:48 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
Daniel Rodriguez 13fa1159ce Merge branch 'ent-6858-Goliat-opensource' into 'develop' 
Backup upload

See merge request artica/pandorafms!3936
 2021-05-12 13:10:48 +00:00
Daniel Rodriguez ed4e89a4d0 Merge branch 'ent-7517-11735-fallo-graficas-snmp-interface-en-vista-de-agente-con-black-theme' into 'develop' 
fixed visual error on snmp interfaces agent graphs  black theme

See merge request artica/pandorafms!4119
 2021-05-12 12:52:44 +00:00
Marcos Alconada f8eafa5015 fixed visual error on snmp interfaces agent graphs black theme 2021-05-12 12:52:44 +00:00
Daniel Rodriguez 858adb2628 Merge branch 'ent-7345-Bugs-en-el-apartado-de-Diagnosticos' into 'develop' 
Fixed errors diagnostic

See merge request artica/pandorafms!4047
 2021-05-11 13:48:55 +00:00
José González 5aa5e9eab4 Merge branch 'develop' into 'ent-6858-Goliat-opensource' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-05-11 13:11:51 +00:00
Daniel Rodriguez f77d774a32 Merge branch 'ent-7476-black-theme-color-letra-en-el-control-de-busqueda-de-usuarios-no-se-ve' into 'develop' 
fixed visual error black theme

See merge request artica/pandorafms!4100
 2021-05-11 07:39:58 +00:00
Daniel Rodriguez de58f0533b Merge branch 'ent-6618-giss-nombres-de-servicios-aleatorios' into 'develop' 
Ent 6618 giss nombres de servicios aleatorios

See merge request artica/pandorafms!4039
 2021-05-11 07:37:49 +00:00
Marcos Alconada 8f324b942b fixed visual error black theme event modal 2021-05-10 09:16:19 +00:00
alejandro.campos@artica.es fdeaf52912 implemented user level authentication for integria ims integration 2021-05-07 14:29:29 +02:00
marcos 25867a0fd7 fixed visual error black theme 2021-05-05 09:36:16 +02:00
Marcos Alconada c5fe67ddb5 fixed visual error black theme 754 LTS 2021-04-30 10:43:22 +00:00
Daniel Maya 588e06d357 #7344 fixed select 2021-04-29 12:45:35 +02:00
Marcos Alconada b00e7eff8b fixed size with select2 in module component 2021-04-28 10:48:32 +00:00
marcos f818b86827 fixed minnor error black theme 7376 2021-04-23 09:56:06 +02:00
José González b922de7a8e Fixed visual issues 2021-04-22 17:10:59 +02:00
Daniel Barbero Martin 998ad91b69 Fixed errors diagnostic 2021-04-21 11:07:20 +02:00
Daniel Barbero Martin eb5704a660 Fixed errors widgets background black-theme and required group 2021-04-21 08:57:12 +02:00
marcos 3ab970ced9 fixed visual error on tm 2021-04-20 12:41:21 +02:00
Daniel Maya a05c5cf555 #6618 Added random name css 2021-04-20 11:46:33 +02:00
vgilc 3c7fc18abb Merge branch 'ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas' into 'develop' 
reviewing correlated alerts

See merge request artica/pandorafms!4024
 2021-04-20 07:56:04 +00:00
fbsanchez 0a6fd37913 minor style change 2021-04-19 14:51:22 +02:00
fbsanchez 50f580c112 Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-19 14:35:59 +02:00
marcos 6ebb6f6843 fixeed visual error vc legacy mode 2021-04-19 12:59:52 +02:00
Daniel Rodriguez 8cc4ddc9e0 Merge branch 'ent-7293-bug-visual-selector-ip-agente' into 'develop' 
Agent conf ip selector visual fix

See merge request artica/pandorafms!4030
 2021-04-15 14:53:32 +00:00
fbsanchez 3bc8f6c4ac Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-15 15:33:14 +02:00
Daniel Rodriguez 4c46caac72 Merge branch 'ent-4263-idgets-dashboard-en-black-them-que-falta-por-adaptar' into 'develop' 
Ent 4263 idgets dashboard en black them que falta por adaptar

See merge request artica/pandorafms!4031
 2021-04-15 12:36:58 +00:00
marcos 48cc1283cc add black theme to widget dashboard 2021-04-14 15:09:19 +02:00
marcos b6ea565118 add black theme to widget dashboard 2021-04-14 12:07:38 +02:00
Daniel Rodriguez 1d6c7c6eed Merge branch 'ent-6782-revision-general-de-la-consola-movil' into 'develop' 
SAML login in mobile console

See merge request artica/pandorafms!3733
 2021-04-14 07:39:29 +00:00
Calvo 3396af66b0 Agent conf ip selector visual fix 2021-04-14 09:26:19 +02:00
fbsanchez 1b4251cf49 minor improvement, disabledElements 2021-04-12 20:10:58 +02:00
fbsanchez 6a220208b4 reviewing correlated alerts 2021-04-12 19:16:39 +02:00
Marcos Alconada dafa88c27d Ent 7266 black theme mala implementacion de vista de ticket integracion integria 2021-04-09 10:00:11 +00:00
Marcos Alconada 225f183e75 set black theme custom graph colors 2021-04-09 09:52:28 +00:00
Daniel Rodriguez ae655da711 Merge branch 'ent-7270-black-theme-vista-servicios' into 'develop' 
add black theme style on visual map

See merge request artica/pandorafms!4008
 2021-04-09 09:34:59 +00:00
Daniel Rodriguez bda9cbe3e8 Merge branch 'ent-7256-modal-de-aviso-de-perdida-de-soporte-ha-perdido-los-estilos' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3994
 2021-04-09 09:28:25 +00:00
fbsanchez cf6ad584d4 Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil 2021-04-07 17:46:43 +02:00
Daniel Rodriguez b62dc5c0c2 Merge branch 'ent-6982-Bug-al-crear-Agent-event-report-a-traves-de-wizard' into 'develop' 
fixed visual error report wizard

See merge request artica/pandorafms!3896
 2021-04-07 15:10:32 +00:00
daniel d78c276721 fixed visual error report wizard 2021-04-07 15:10:32 +00:00
marcos 4395f21e4e add black theme style on visual map 2021-04-07 13:27:24 +02:00
Daniel Rodriguez ed6fa1a803 Merge branch 'ent-2685-7938-aadcm-dashboards-en-metaconsola' into 'develop' 
dashboards meta

See merge request artica/pandorafms!3840
 2021-04-07 10:53:31 +00:00
Daniel Rodriguez f0870e6e08 Merge branch 'ent-7028-giss-implementar-dropdown-buscador-para-custom-fields' into 'develop' 
select2 on select items

See merge request artica/pandorafms!3836
 2021-04-07 10:52:07 +00:00
fbsanchez 6e4212129b Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil 
Conflicts:
	pandora_console/include/styles/dashboards.css
	pandora_console/mobile/operation/visualmap.php
	pandora_console/mobile/operation/visualmaps.php
 2021-04-07 10:28:44 +02:00
Daniel Rodriguez 0fc3cb8714 Merge branch 'ent-6271-mejoras-de-ui-en-setup' into 'develop' 
Multicolumn setup for performance and visual settings

See merge request artica/pandorafms!3921
 2021-04-06 17:47:39 +00:00
fbsanchez 5143bbdfdb networkmaps in dashboards MC 2021-04-06 16:47:32 +02:00
marcos 78ce8660c9 fixed visual error 2021-04-05 17:27:40 +02:00
fbsanchez 700817acaf Merge branch 'develop' into 'ent-2685-7938-aadcm-dashboards-en-metaconsola' 
Conflicts:
   pandora_console/include/functions_html.php
 2021-03-31 10:12:36 +00:00
marcos 063bbb4433 resolved conflict merge 2021-03-30 11:31:29 +02:00
Daniel Rodriguez 17c923a68b Merge branch 'ent-7204-error-visual-en-agents-module' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3954
 2021-03-26 09:32:08 +00:00
Daniel Barbero Martin 9dd7ee7cbc fixed minor error 2021-03-26 09:15:05 +01:00
Daniel Rodriguez 6413f6d551 Merge branch 'ent-4755-base-de-datos-historico-revision' into 'develop' 
DBMainainer, fixed Websockets library placement

See merge request artica/pandorafms!3797
 2021-03-25 14:33:31 +00:00
Daniel Rodriguez 26577095d7 Merge branch 'ent-7193-submenu-ocultado-en-arbol-de-discovery' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3939
 2021-03-25 14:08:35 +00:00
marcos b8a72f0583 fixed visual error 2021-03-25 14:42:34 +01:00
marcos ec4f23e502 fixed visual error 2021-03-25 14:36:51 +01:00
marcos b7f845a64d fixed visual error 2021-03-25 14:27:41 +01:00
fbsanchez f046069de1 old-school style setup 2021-03-24 17:49:42 +01:00
José González 9918e7c3cd Merge branch 'develop' into 'ent-6858-Goliat-opensource' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-03-24 15:50:12 +00:00
fbsanchez 0179e89740 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-24 13:16:54 +01:00
marcos eaed8aa09a fixed visual error 2021-03-24 13:10:29 +01:00
daniel 774fc9ebe5 Command center 2021-03-24 11:43:51 +00:00
Daniel Rodriguez 61ae461ffe Merge branch 'ent-6660-vistas-de-servicios-por-nombre-o-descripcion' into 'develop' 
add tooltip service name

See merge request artica/pandorafms!3783
 2021-03-23 15:55:28 +00:00
Marcos Alconada 302df228cc add tooltip service name 2021-03-23 15:55:28 +00:00
Jose Gonzalez d43c51cc66 WIP: Backup upload 2021-03-22 17:37:15 +01:00
marcos b6c02bd95c fixed visual error 2021-03-22 15:21:09 +01:00
Daniel Rodriguez 390d9df706 Merge branch 'ent-7173-Iconos-de-creacion-de-items-en-consolas-visuales-apenas-se-ven' into 'develop' 
fixed visuals errors black theme

See merge request artica/pandorafms!3937
 2021-03-22 12:48:39 +00:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
 2021-03-22 09:59:07 +01:00
Daniel Barbero Martin 6d6b9fe5b9 fixed visuals errors black theme 2021-03-18 17:32:21 +01:00
marcos bfaaba9dbd fixed spinner bug 2021-03-18 12:08:02 +01:00
marcos 13575a457c fixed visual error 2021-03-18 10:35:19 +01:00
Daniel Rodriguez 3eb6a8b3c4 Merge branch 'ent-7125-bug-visual-en-group-view' into 'develop' 
fixed visual error group view

See merge request artica/pandorafms!3897
 2021-03-17 15:22:01 +00:00
fbsanchez 2862afb7f5 Multicolumn setup for performance and visual settings 2021-03-16 13:00:24 +01:00
marcos de716ddc4a fixed visual error group view 2021-03-12 11:55:54 +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