Commit Graph

6828 Commits

Author SHA1 Message Date
Jose Gonzalez ec58cb4593 Plugins view 2023-02-22 14:19:57 +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 370ee54d9f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 12:16:14 +01:00
Jose Gonzalez bbde3e4181 Minor fixes 2023-02-22 12:15:17 +01:00
Matias Didier c8109dadd3 Merge branch 'ent-9523-derivado-del-trabajo-q-a-765-fe-de-errata-en-titulo-de-ventana-emergente-para-informacion-de' into 'develop'
Ent 9523 derivado del trabajo q a 765 fe de errata en titulo de ventana emergente para informacion de

See merge request artica/pandorafms!5496
2023-02-22 10:15:26 +00:00
Pablo Aragon 95fb797a7e 10488-Fix views reports 2023-02-22 10:33:45 +01:00
Jose Gonzalez 1d566b4d18 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-21 14:15:05 +01:00
Jose Gonzalez 2fd52eff48 Sprint 2025Feb Improve UI-UX and Resources views 2023-02-21 14:14:13 +01:00
Pablo Aragon 80818d7b6e 10489-Fix alerts edition and event response 2023-02-21 13:18:44 +01:00
Jose Gonzalez 13aa4e77f1 Fix minor issues 2023-02-20 17:49:02 +01:00
Rafael Ameijeiras 8d13e873cc Merge branch 'ent-10217-disable-admin-s-account-via-cross-site-request-forgery' into 'develop'
Ent 10217 disable admin s account via cross site request forgery

See merge request artica/pandorafms!5503
2023-02-20 15:03:42 +00:00
Jose Gonzalez da58e4b9e0 Ticket 10484 Fixed List Operating Systems 2023-02-20 13:02:24 +01:00
Jose Gonzalez c1f8510563 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-17 14:21:49 +01:00
Jose Gonzalez a1bf42c9f9 Ticket 10470 Agent improvements 2023-02-17 14:21:29 +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
Jonathan ca39b4a4ce Conflict solution 2023-02-16 13:27:11 +01:00
Jonathan ce45469f83 Fix setup visual bugs 2023-02-16 13:16:31 +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
Jonathan 041ce5d5e8 Manage Agents delete and create required "primary group" 2023-02-16 10:59:45 +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 8673ea57b1 Fix issues with view button in setup view 2023-02-15 16:28:40 +01:00
Jose Gonzalez 38dbec8618 Fix Firefox bug 2023-02-15 14:45:28 +01:00
Jose Gonzalez 1b174f9cd4 Ticket 10412 Reporting builder fix 2023-02-15 12:49:31 +01:00
Jose Gonzalez 36308b1be0 Minor visual fixes 2023-02-14 16:41:24 +01:00
Jose Gonzalez be33b2f51a Several visual fixes for fit with mockups 2023-02-14 14:06:51 +01:00
Jose Gonzalez 1d682521e9 Minor fixes in agent/module view 2023-02-14 10:41:40 +01:00
Jose Gonzalez 8f65ee4fb8 Minor fix: search submit in module list 2023-02-14 07:52:13 +01:00
Jose Gonzalez 31f6c9a9d9 Minor patches 2023-02-13 17:35:54 +01:00
Jose Gonzalez 3fdd0a08d1 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-13 14:32:40 +01:00
Daniel Maya 98f82b4ce8 #9662 Fixed discovery menu 2023-02-13 14:32:02 +01:00
Jose Gonzalez d33babd48a Fix user modification-creation 2023-02-13 14:23:31 +01:00
Jose Gonzalez d45a631ea5 Final merge with new menu 2023-02-13 10:37:37 +01:00
Jose Gonzalez 98736c1ab4 Merge 2023-02-13 10:24:07 +01:00
Jose Gonzalez d6eedf07aa Merge 2023-02-13 10:03:09 +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
Jose Gonzalez 175d4b7341 Fixes in Event view and other fixes 2023-02-09 16:13:30 +01:00
Jose Gonzalez 4b592b6610 Minor fixes 2023-02-08 17:20:52 +01:00
Jose Gonzalez 4d9c6ab33a Minor fixes 2023-02-08 12:58:23 +01:00
Jose Gonzalez f14d324490 Minor fixes and improves 2023-02-08 12:43:08 +01:00
Jose Gonzalez 3a741f8ed9 Update icons and improve tables 2023-02-07 16:22: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
Daniel Maya 758f906616 #9663 menu redesing 4 2023-02-07 15:22:51 +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