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

350 Commits

Author SHA1 Message Date
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
fbsanchez 8202839888 warn while updating user admin > standar 2020-11-03 10:14:17 +01:00
fbsanchez 5ddb3f4421 title for dialog (user form) 2020-11-03 10:11:18 +01:00
fbsanchez 8b01565948 Avoid confirm dialog while profiles are assigned to user 2020-11-03 10:08:23 +01:00
fbsanchez 20fa959a0c Merge remote-tracking branch 'origin/develop' into ent-6577-creacion-de-usuario-con-global-profile-administrator-no-deberia-necesitar-anadirle-mas-perfiles 
Conflicts:
	pandora_console/godmode/users/configure_user.php
 2020-10-29 17:26:05 +01:00
fbsanchez f2143545b3 Able to create users without profile assignment 2020-10-22 13:35:42 +02:00
Daniel Maya 335e74c26b Fixed warning message in metaconsole 2020-10-22 09:53:59 +02:00
marcos 848f60229a updates on 2FA all users feature 2020-10-06 17:02:58 +02:00
Daniel Maya a07f1d891f Ent 6262 um operaciones masivas 2020-09-23 11:36:15 +02:00
Daniel Rodriguez 12bc9e2b4e Merge branch 'ent-6195-10482-entities-en-tabla-de-auditoria' into 'develop' 
Ent 6195 10482 entities en tabla de auditoria

See merge request artica/pandorafms!3411
 2020-09-23 09:38:29 +02:00
Daniel Rodriguez cc62975202 Merge branch 'ent-6118-create-user-user-id' into 'develop' 
Ent 6118 create user user

See merge request artica/pandorafms!3444
 2020-09-22 10:09:59 +02:00
Daniel Rodriguez d450213b95 Merge branch 'ent-6322-10688-edicion-usuarios-tecla-intro-borra-perfil' into 'develop' 
Avoid deleting profiles while pressing enter in user details (management)

See merge request artica/pandorafms!3456
 2020-09-18 14:35:32 +02:00
fbsanchez adceae8dda minor fixes 2020-09-18 09:40:26 +02:00
fbsanchez 589d9c1d7c minor fixes 2020-09-14 17:48:38 +02:00
fbsanchez d86d0ff090 Avoid deleting profiles while pressing enter in user details (management) 2020-09-14 17:42:04 +02:00
manuel.montes bcf5d3ca05 Fixed visual bug 2020-09-09 14:32:02 +02:00
Jose Gonzalez de49530fd1 Avoid XSS in User management 2020-09-09 11:58:09 +02:00
Marcos Alconada f75a0a98f1 add condition in UM if group equals 0 2020-09-01 13:26:10 +02:00
manuel.montes f477919433 Fixed entities in query 2020-08-28 13:56:15 +02:00
Marcos Alconada 86bfcbcd90 changes on user list 2020-08-12 13:20:53 +02:00
Daniel Maya 9f2e722787 Ent 6034 improvement of the um profile 2020-07-23 13:26:39 +02:00
Daniel Rodriguez a8328bd4f1 Merge branch 'ent-5568-case-insensitive-para-el-buscador-de-usuarios' into 'develop' 
Ent 5568 case insensitive para el buscador de usuarios

See merge request artica/pandorafms!3244
 2020-06-11 14:00:52 +02:00
Alejandro Fraguas a8bf9843ee Merge branch 'ent-5728-bug-standard-users-pandora-administrator' into 'develop' 
Fixed user list for UM

See merge request artica/pandorafms!3241
 2020-06-08 10:46:37 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
Manuel Montes 2ae11577ce Added case insensitive in agent search 2020-05-26 14:42:06 +02:00
Luis Calvo 24ddb370a7 Fixed user list for UM 2020-05-26 13:38:03 +02:00
alejandro-campos 7abd17285a Merge branch 'develop' into ent-5415-Bugs-password-policy 2020-05-19 17:39:55 +02:00
alejandro-campos 706738d801 fixed password length check in user update for admin user 2020-05-19 15:58:41 +02:00
Tatiana Llorente b99298786e Ent 5754 editor de usuarios de godmode que sea visualmente similar al editor de usuarios el propio usuario 2020-05-19 08:20:04 +02:00
Tatiana Llorente 1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
tatiana 490213dfed Changed path in a required file 2020-05-05 12:50:15 +02:00
alejandro-campos 6d6b891650 minor visual changes 2020-04-01 17:32:22 +02:00
alejandro-campos 297672ec48 fix password checkings when pass policy is enabled 2020-03-31 15:12:39 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
alejandro-campos 4bdea42c63 fix bad parameter in function call 2020-02-24 13:16:22 +01:00
Daniel Rodriguez 32cb47fb71 Merge branch 'ent-5251-9432-No-se-pueden-crear-usuarios-con-password-policy-activado' into 'develop' 
Fixed password policy

See merge request artica/pandorafms!3020
 2020-02-03 16:06:43 +01:00
Alejandro Fraguas 6aae378b37 Merge branch 'ent-4533-descuadre-visual-usuarios-metaconsola' into 'develop' 
ajuste visual en tabla user management

See merge request artica/pandorafms!2682
 2020-02-03 13:55:42 +01:00
