2020 Commits

Author	SHA1	Message	Date
Pablo Aragon	2a97b26cfe	Admin tools	2023-03-09 15:14:47 +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
Pablo Aragon	d0c8794361	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-08 17:12:22 +01:00
Pablo Aragon	bb1d9c323d	Admin tools	2023-03-08 17:12:15 +01:00
Jonathan	08c2803970	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-08 17:09:47 +01:00
Jonathan	54e6a99cc3	Dashboard pagination visual position	2023-03-08 17:09:42 +01:00
Daniel Maya	72990ab177	#9662 Fixed pandora black	2023-03-08 16:41:26 +01:00
Jonathan	434aa1dbc3	z-index fix on buttons and mesage	2023-03-08 15:57:55 +01:00
Jose Gonzalez	a8c177a248	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-08 15:57:19 +01:00
Pablo Aragon	2934ff25ff	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-08 15:31:05 +01:00
Pablo Aragon	87e82c0410	10457-Audit log, save/load filters	2023-03-08 15:30:48 +01:00
Jose Gonzalez	0304c1f18e	Calendar CSS styles	2023-03-08 15:23:42 +01:00
Jose Gonzalez	c51c00f974	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-08 15:05:35 +01:00
Jose Gonzalez	1d3d2fc5fd	Minor fixes	2023-03-08 15:01:41 +01:00
Pablo Aragon	78eccfd73b	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-08 13:36:49 +01:00
Pablo Aragon	1a7e063c60	Alerts	2023-03-08 13:36:36 +01:00
Daniel Cebrian	11250bd59b	Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida	2023-03-08 13:00:18 +01:00
Daniel Cebrian	3ec11f4c9d	Merge branch 'develop' into ent-10324-sistema-de-favoritos	2023-03-08 12:55:53 +01:00
daniel	bc501ec552	fixed styles	2023-03-08 08:28:48 +01:00
Daniel Cebrian	27005158ba	#9073 resolve conflics and bugs	2023-03-07 17:57:09 +01:00
Jose Gonzalez	5925cb0b2c	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-07 17:50:57 +01:00
Jose Gonzalez	2dbc2e801f	Minor icon fixes	2023-03-07 17:24:36 +01:00
Pablo Aragon	3ecbf1e4fa	Alerts	2023-03-07 16:17:01 +01:00
Pablo Aragon	d529e6f384	Alerts	2023-03-07 15:59:36 +01:00
Daniel Maya	6b9175ea0d	Merge branch 'develop' into ent-9662-second-round	2023-03-07 15:05:28 +01:00
Jose Gonzalez	4ea1d697dc	Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round	2023-03-07 15:00:40 +01:00
Jose Gonzalez	d4125be1b6	Fix visual issue with radios	2023-03-07 15:00:34 +01:00
Matias Didier	d206471673	Merge branch 'ent-10347-vista-tactica-de-grupo' into 'develop' ... Ent 10347 vista tactica de grupo See merge request artica/pandorafms!5572	2023-03-07 13:55:57 +00:00
Jonathan	8dbcffaa8b	Buttons and view report	2023-03-07 14:15:02 +01:00
vgilc	7c0259be78	Merge branch 'ent-10518-nuevo-menu-metaconsola' into 'develop' ... Draft: Ent 10518 nuevo menu metaconsola See merge request artica/pandorafms!5573	2023-03-07 13:00:17 +00: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 Cebrian	fdc73be979	Merge branch 'develop' into ent-10347-vista-tactica-de-grupo	2023-03-07 13:19:52 +01:00
Jose Gonzalez	b68fe38102	Controls improve	2023-03-07 11:15:01 +01:00
Pablo Aragon	62afce562f	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-03-07 08:28:22 +01:00
Pablo Aragon	5aac1a6152	Alerts	2023-03-07 08:28:10 +01:00
Jose Gonzalez	d9913818cb	Private Enterprise Numbers minor fixes	2023-03-06 23:47:05 +01:00
alejandro.campos@artica.es	f47e2dda8c	handling synchronizer instantiation when metaconsole is merging	2023-03-06 17:27:21 +01:00
Jose Gonzalez	e33a9bc3e4	Services TreeView	2023-03-06 13:32:21 +01:00
Jose Gonzalez	3c1c14576e	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-03-06 11:34:10 +01:00
Jose Gonzalez	a4655c221d	Added action-button class	2023-03-06 11:34:03 +01:00
Pablo Aragon	f77f635b8d	div>ul>li styles	2023-03-06 10:09:21 +01:00
Pablo Aragon	9c5203885e	IPAM	2023-03-06 09:23:30 +01:00
Jose Gonzalez	c13b77aea9	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-03-06 09:22:02 +01:00
Jose Gonzalez	7a2e929d3e	CSS styles for services	2023-03-06 09:21:48 +01:00
Pablo Aragon	6ae86b4c39	Sound events. Login SAML	2023-03-06 08:21:04 +01:00
daniel	08dca1a83c	fixed styles	2023-03-05 13:46:27 +01:00
daniel	ff3b7001c3	fixed styles	2023-03-04 13:22:52 +01:00
Jose Gonzalez	9ad97ee267	Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones	2023-03-03 14:51:07 +01:00
Jose Gonzalez	6846961ff0	Icon updates	2023-03-03 14:50:47 +01:00