435 Commits

Author SHA1 Message Date
daniel
ad33accfda fixed styles 2023-03-02 11:10:09 +01:00
daniel
f00f974c60 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/alert_templates.php
	pandora_console/godmode/groups/configure_modu_group.php
	pandora_console/godmode/groups/modu_group_list.php
	pandora_console/godmode/modules/manage_network_components.php
	pandora_console/godmode/users/user_list.php
2023-02-28 07:32:43 +01:00
Jose Gonzalez
70216262a9 Minor fixes 2023-02-24 12:05:53 +01:00
Jose Gonzalez
6180a42413 More pandora_black fixes 2023-02-22 21:19:28 +01:00
Jose Gonzalez
0380e8a10c Ticket 10394 Black theme fixes 2023-02-22 16:24:11 +01:00
daniel
8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
2023-02-22 12:35:34 +01:00
Daniel Cebrian
f9c3524be8 #10493 fixed pagination in profiles 2023-02-21 16:05:24 +01:00
Jose Gonzalez
29ed8be0d2 Minor fix 2023-02-16 12:59:23 +01:00
Jose Gonzalez
5dc8e19d6d Include Api Token and QR code mockup 2023-02-16 12:44:11 +01:00
Jose Gonzalez
21a4a4ced8 Edit user fix 2023-02-16 07:44:41 +01:00
Jose Gonzalez
e42c4575d5 Double authentication active 2023-02-16 07:25:26 +01:00
Jose Gonzalez
36308b1be0 Minor visual fixes 2023-02-14 16:41:24 +01:00
Jose Gonzalez
d33babd48a Fix user modification-creation 2023-02-13 14:23:31 +01:00
Jose Gonzalez
4b592b6610 Minor fixes 2023-02-08 17:20:52 +01:00
Jose Gonzalez
ab1d2f38f6 Changed function name 2023-02-07 15:39:53 +01:00
Jose Gonzalez
e99ad97e17 Fixes and improvements 2023-02-07 15:33:29 +01:00
Jose Gonzalez
8f78f89aa3 Improve views and forms 2023-02-07 13:19:40 +01:00
Jose Gonzalez
dfdcb688d4 Improve code 2023-02-06 23:10:28 +01:00
Jose Gonzalez
ac144de6d6 WIP: Minor fixes 2023-02-06 10:17:51 +01:00
Jose Gonzalez
a9df7e2ec5 WIP: Improve somethings 2023-02-03 16:36:04 +01:00
Jonathan
0437e46b5b #10217 CSRF for enable/disable users 2023-02-03 14:14:44 +01:00
Jose Gonzalez
0a61f6dcc7 WIP: User management View and BL 2023-02-03 14:10:26 +01:00
Jose Gonzalez
0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Jose Gonzalez
fbdd91e4ff Improve user profile list view 2023-01-31 12:59:49 +01:00
Jose Gonzalez
891e485781 Fixed users list view 2023-01-30 16:14:05 +01:00
Calvo
91e8cc2633 Added home page dashboard to metaconsole 2023-01-24 14:22:33 +01:00
Rafael Ameijeiras
1ed1b19cd0 Merge branch 'ent-9829-listado-de-dashboards-en-pantalla-de-inicio' into 'develop'
Fix list all private dashboards on user edition

See merge request artica/pandorafms!5320
2023-01-24 11:59:23 +00:00
Daniel Rodriguez
0a4ddc480a Merge branch 'ent-10106-borrar-sesion-de-usuario-cuando-se-borra-un-usuario' into 'develop'
Ent 10106 borrar sesion de usuario cuando se borra un usuario

See merge request artica/pandorafms!5397
2023-01-23 15:28:19 +00:00
Calvo
2fc1abc893 Merge remote-tracking branch 'origin/develop' into ent-9829-listado-de-dashboards-en-pantalla-de-inicio 2023-01-18 11:33:21 +01:00
Calvo
d8428a46a7 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2023-01-13 10:12:21 +01:00
Jose Gonzalez
a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Daniel Cebrian
a7fccc2f77 #10106 deleted session when user is deleted 2023-01-11 10:59:52 +01:00
Daniel Cebrian
d3136a8be5 #9817 fixed input_json_profile hidden in update user 2023-01-05 09:01:06 +01:00
Jose Gonzalez
8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
Calvo
6d9149e11b Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-29 17:39:12 +01:00
Rafael Ameijeiras
6b4bc8b9b0 Merge branch 'ent-9903-no-permitir-nombres-de-perfiles-duplicados' into 'develop'
Ent 9903 no permitir nombres de perfiles duplicados

See merge request artica/pandorafms!5321
2022-12-28 10:01:46 +00:00
Calvo
f84f9733e3 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-20 12:15:10 +01:00
Jonathan
97c967ede8 Disable enter on profiles create/edit for duplicate profile name check 2022-12-16 09:53:10 +01:00
Jonathan
14b884b53d Trim duplicate profile before post to save 2022-12-15 15:37:46 +01:00
Jonathan
b11f047332 Change "safe" for "save" on profile duplicate 2022-12-12 10:50:59 +01:00
Rafael Ameijeiras
cedee1a3fa Merge branch 'ent-9557-14267-eliminar-dashboards-privados-cuando-se-borra-el-usuario-asignado' into 'develop'
Ent 9557 14267 eliminar dashboards privados cuando se borra el usuario asignado

See merge request artica/pandorafms!5258
2022-12-12 08:21:16 +00:00
Jonathan
0b6d1a7840 #9903 Duplicate control profile 2022-12-09 11:37:08 +01:00
Luis Calvo
cdd1569364 Fix list all private dashboards on user edition 2022-12-09 09:54:20 +01:00
jose.gonzalez@pandorafms.com
445a8161cf Merge 2022-12-05 09:44:35 +01:00
jose.gonzalez@pandorafms.com
dccd950e9e Changes 2022-11-30 10:14:42 +01:00
alejandro.campos@artica.es
b9242b17d8 fixed bugs in meta profiles management 2022-11-23 16:29:27 +01:00
alejandro.campos@artica.es
743fef7d58 Merge remote-tracking branch 'origin/develop' into ent-9501-tenencia-de-mismos-permisos-de-manera-simultanea 2022-11-23 10:30:59 +01:00
alejandro.campos@artica.es
5accae9d47 minor changes 2022-11-23 10:30:53 +01:00
alejandro.campos@artica.es
f03cd5ec8c implemented link type custom field 2022-11-22 20:40:22 +01:00
jose.gonzalez@pandorafms.com
a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00