Commit Graph

997 Commits

Author SHA1 Message Date
Jose Gonzalez b428e77e7c User management for meta 2023-03-14 13:11:57 +01:00
daniel dcfaaea016 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-10 14:50:31 +01:00
daniel 3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
Daniel Cebrian 841478a86c Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida'
# Conflicts:
#   pandora_console/pandoradb.sql
2023-03-10 10:41:08 +00:00
daniel 8736629954 fixed styles 2023-03-10 08:38:44 +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 Cebrian a4634717d8 Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-07 13:49:39 +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
Jose Gonzalez 128dc9c42c Visual console changes 2023-03-03 13:52:28 +01:00
Jonathan dd1b58b83a Reporting Custom Graphs change visual 2023-03-02 14:35:01 +01:00
Jose Gonzalez 7958793e1a Service 2023-03-01 12:37:17 +01:00
Daniel Maya 586b6e5883 #9662 fixed menu 2023-02-27 09:39:34 +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
Jose Gonzalez 7a1d7f9087 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-20 17:23:01 +01:00
Jose Gonzalez 91393d7ce5 Ticket 10431 Header icons added 2023-02-20 17:22:42 +01:00
Daniel Maya a615d2d98f #9662 minor fixed 2023-02-20 17:08:36 +01:00
Daniel Maya c6e32e278b #9662 fixed favourites 2023-02-20 16:41:54 +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 46a4ee9af2 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-17 12:53:12 +01:00
Pablo Aragon a065f4578c 9662-Login 2023-02-17 12:52:13 +01:00
Daniel Maya 320b87b77e menu bug fixes 2023-02-17 10:10:47 +01:00
Jose Gonzalez 1520b8c62f Menu improvements 2023-02-16 14:37:30 +01:00
Jose Gonzalez 4a535b14a2 Fully integrated principal action-buttons 2023-02-15 13:43:42 +01:00
Daniel Cebrian bdd6d2bb15 #9073 added control session 2023-02-14 11:18:39 +01:00
Jose Gonzalez d29661c87b Merge 2023-02-13 14:32:20 +01:00
Jose Gonzalez 2f547c620d Fix logout button 2023-02-13 14:25:34 +01:00
Daniel Maya f5044e5673 #9662 Added new user edit link and changed label 2023-02-13 13:16:51 +01:00
Daniel Maya 7d6ace0f98 #9662 Added icon about 2023-02-13 12:43:30 +01:00
Jose Gonzalez d45a631ea5 Final merge with new menu 2023-02-13 10:37:37 +01:00
Daniel Maya 44bee67f36 #9663 menu redesing 6 2023-02-13 09:31:33 +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
Daniel Maya be3c7bca6c resolved conflict 2023-02-10 11:55:45 +01:00
Daniel Maya 08f0f3403a #9663 menu redesing 5 2023-02-10 11:48:32 +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 758f906616 #9663 menu redesing 4 2023-02-07 15:22:51 +01:00
Jose Gonzalez b9992c5a67 Minor fixes for solve visual issues 2023-02-03 12:37:09 +01:00
Daniel Maya 1437c5a0e7 #9663 menu redesing 3 2023-02-02 13:28:48 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Jose Gonzalez 60685cdccc Table fixes 2023-01-10 10:18:37 +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