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

328 Commits

Author SHA1 Message Date
Daniel Rodriguez 16f2c776f2 Merge branch 'ent-8035-12446-fallos-filtros-personalizados-eventos' into 'develop' 
show only events filter in acl groups

See merge request artica/pandorafms!4451
 2021-10-08 08:09:19 +00:00
marcos d4108c4e8b show only events fetch with user groups 2021-10-07 16:11:23 +02:00
marcos f55a6685bd show only events filter in acl groups 2021-10-07 14:09:02 +02:00
marcos afb9cea67f add new filter fot litghbulb_off 2021-10-07 12:42:58 +02:00
fbsanchez 8c1838abb7 Merge remote-tracking branch 'origin/develop' into ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola 
Conflicts:
	pandora_console/install.php
 2021-09-29 13:47:10 +02:00
fbsanchez fe42a8782b Updated messages in centralised environment status check 2021-09-23 11:16:48 +02:00
Daniel Rodriguez 42700e9033 Merge branch 'ent-7785-input-email-con-fondo-blanco-y-texto-negro' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4284
 2021-09-22 09:10:09 +00:00
Daniel Rodriguez 8a574a2f93 Merge branch 'ent-7920-metacosola-gestion-de-usuarios-locales' into 'develop' 
Re-enabled user management in MC while not in centralised environment

See merge request artica/pandorafms!4369
 2021-08-24 12:28:03 +00:00
fbsanchez 4ff6b8a1bb Re-enabled user management in MC while not in centralised environment 2021-08-23 12:29:17 +02:00
marcos 244d7f6c8b solved conflicts 2021-08-23 08:25:12 +02:00
marcos ff60a4ec62 fixed visual error 2021-07-12 10:58:51 +02:00
fbsanchez 017e12c751 Use metaconsole_access_node to allow or deny access to node for a user created and synchronized from MC 2021-06-25 15:41:34 +02:00
fbsanchez eec373e896 Added link to MC place where user must manage the stuff when in centralised environment and ui_get_meta_url 2021-06-24 19:48:07 +02:00
marcos 716c82bd30 fixed error with pagination user filter 2021-06-16 10:41:12 +02:00
fbsanchez 94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
 2021-06-14 17:37:01 +02: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
Daniel Barbero Martin d91e7f6aba Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-26 08:28:42 +02:00
Daniel Rodriguez f01eec72dc Merge branch 'ent-7460-fallo-visual-en-error-creacion-usuario' into 'develop' 
Fixed visual bug on user creation error

See merge request artica/pandorafms!4088
 2021-05-25 15:51:49 +00:00
Daniel Barbero Martin 6c305833bf fix groups, module_groups, network_components user_edit synch 2021-05-18 17:18:54 +02:00
Daniel Barbero Martin ec6cb4d532 fix category, Os, tags, user_edit synch 2021-05-18 10:57:21 +02:00
Daniel Barbero Martin a0982cd260 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/users/profile_list.php
 2021-05-18 08:39:06 +02:00
Daniel Barbero Martin 4c12c6e770 fix profiles and user synch 2021-05-17 17:57:08 +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
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
Daniel Rodriguez 514a91c853 Merge branch 'ent-6541-quitar-id-usuario-url-seccion-usuario' into 'develop' 
Ent 6541 quitar id usuario url seccion usuario

Closes pandora_enterprise#6541

See merge request artica/pandorafms!3990
 2021-05-10 09:08:59 +00:00
José González ce5934b9a1 Added form-type buttons for user-actions 2021-05-06 14:46:58 +02:00
Calvo 4aea645735 Fixed visual bug on user creation error 2021-04-29 11:15:20 +02:00
marcos 87362d07f4 fixed visual error selects home view 2021-04-13 15:37:44 +02:00
Daniel Rodriguez eeff80638f Merge branch 'ent-3059-revision-de-la-funcion-metaconsole_connect' into 'develop' 
multiple fixes

See merge request artica/pandorafms!3812
 2021-04-12 10:39:41 +00:00
Daniel Rodriguez 8ebaddc233 Merge branch 'ent-6941-Problemas-de-rendimiento-en-la-vista-Manage-users' into 'develop' 
Ent 6941 problemas de rendimiento en la vista manage users

See merge request artica/pandorafms!3799
 2021-04-06 17:33:38 +00:00
Calvo 847fc44b14 Fixed user/profile newline on users_list 2021-03-30 13:34:38 +02:00
fbsanchez a3e571ff50 Merge remote-tracking branch 'origin/develop' into ent-3059-revision-de-la-funcion-metaconsole_connect 
Conflicts:
	pandora_console/godmode/users/user_list.php
 2021-03-26 13:52:01 +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 Rodriguez 51404eda8d Merge branch 'ent-7077-no-funciona-doble-auth-meta' into 'develop' 
Ent 7077 no funciona doble auth meta

See merge request artica/pandorafms!3866
 2021-03-02 12:24:03 +00:00
Luis 93a4a90dd6 Ent 7077 no funciona doble auth meta 2021-03-02 12:24:03 +00:00
Daniel Rodriguez 341fc212d5 Merge branch 'ent-6610-links-ayuda-configuración-metaconsola' into 'develop' 
Removed metaconsole empty help links

See merge request artica/pandorafms!3702
 2021-03-01 10:59:50 +00:00
Daniel Rodriguez 4de4709f9f Merge branch 'ent-6401-Espacio-entre-label-e-ID-en-actualización-de-usuario-metaconsola' into 'develop' 
Ent 6401 espacio entre label e id en actualización de usuario metaconsola

See merge request artica/pandorafms!3701
 2021-03-01 10:50:39 +00:00
fbsanchez 0ddc1929fa multiple fixes 2021-02-02 11:25:26 +01:00
Daniel Maya d9f360016b user_list optimization 2021-01-26 09:06:49 +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 b75d1149e0 Merge branch 'ent-4025-Cambio-de-contrase-en-user-edit-no-pide-contraseña-actual' into 'develop' 
active user password check

See merge request artica/pandorafms!3689
 2020-12-17 16:48:26 +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
Luis Calvo 8fd46b390f Removed metaconsole empty help links 2020-12-09 16:39:00 +01:00
Daniel Maya 631ebcbc2f Added space in User ID 2020-12-09 15:23:16 +01:00
alejandro-campos 8aa18a1236 active user password check 2020-12-02 16:29:45 +01:00
Jose Gonzalez f2a94b9aa5 Merge 2020-12-02 11:38:22 +01:00
Junichi Satoh 75e070ebb0 Fixed UM permission problems. 2020-12-01 16:46:09 +09:00
Luis 734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
marcos 13d90bb1c5 Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-18 12:05:57 +01:00