1463 Commits

Author	SHA1	Message	Date
Jose Gonzalez	d7ca703c99	Cleaned the javascript call	2019-09-20 10:53:09 +02:00
marcos.alconada	83e5c14b1d	add condition in query	2019-09-09 12:54:16 +02:00
Jose Gonzalez	bb25679344	Added ui_get_full_url in all links	2019-09-04 14:12:38 +02:00
Jose Gonzalez	3d03faed9a	Solved some issues	2019-08-06 14:56:57 +02:00
Tatiana Llorente	4e927e1ee5	Fixed bad image for warning status - #4454	2019-08-01 10:36:15 +02:00
Jose Gonzalez	dd77429aea	Solved issue with status names	2019-07-29 17:22:16 +02:00
Luis Calvo	94250cb870	Fixed minor bug	2019-07-15 17:46:59 +02:00
Luis Calvo	a0ad1f2681	Merge remote-tracking branch 'origin/develop' into ent-4035-add-serialize-precision-value-notification	2019-07-15 15:04:13 +02:00
Daniel Barbero Martin	bd070b706b	fixed minor error	2019-07-11 12:45:52 +02:00
fbsanchez	24025ebb74	Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles	2019-06-18 17:48:03 +02:00
marcos.alconada	340e253901	Add global config to method getFirstLevel() to remove warning check_acl error	2019-06-17 13:38:05 +02:00
fbsanchez	ecc2fef8f6	event validation/in process	2019-06-13 12:30:09 +02:00
fbsanchez	48e6fef0b7	Event filters	2019-06-11 12:58:18 +02:00
fbsanchez	c741020538	styles review	2019-06-04 13:57:55 +02:00
fbsanchez	9a12b34847	Updates styling	2019-05-28 12:13:29 +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	5e9b2479eb	Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager	2019-05-20 13:11:39 +02:00
Luis Calvo	105695f1bd	Added notification for serialize_precicion value	2019-05-17 18:29:38 +02:00
alejandro-campos	54d3eefa43	lint changes	2019-05-17 14:27:59 +02:00
alejandro-campos	e746a49158	lint changes	2019-05-17 14:26:44 +02:00
Luis Calvo	1bfd91725e	Changed <img> to hmtl_print_image ... Former-commit-id: 6f72ebce38470308bccb08c5d0b1906b5e711472	2019-05-16 17:13:14 +02:00
fbsanchez	e7dbb55392	Minor fixes ... Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b	2019-05-16 12:00:49 +02:00
alejandro-campos	13b32003b3	save changes ticket 3937 ... Former-commit-id: 264c0fed3ddcf7c34796af0a3c2bd4d48a6763bb	2019-05-16 11:37:48 +02:00
fbsanchez	d871b599ef	General fixes and UM comm updates ... Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be	2019-05-14 23:49:01 +02:00
fbsanchez	8004e096fd	MR 28 and minor fixes ... Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25	2019-05-14 18:09:34 +02:00
fbsanchez	53e9113b7e	UM notifications MR update ... Former-commit-id: d2aad195cb9bab4e1efa504cb4b4a583f262f0e3	2019-05-14 17:15:28 +02:00
Tatiana Llorente	f5114918b5	Unify the styles of Discovery with Pandora - #4004	2019-05-09 08:45:55 +02:00
Daniel Maya	c31948b7c2	Fixed netflow node name ... Former-commit-id: 0e134e7e70546aca26178336e4ff5ba2489d55ea	2019-04-30 17:30:57 +02:00
Daniel Maya	4b73518804	Fixed node name in netflow map ... Former-commit-id: 4805505ff44d05ea9fd4aaa8b1cb1b699c2e90f8	2019-04-26 09:54:38 +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	01d1fb1c11	fixed visual bug ... Former-commit-id: f2714283dd1f81c87505cdde349c33c6dd9bdc0b	2019-04-22 18:17:39 +02:00
alejandro-campos	4f6a81dc5b	visual changes to discovery ... Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db	2019-04-22 17:46:04 +02:00
fbsanchez	8978b49a8b	minor fix while setting node_radius by default ... Former-commit-id: 37b603adc1eb025c84b4e6d298815894be8adcf6	2019-04-22 09:33:51 +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
Daniel Barbero Martin	d5b1ac5565	fixed map IPAM ... Former-commit-id: a1334a1691a3e861f2510ac7d440f5730928ad9a	2019-04-08 18:28:27 +02:00
Daniel Barbero	4808e4ae97	fixed errors map ipam ... Former-commit-id: 9a1e5460ab40d22135edc75f2adf186f8d56f3d4	2019-04-05 16:43:36 +02:00
Tatiana Llorente	d91631e0e1	New design for the tables - #3707 ... Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499	2019-04-05 13:18:38 +02:00
fbsanchez	11b2fbc245	WIP db ... Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9	2019-04-02 16:25:29 +02:00
fbsanchez	b0a6ea7415	WIP atomic JS map. Minor fix to keep working ... Former-commit-id: fee809008311942f1d9ad14aea70ba78e3d6eb3a	2019-03-29 20:52:51 +01:00
fbsanchez	4854d4b2df	WIP atomic JS map ... Former-commit-id: 95736d11295948e5dc20aefcf1293b7882729588	2019-03-29 20:31:55 +01:00
fbsanchez	086ee0620e	minor fix ... Former-commit-id: ada4bf4a5cea2a2e534248e924996a4db0810bb2	2019-03-27 18:31:02 +01:00
fermin831	7b901be5fa	Changed default font size name on NetworkMap class ... Former-commit-id: b1437a7e03eba758d83386166db0063a5fcaf12f	2019-03-27 12:42:54 +01:00
fermin831	b2f046e4d6	Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/extras/mr/26.sql pandora_console/include/class/ConsoleSupervisor.php pandora_console/include/class/NetworkMap.class.php pandora_console/include/styles/pandora.css pandora_console/operation/menu.php Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18	2019-03-27 12:11:23 +01:00
fermin831	9ee095406b	Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/include/class/ConsoleSupervisor.php Former-commit-id: 7bdd1bfbcbc43410fb05465418979f4d085fa230	2019-03-27 11:59:25 +01:00
fbsanchez	3c853ff508	widget networkmap simple working ... Former-commit-id: 7a922350fbedefae374f89517e69863d60a8fbee	2019-03-27 11:47:09 +01:00
fbsanchez	3038de3a9d	minor fixes ... Former-commit-id: 73dbbaa42f3b6120400da688dee7a0499bf31796	2019-03-27 11:06:57 +01:00
Daniel Barbero Martin	5504741a9d	Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 ... Conflicts: pandora_console/include/class/ConsoleSupervisor.php Former-commit-id: d734637dea22b18b1d30a3d8575cd45500558e29	2019-03-26 18:48:49 +01:00
fbsanchez	08a240746c	breadcrum improvement discovery ... Former-commit-id: af861b0601e50dbe45ed1cab77ce5ab6f26d3fad	2019-03-26 17:28:31 +01:00
fbsanchez	3316d19bd3	minor fix ... Former-commit-id: ff5da555c29cdde5d632e090f2b9ac779ead262f	2019-03-26 17:00:20 +01:00