tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-22 18:28:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
33,160 Commits 34 Branches 30 Tags
Commit Graph

2020 Commits

Author SHA1 Message Date
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