Commit Graph

203 Commits

Author SHA1 Message Date
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Daniel Maya 4a7899f476 #11278 Fixed login with saml 2023-05-23 09:24:31 +02:00
Pablo Aragon 2d8d501fe8 10918-Fix login background & text 2023-04-12 17:21:18 +02:00
Pablo Aragon f32c886167 10712-login 2023-03-23 11:51:21 +01:00
Pablo Aragon d6bf16f536 10712-Login 2023-03-22 18:57:36 +01:00
Pablo Aragon e8744b5d12 10712-New login 2023-03-21 13:31:11 +01:00
Pablo Aragon b922b50688 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-17 11:34:00 +01:00
Pablo Aragon 6b140445c3 10712-New login 2023-03-17 11:33:50 +01:00
daniel 5921e61ad8 fixed styles 2023-03-16 16:32:18 +01:00
daniel dba1554d74 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/general/login_page.php
2023-03-07 08:04:45 +01:00
Pablo Aragon 6ae86b4c39 Sound events. Login SAML 2023-03-06 08:21:04 +01:00
Jonathan 3b36a15b4d Merge branch 'develop' into ent-10294-enumeracion-usuarios-en-errores-login-pandora-fms 2023-03-06 08:18:52 +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 5ae99154bb Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-20 11:48:12 +01:00
Jose Gonzalez 47c2b62029 Improve login page 2023-02-20 11:47:56 +01:00
Pablo Aragon e95e6acd0c 9662-Fix double authentication login 2023-02-20 11:27:20 +01:00
Pablo Aragon fd77ee1a14 9662-Fix double authentication login 2023-02-20 11:16:07 +01:00
Pablo Aragon bf307adb01 10483-Fixed csrf token on login after logout 2023-02-20 10:47:00 +01:00
Pablo Aragon 4ee6cf7e28 9662-Fix login meta 2023-02-20 09:54:48 +01:00
Pablo Aragon a065f4578c 9662-Login 2023-02-17 12:52:13 +01:00
Jose Gonzalez 2f547c620d Fix logout button 2023-02-13 14:25:34 +01:00
Jose Gonzalez 6a46af495d Fix issue with dev environment starting and added button fixed id parameter 2023-02-10 13:38:47 +01:00
Jonathan d190c36a9e #10294 login user bloqued and attempts 2023-02-08 11:59:20 +01:00
Jonathan 1d7230e9ca #10294 error login no user register attemps 2023-02-07 17:24:40 +01:00
Daniel Maya fcd918d00b #9851 Fixed background image size 2022-11-24 15:49:11 +01:00
Daniel Maya 67d9c6daa6 Added message 2022-01-12 17:16:02 +01:00
Daniel Maya 080c5e2793 Fixed reset password 2022-01-12 12:19:41 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
marcos e8693ceb43 create error login dialog when uncheck enable node access option 2021-07-22 09:34:58 +02:00
Luis 497ecb329d Changed new wiki url on helps 2021-06-24 12:31:15 +00:00
Daniel Rodriguez 190932f12d Merge branch 'ent-7390-CSRF-login-recovery-pass' into 'develop'
Added CSRF validation

Closes pandora_enterprise#7390

See merge request artica/pandorafms!4148
2021-06-21 14:01:59 +00:00
José González 39f3e1987e Fixed bye bye 2021-06-16 10:15:53 +02:00
José González 52bad0e53c Added CSRF validation 2021-05-21 13:59:54 +02:00
Daniel Maya 5dd5a9aeee Fixed Cross-Site Scripting 2021-05-04 12:54:21 +02:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Barbero Martin 219ca1914d cambio de dominio 2021-03-09 16:02:05 +01:00
Daniel Rodriguez aee7ec4cb2 Merge branch 'ent-6897-estilos-rotos-metaconsola' into 'develop'
Fixed broken styles in meta

See merge request artica/pandorafms!3743
2020-12-24 10:30:01 +01:00
Luis Calvo d8900704ed Fixed broken styles in meta 2020-12-23 17:58:05 +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 ee84644163 Merge branch 'ent-6687-Instalador-en-metaconsola' into 'develop'
fix check install meta

See merge request artica/pandorafms!3666
2020-12-22 13:48:13 +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 50b1fa3c56 Changed check connection method to ajax. Check deleted from login 2020-12-03 12:27:55 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Barbero Martin b9c2db9825 fix check install meta 2020-11-27 13:21:14 +01:00
Daniel Rodriguez b0ccfc89b1 Merge branch 'ent-6472-graficas-con-phantomjs-y-saml' into 'develop'
SAML with pandora sessions

See merge request artica/pandorafms!3533
2020-11-04 18:42:42 +01:00
Luis 2f2556ef79 Ent 6680 ventana de perdida de conexion incorrecta 2020-11-04 16:41:25 +01:00
fbsanchez f6020e8791 Removed unwanted traces 2020-10-19 10:59:46 +02:00