2020 Commits

Author	SHA1	Message	Date
fbsanchez	22de7964c2	Merge remote-tracking branch 'origin/develop' into fix/styles	2019-05-29 08:52:34 +02:00
fbsanchez	d64e2cfb8c	Merge remote-tracking branch 'origin/develop' into fix/styles	2019-05-28 18:05:33 +02:00
Luis Calvo	58a0ef1bf7	Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings	2019-05-28 18:03:55 +02:00
fbsanchez	70469c4909	Event list agent view	2019-05-28 18:03:01 +02:00
Luis Calvo	e993dcc3a5	Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings	2019-05-28 17:37:20 +02:00
fbsanchez	445db7c43b	module list agent view	2019-05-28 16:20:24 +02:00
Tatiana Llorente	d68bb176cf	Merge branch 'develop' into 'ent-4102-Cambios-vista-detalle-de-evento' ... Conflicts: pandora_console/include/styles/pandora.css	2019-05-28 15:56:16 +02:00
fbsanchez	348f0c2a65	agent view styling	2019-05-28 13:27:17 +02:00
fbsanchez	2cd19aa0cb	updates styles	2019-05-28 10:47:31 +02:00
fbsanchez	bdd7cc1317	Flex agent view	2019-05-28 09:48:09 +02:00
fbsanchez	f57915285f	review styles agent view	2019-05-27 22:36:55 +02:00
fbsanchez	f1499082fa	agent view rebuilt	2019-05-27 21:30:46 +02:00
fbsanchez	5be124f315	Styles review	2019-05-27 19:00:48 +02:00
Luis Calvo	588d19102f	Resolve merge conflict	2019-05-27 18:30:24 +02:00
fbsanchez	f0fb6d7fd9	wip styles	2019-05-27 18:03:56 +02:00
Tatiana Llorente	2fd37b531e	Visual changes in module graph - #4104	2019-05-27 17:37:57 +02:00
fbsanchez	556c07ad99	Minor changes in configurar_agente	2019-05-27 17:12:35 +02:00
Tatiana Llorente	1eb1120c6e	Rename class events_show_more_table to table_modal_alternate - #4102	2019-05-27 16:18:10 +02:00
fbsanchez	0280547465	some changes	2019-05-27 15:41:23 +02:00
fbsanchez	9eecc414dd	cps changes - switch core touched - test this commit carefully	2019-05-27 14:12:53 +02:00
fbsanchez	7347324601	Minor fixes - discovery styles	2019-05-27 13:19:08 +02:00
Daniel Rodriguez	979f11ca8f	Merge branch 'ent-1668-update-manager' into 'develop' ... Ent 1668 update manager See merge request artica/pandorafms!2420	2019-05-22 15:25:49 +02:00
Alejandro Fraguas	ce359bfaf6	Merge branch 'ent-3937-eliminar-echos-y-prints-de-las-subclases-de-wizard' into 'develop' ... Ent 3937 eliminar echos y prints de las subclases de wizard See merge request artica/pandorafms!2430	2019-05-21 12:11:53 +02:00
fbsanchez	77fc1abe89	minor style updates and fixes in safe-output	2019-05-20 18:16:21 +02:00
alejandro-campos	a0b7164d9f	lint changes	2019-05-17 14:20:01 +02:00
fbsanchez	d871b599ef	General fixes and UM comm updates ... Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be	2019-05-14 23:49:01 +02:00
fbsanchez	6ca07c0914	Merge remote-tracking branch 'origin/develop' into 1668-update-manager ... Former-commit-id: 33d676ea02d3dfbb3f8c3c23aa8466192516eafb	2019-05-13 17:58:35 +02:00
fbsanchez	ced1b32915	Configuration, Registration and newsletter wizards ... Former-commit-id: bbd367a10fd01c229c848b15572c4b1d6ccb75cf	2019-05-13 17:55:41 +02:00
Luis Calvo	8c1c337522	Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings ... Former-commit-id: 1eac76c75f311a20f402859cf7b9a47b70765f75	2019-05-13 17:36:32 +02:00
Luis Calvo	ce34adb9d8	Fixed errors and corrected style ... Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a	2019-05-13 17:28:23 +02:00
Tatiana Llorente	5f2bd0bc8d	Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente ... Conflicts: pandora_console/include/styles/pandora.css Former-commit-id: f04b28c642afe7fe1251ae966b3964c321b34c29	2019-05-13 13:17:17 +02:00
Tatiana Llorente	a9834dc415	Merge branch 'develop' into 'ent-4004-Estilos-Discovery' ... Conflicts: pandora_console/godmode/wizards/HostDevices.class.php Former-commit-id: de7b4b069e1c5f673b567fcb3271ec867d0fbae1	2019-05-10 09:55:54 +02:00
Tatiana Llorente	f5114918b5	Unify the styles of Discovery with Pandora - #4004	2019-05-09 08:45:55 +02:00
Tatiana Llorente	5e0b53e3c2	New menu module graph - #3617	2019-05-08 09:35:28 +02:00
Tatiana Llorente	283be8f632	New menu module graph - #3617	2019-05-07 16:07:07 +02:00
Tatiana Llorente	9f3c586b55	Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente ... Former-commit-id: b60c4d8c438d79f20cc9dcdfac856bbaf0a4ada5	2019-05-03 13:11:26 +02:00
Tatiana Llorente	7721c0e605	New View Create/Update Agent - #3611 ... Former-commit-id: 5bcb4f0d94a05819e82cd636ef1683fbb4047495	2019-05-03 13:07:58 +02:00
Alejandro Fraguas	194f4400f7	Merge branch 'ent-3647-Revision-estilos-discovery-con-la-nueva-linea-de-estilos' into 'develop' ... Ent 3647 revision estilos discovery con la nueva linea de estilos See merge request artica/pandorafms!2370 Former-commit-id: 0f46544f8b05ee464c4dd85301f7a23a4067267a	2019-04-23 17:48:00 +02:00
alejandro-campos	4f6a81dc5b	visual changes to discovery ... Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db	2019-04-22 17:46:04 +02:00
fbsanchez	cbdd8e7104	Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3 ... Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c	2019-04-22 09:01:24 +02:00
Tatiana Llorente	274c78f647	Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente ... Conflicts: pandora_console/include/styles/pandora.css Former-commit-id: 8beb92aea96f37340434f4a2e5e8012058d52b0a	2019-04-17 10:49:02 +02:00
Tatiana Llorente	ed3155c053	New View Create/Update Agent - #3611 ... Former-commit-id: e8c3576ca06561f5979c0151670115b697533843	2019-04-17 10:35:32 +02:00
Alejandro Fraguas	6594095de7	Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' into 'develop' ... Ent 3707 nuevo diseño para las tablas See merge request artica/pandorafms!2352 Former-commit-id: 684daf476bf288e294b67f97fc80fdf6a6ddcce4	2019-04-17 10:19:42 +02:00
Tatiana Llorente	83cda70e0a	Fixed styles of tables within tables with new class - #3707 ... Former-commit-id: 6775b6f96669d33fb2130bfca2448d40d2de0964	2019-04-17 09:34:24 +02:00
Tatiana Llorente	cfff9c065d	New View Create/Update Agent - #3611 ... Former-commit-id: 5a36e41a05341d5afa19917a99f34ac16cfc99e9	2019-04-17 09:27:15 +02:00
fbsanchez	45c9f6d51c	Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3 ... Former-commit-id: 4c13aa9288330584db108ab04fd9ac096b2714ce	2019-04-12 19:24:27 +02:00
Daniel Barbero Martin	26d5060232	fixed errors css ... Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32	2019-04-12 10:10:04 +02:00
Tatiana Llorente	59c2734b5a	Deleted old files. Centered the map. Fixed broken image in meta. - #3806 ... Former-commit-id: 30ebc8e1afeb3401011ee359ecd8626436d85fb7	2019-04-12 09:20:55 +02:00
Tatiana Llorente	187bdb1701	New design for the tables - #3707 ... Former-commit-id: 7781a8b392919f38259aed142f01e786fc82698a	2019-04-11 09:57:07 +02:00
Luis Calvo	5998b30a16	Added css hint to discovery tasks when task list is empty ... Former-commit-id: 1da71cda1b1ed376bb6bae0281b0dd882dbfbeff	2019-04-10 17:30:35 +02:00