Commit Graph

479 Commits

Author SHA1 Message Date
daniel 3f09fd16a7 fixed styles 2023-03-16 18:51:54 +01:00
daniel a22b5479d9 fixed styles 2023-03-16 16:48:03 +01:00
daniel d092495482 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-13 19:31:26 +01:00
daniel c96ac79726 fixed styles 2023-03-13 19:30:51 +01:00
daniel cf7e5b7ad9 Merge remote-tracking branch 'origin/develop' into ent-9895-mensaje-de-error-con-ldap-login-poco-explicativo 2023-03-13 09:34:11 +01:00
daniel 63d83b3f97 fixed styles 2023-03-09 11:25:43 +01:00
daniel e21d9968e8 fixed styles 2023-03-08 19:25:25 +01:00
daniel 1ba420a9ce fixed styles 2023-03-07 16:22:13 +01:00
daniel 95df525cb2 fixed styles 2023-03-03 14:16:06 +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
Jose Gonzalez 49fc725cdc Cog animations 2023-02-20 15:16:27 +01:00
Jose Gonzalez 8f21229246 Ticket 10467 Improve External Tools view 2023-02-20 14:50:17 +01:00
Pablo Aragon bf307adb01 10483-Fixed csrf token on login after logout 2023-02-20 10:47:00 +01:00
Jose Gonzalez 4a535b14a2 Fully integrated principal action-buttons 2023-02-15 13:43:42 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Jose Gonzalez deb69a0659 Fix issue with info box messages 2023-01-26 16:00:08 +01:00
daniel 08c902ed60 fix performance tactical view with admin pandora_enterprise#10087 2023-01-25 16:46:13 +01:00
Jonathan a2d9aa81d0 #9895 Add description error login ldap 2023-01-19 14:44:30 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Pablo Aragon ab54a26815 9868 Remove footer and create About section 2022-12-29 16:21:36 +01:00
Jonathan 1536b8dbf8 #9827 no redirection on login when url empty on config user 2022-12-23 12:07:27 +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
jose.gonzalez@pandorafms.com 6eb9319a7a Minor fixes 2022-11-23 17:42:53 +01:00
jose.gonzalez@pandorafms.com 251fddacd0 From merge 2022-11-23 13:26:54 +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
Calvo 4e9bc2d6ef Update messages to php8 2022-11-22 16:31:09 +01:00
jose.gonzalez@pandorafms.com 3eb0e0d63a Undo mouse-spinner awaiting research and menuResizing attached 2022-11-21 23:46:29 +01:00
jose.gonzalez@pandorafms.com 88766eb7cc Fixed action-buttons 2022-11-16 16:04:22 +01:00
Alejandro Campos a58bc3bf08 Merge branch 'develop' into 'ent-9430-2FA-Authentication-sigue-saltando-tras-deshabilitar-en-consola'
# Conflicts:
#   pandora_console/general/register.php
2022-10-27 09:47:49 +00:00
José González 6cdb1b0441 Fix mistake with User IP and User name 2022-09-29 17:46:39 +02:00
alejandro.campos@artica.es 76f7761373 fixes in double auth 2022-09-22 08:59:39 +02:00
José González 51a2da89c9 Fixed control for IP Ranges 2022-09-12 18:29:58 +02:00
José González 9164f1e681 IP Allow control 2022-09-12 12:41:09 +02:00
Daniel Barbero d9227fae0e fix console report pandora_enterprise#6367 2022-08-08 13:51:07 +02:00
Daniel Barbero Martin 628d9b5630 new console report pandora_enterprise#6367 2022-07-12 10:18:06 +02:00
Daniel Barbero Martin 8e2b074460 new console report pandora_enterprise#6367 2022-07-11 16:42:20 +02:00
Daniel Barbero Martin 01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
José González ca0763f379 Merge branch 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' of https://brutus.artica.es:8081/artica/pandorafms into ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager 2022-06-29 10:20:31 +02:00
José González ef3dd0e741 Improved error message 2022-06-29 10:20:17 +02:00
José González 2d69ea4be5 Merge branch 'develop' into 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager'
# Conflicts:
#   pandora_console/index.php
2022-06-28 14:39:37 +00:00
edu.corral a0f7c9e6a2 ent-9067 fixed notification system 2022-06-16 16:19:33 +02:00
edu.corral 4ee4590690 ent-9067 notifications fixed 2022-06-16 13:02:49 +02:00
José González e86d8b761d Refactor and improve code and added dialog for show error 2022-06-07 13:40:35 +02:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
fbsanchez 81b1454b2e minor fixes 2022-01-26 17:34:56 +01:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
Conflicts:
	pandora_console/include/class/HTML.class.php
2022-01-25 14:16:47 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
Daniel Maya 182b99b4d9 Fixed CRSF in SAML 2022-01-11 13:10:47 +01:00
fbsanchez 7ebd6a5f74 php8 warnings cleanup 2022-01-11 12:08:41 +01:00