475 Commits

Author	SHA1	Message	Date
manuel	b2b4372c9d	Added helps ... Former-commit-id: 0f3894ec81918c25e33bfb67463f4709e156c374	2019-05-07 11:34:09 +02:00
manuel	00b5fc0a2c	Added helps ... Former-commit-id: 54292202ea50b6a15c909875853b52fe2f1a045a	2019-05-06 16:59:31 +02:00
manuel	b1dd6edc64	Added changes in helps ... Former-commit-id: e63717665df7be9e2f00b5492ef77c8e93a4e9a4	2019-04-30 12:28:11 +02:00
manuel	7045e59e87	Added changes in helps ... Former-commit-id: 863eec78c48a3a29b62326dc7ef2609b2990819c	2019-04-30 10:44:53 +02:00
Daniel Barbero Martin	ac41e9255f	helpers ... Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536	2019-04-24 13:53:18 +02: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
Ramon Novoa	d740b32810	Add support for DESTDIR. ... Former-commit-id: 0252a660a3d8250657cd5f7b8fcfd620172c8a65	2019-03-26 11:47:20 +01:00
Fermin	942b160a3d	Use multiples in network explorer table ... Former-commit-id: 2aec7e59e4ea46c693f5fe89c847f524cd882f63	2019-03-05 08:03:18 +01:00
fbsanchez	e397353f71	minor fix get_parameter_switch ... Former-commit-id: c8e430e1cbd789a99058217e7dffb4098aab821a	2019-02-15 14:03:16 +01:00
fbsanchez	efdc17b801	WIP: H&D ... Former-commit-id: 605aa350c6d8d9bcebadbb941bba2a6fc399cb7c	2019-02-15 13:08:44 +01:00
fbsanchez	f4c22d2250	added extra arguments to get_snmpwalk ... Former-commit-id: bf02258e312d3a81673e79a144173b53e0c2c153	2019-02-07 13:01:21 +01:00
artica	b3da2803a4	Changed the format of the .php files ... Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399	2019-01-30 16:18:44 +01:00
daniel	61c9603ae8	Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan ... Former-commit-id: ec5c28bb52343952fd644c1f999d3b5ef04cd709	2019-01-25 09:55:09 +01:00
fermin831	072ad0a1ea	Add return value to generate_hash_to_api function ... Former-commit-id: b6420e14ab59c08c661a11763edaaa52ad612af8	2019-01-24 13:38:13 +01:00
daniel	dc2b738776	IPAM supernet ... Former-commit-id: f34430ee824f4221b2922b02b844bd6c7d97614c	2019-01-21 09:24:00 +01:00
daniel	1c8d846574	WIP IPAM Supernet ... Former-commit-id: 9da8df381292bc79a49c1416fc6d2820f4b814ac	2019-01-17 15:49:41 +01:00
fermin831	9531065dbe	Merge branch 'develop' into ent-2753-meter-profiler-en-el-docker ... Former-commit-id: da01f6f0f7f223755a6c2a72cadafac075b6a3c0	2018-12-20 18:17:57 +01:00
daniel	807f7a0b74	fixed minor error ... Former-commit-id: e855d814160365c0b6f53d15ea40b3c1bed16890	2018-12-13 17:24:01 +01:00
daniel	a76895f20e	fixed error metaconsole template send template ... Former-commit-id: 2b92b353a4811d6aec22e2a61c128cc24b01ba14	2018-12-13 12:47:22 +01:00
daniel	07f5455e28	fixed errors in cron jobs ... Former-commit-id: 6926e6cca21cb43d4c08ed0c4c48ae344abe8fab	2018-12-12 10:46:28 +01:00
fbsanchez	c728cb1412	fixed related changes in phantomjs interface	2018-11-29 17:26:41 +01:00
daniel	494b858a20	fixed errors session_start	2018-11-21 13:08:58 +01:00
fermin831	06830c9f69	Added profiller to docker	2018-11-13 12:55:25 +01:00
manuel.montes	df8c5e8bf9	Fixed bug in deleted policies	2018-11-06 13:52:03 +01:00
Ramon Novoa	6353af0482	Merge remote-tracking branch 'github/develop' into develop	2018-10-29 13:20:48 +01:00
daniel	0b0bad8a73	Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP ... Conflicts: pandora_console/extras/mr/22.sql pandora_console/include/chart_generator.php pandora_console/include/functions_graph.php pandora_console/include/functions_reporting.php pandora_console/include/functions_reporting_html.php pandora_console/include/graphs/fgraph.php	2018-10-25 17:43:28 +02:00
vgilc	aabd5435d0	Merge branch '2535-Macro-para-unidad-informes' into 'develop' ... Added unit in label graphs See merge request artica/pandorafms!1874	2018-10-25 13:12:26 +02:00
manuel.montes	972f4b1e89	Added unit in label graphs	2018-10-19 14:03:15 +02:00
Ramón Novoa	3e584747b3	Merge pull request #104 from sofwerx/https-proxy ... Adding a check for HTTP_X_FORWARDED_PROTO in https_is_running()	2018-10-11 09:34:26 +02:00
daniel	e2f7157545	fixed php7	2018-10-04 11:43:08 +02:00
manuel.montes	d0e7b86112	Fixed bug in deleted policies from the metaconsole	2018-09-18 09:41:05 +02:00
fermin831	764b1125bd	Generate session csrf code to avoid attacks in user edition	2018-09-13 15:19:08 +02:00
daniel	f117d1af43	fixed heigth charts for reports	2018-09-11 09:33:24 +02:00
Alejandro Gallardo Escobar	21bad5330b	Bug fix	2018-09-04 17:24:03 +02:00
fbsanchez	ae6d7139b4	is_management_allowed fix	2018-07-24 18:24:03 +02:00
fbsanchez	581cf7c5a0	Added management_allowed	2018-07-24 17:55:33 +02:00
fermin831	001861b746	Hide policy edition on centralized management on node	2018-07-17 08:51:39 +02:00
daniel	23ef9c8f53	Merge remote-tracking branch 'origin/develop' into ent-2076-ue-mejoras-en-gestion-de-politicas-desde-metaconsola	2018-07-12 14:49:59 +02:00
daniel	fce669ae21	fixed minor errors in legend charts	2018-07-10 17:53:19 +02:00
fermin831	aaf8173b8a	Added is_central_policies function	2018-07-10 17:49:46 +02:00
Alejandro Gallardo Escobar	de58fe7b90	Fixes	2018-07-06 14:03:05 +02:00
daniel	0dd39f1f00	fixed errors in graph slice for uncompresed	2018-07-05 11:52:52 +02:00
daniel	eaf5abd476	fixed keep alive bool type module 100	2018-06-25 15:35:12 +02:00
daniel	aa4f13d17a	fixed errors in graphs	2018-06-20 11:31:43 +02:00
fbsanchez	73567f1859	Trying to adjust graph render sizes	2018-06-19 19:19:38 +02:00
danielmaya	4214577eea	Added new token for static graph height	2018-06-19 18:27:04 +02:00
danielmaya	9bff4f28f4	Fixed graph with https	2018-06-19 15:00:39 +02:00
daniel	7d4a29cbe2	fixed errors in meta and windows	2018-06-14 19:19:58 +02:00
daniel	9e229e6228	fixed minor errors	2018-06-14 18:14:54 +02:00
daniel	80ddcbe1b6	fixed security error phantomjs	2018-06-14 16:47:23 +02:00