Daniel Maya 428e0ffbd7 Fixed password policy 2020-01-21 17:31:21 +01:00
alejandro-campos 78df8dcb95 prevent user creation with leading or trailing spaces in user id 2020-01-10 13:50:04 +01:00
alejandro-campos ec6a763aa2 add check to prevent user creation with an id with trailing spaces 2020-01-10 13:24:00 +01:00
alejandro-campos 4b9d6f1ae2 fix bug in user list permission checks 2019-11-05 17:18:38 +01:00
Tatiana Llorente 8c556d7d19 Changed permissions for management users - #4794 2019-10-11 11:47:38 +02:00
marcos.alconada ec86380ee7 changed hint from home screen edit user 2019-10-03 14:27:10 +02:00
marcos.alconada d650ff6959 fixed error 2019-08-30 11:28:24 +02:00
marcos.alconada 4bdcab108f ajuste visual en tabla user management 2019-08-27 10:32:48 +02:00
marcos.alconada 8d8e08d37b fixed visual error 2019-08-22 15:25:35 +02:00
marcos.alconada 44eb8dd3d1 fixed visual error 2019-08-19 12:31:47 +02:00
Daniel Barbero ab3cfd4cc9 new tocken user edit newslatter info 2019-07-09 14:08:06 +02:00
fbsanchez c741020538 styles review 2019-06-04 13:57:55 +02:00
Luis Calvo 6fdd88ab65 Fixed errors on eHorus user level conf 2019-05-28 17:19:13 +02:00
Luis Calvo 5966367f8f eHorus user level login conf added in user editor 2019-05-28 13:14:42 +02:00
Luis Calvo 3736d84589 Edit ehorus user 2019-05-27 18:49:47 +02:00
Luis Calvo 588d19102f Resolve merge conflict 2019-05-27 18:30:24 +02:00
Luis Calvo ce34adb9d8 Fixed errors and corrected style 
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
 2019-05-13 17:28:23 +02:00
Luis Calvo c527435a0e eHorus user-login settings 
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
 2019-05-10 15:32:25 +02:00
manuel 6bd8221bc0 changed helps 
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
 2019-04-29 14:36:02 +02:00
Tatiana Llorente d91631e0e1 New design for the tables - #3707 
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
 2019-04-05 13:18:38 +02:00
Tatiana Llorente f497d3bd2e Added class to action buttons and moved checkbox to the left side 
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
 2019-04-02 13:42:30 +02:00
Tatiana Llorente 26451c41a1 New design for the tables - #3707 
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
 2019-03-29 11:05:52 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
samucarc 8088a51035 Fixed audit log 
Former-commit-id: a78fb3fb377814a6e664fd66606cd293c8af5df3
 2018-12-11 17:17:46 +01:00
alejandro-campos a2909db631 Revert "Eliminadas entidades html de vista de auditoria" 
This reverts commit 530017a79d.


Former-commit-id: 7318b00afab9bf394f8095a8193fa35c05e52787
 2018-12-10 13:42:29 +01:00
alejandro-campos dd1fb00e19 Revert "Removed html entities in the audit views" 
This reverts commit ad7610d7f1.


Former-commit-id: a2b1fb7e9f6032cc255abb42e8ef0d65efc877b6
 2018-12-10 13:40:37 +01:00
samucarc 34986a5477 Merge branch 'develop' into 2877_Mejora_audit_log 
# Conflicts:
#	pandora_console/godmode/users/profile_list.php
 2018-12-03 18:57:04 +01:00
vgilc ce8e33ba29 Merge branch '2517-api-listar-y-crear-perfiles-de-usuario-en-meta-6168-eucomm' into 'develop' 
2517 api listar y crear perfiles de usuario en meta 6168 eucomm

See merge request artica/pandorafms!1905
 2018-11-30 12:22:37 +01:00
daniel 449c02763a fixed minor error cfv 2018-11-16 13:22:10 +01:00
vgilc d91f81d0ed Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
fixed minor bug: Assigned node field showing in meta user update form when…

See merge request artica/pandorafms!1968
 2018-11-14 08:30:42 +01:00
alejandro-campos 5eed82eb62 fixed minor bug: Assigned node field showing in meta user update form when selecting admin profile in case the user was a stardard user 2018-11-13 19:00:16 +01:00
daniel ac671d041c Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-13 15:47:07 +01:00
daniel 4dbcecb951 WIP custom fields view 2018-11-13 15:46:44 +01:00
vgilc 6d0d7fd410 Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
removed Assigned node field from admin global profile when creating user from metaconsole

See merge request artica/pandorafms!1959
 2018-11-12 16:49:08 +01:00
alejandro-campos 75ad60a071 removed Assigned node field from admin global profile when creating user from metaconsole 2018-11-12 15:57:18 +01:00
fermin831 c7a624000e Added API function set delete_user_profile_info 2018-10-29 13:34:30 +01:00
vgilc e03f56f0d7 Merge branch '2429-Resaltar-elementos-al-pasar-por-encima-o-marcar' into 'develop' 
2429 resaltar elementos al pasar por encima o marcar

See merge request artica/pandorafms!1762
 2018-10-29 09:17:54 +01:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
vgilc b50f52ae9d Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
fixed bug: admin users not able to log in to node when they are created in…

See merge request artica/pandorafms!1812
 2018-10-25 12:10:58 +02:00
samucarc 57c411e3fa Fixed Audit log in profiles, collections and policies 2018-10-22 10:06:02 +02:00
daniel ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +02:00
samucarc 530017a79d Eliminadas entidades html de vista de auditoria 2018-10-04 17:02:38 +02:00