706 Commits

Author	SHA1	Message	Date
Manuel Montes	611291c217	Ent 5428 revision total de ayudas hint wiki	2020-05-29 11:37:06 +02:00
Daniel Barbero Martin	f2f1eaf58e	Fixed values legend charts sparse	2020-05-26 14:44:52 +02:00
Daniel Barbero Martin	ab8916a0da	Fixed error functions date default type	2020-05-22 09:39:10 +02:00
Tatiana Llorente	fabace239d	Ent 5675 textos del sistema de licencias	2020-05-12 12:54:20 +02:00
daniel	709201bf23	dashboards	2020-03-26 12:29:38 +01:00
Tatiana Llorente	ec57540fb0	Ent 5432 libreria de modulos de pandora integrada en consola	2020-02-27 11:20:24 +01:00
daniel	ac6ca52c45	Fixed resulution charts	2020-02-27 10:52:01 +01:00
marcos	e28415250c	remove entities from reports	2020-02-26 15:18:42 +01:00
vgilc	a0ea52983b	Revert "Merge branch 'ent-4239-entities-en-exportacion-de-informes-nodo-meta' into 'develop'" ... This reverts merge request !2519	2020-02-26 14:27:19 +01:00
marcos	f25aacf108	fixed erro2	2020-02-21 10:58:04 +01:00
Daniel Maya	ae015fa00f	Fixed width in availability graph	2020-02-05 16:40:01 +01:00
Daniel Rodriguez	bdb8d309ad	Merge branch 'ent-5359-8945-Logo-y-nombre-de-Pandora-FMS-al-fallar-la-base-de-datos' into 'develop' ... fix to display pandora tab subtitle based on condition and display rebranding... See merge request artica/pandorafms!3025	2020-02-03 14:06:38 +01:00
alejandro-campos	d21068e368	fix to display pandora tab subtitle based on condition and display rebranding product name in case database connection failed	2020-01-24 13:52:09 +01:00
Daniel Barbero Martin	6c6403336f	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2020-01-23 08:14:24 +01:00
marcos	18a3a747bd	add wiki url alerts correlation	2020-01-22 12:24:15 +01:00
Daniel Barbero Martin	89e83e38e0	Merge remote-tracking branch 'origin/develop' into new-vc-line-element ... Conflicts: pandora_console/include/javascript/pandora.js	2020-01-21 08:28:00 +01:00
Alejandro Campos	e7769b8bf4	Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' ... # Conflicts: # pandora_console/extras/mr/35.sql	2020-01-20 12:00:42 +01:00
Daniel Barbero Martin	536af6f33a	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2020-01-19 11:37:18 +01:00
Daniel Rodriguez	96eebe4310	Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' into 'develop' ... Added port option on server configuration to be used when connecting to execution server See merge request artica/pandorafms!3012	2020-01-17 14:40:58 +01:00
Daniel Barbero Martin	d5e21499c2	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2020-01-16 14:08:07 +01:00
Tatiana Llorente	0980c9a74a	Ent 5261 cambio de control de intervalo en alertas	2020-01-16 13:50:39 +01:00
alejandro-campos	d9062def99	Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' of https://brutus.artica.es:8081/artica/pandorafms into ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024	2020-01-15 16:01:11 +01:00
alejandro-campos	3f26f2ef6f	fix bug when deleting custom units and changed default value for byte multiplier	2020-01-15 16:00:33 +01:00
alejandro-campos	5eb2953810	Added port option on server configuration to be used when connecting to execution server	2020-01-14 15:43:17 +01:00
Daniel Barbero Martin	60bd600392	module graph convert to image base 64	2020-01-13 13:31:23 +01:00
Alejandro Campos	0468c85a4d	Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' ... # Conflicts: # pandora_console/godmode/setup/setup_visuals.php	2020-01-07 12:00:27 +01:00
daniel	3e58746cd5	Fixed errors PDF images relative routes	2019-12-17 18:18:00 +01:00
Daniel Barbero	a203da5a26	Fixed errors	2019-12-13 16:01:24 +01:00
daniel	3dbdfdb6eb	Fix Landscape reports	2019-12-11 15:07:38 +01:00
alejandro-campos	5880bec88a	changes in module data formatting when printed across the application and new setup options	2019-12-05 17:41:44 +01:00
daniel	960326b980	Add menu omnishell	2019-11-21 18:21:46 +01:00
Daniel Barbero Martin	7103317bc2	Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico ... Conflicts: pandora_console/general/header.php pandora_console/include/styles/pandora.css	2019-11-13 12:12:17 +01:00
alejandro-campos	a06f56a413	added function to convert cidr prefixes to mask	2019-10-23 17:22:18 +02:00
Daniel Barbero Martin	4e56f6751a	Continue work diagnostics	2019-10-17 15:17:28 +02:00
Daniel Rodriguez	c9cfbf0bf2	Merge branch 'ent-4461-Configuracion-integracion-integria' into 'develop' ... Ent 4461 configuracion integracion integria See merge request artica/pandorafms!2732	2019-09-26 14:34:50 +02:00
alejandro-campos	f73cd80336	minor changes in integria integration	2019-09-23 15:16:31 +02:00
alejandro-campos	9bf2980f01	fix minor bugs in integria integration	2019-09-23 12:48:20 +02:00
alejandro-campos	0df2447770	added comment management and fixed some errors in incident edition	2019-09-20 12:37:47 +02:00
Tatiana Llorente	8acdde9f3a	Added date filter - #4642	2019-09-18 18:19:29 +02:00
Tatiana Llorente	eb271a93eb	Added button for export to csv - #4642	2019-09-18 15:32:36 +02:00
Daniel Barbero Martin	84d1979c9e	fixed error percentil label	2019-09-18 11:15:55 +02:00
alejandro-campos	f2a6dbb60e	Merge remote-tracking branch 'origin/ent-4642-Listado-de-tickets-integración-Integria' into ent-4461-Configuracion-integracion-integria	2019-09-17 14:56:54 +02:00
alejandro-campos	87f8badc18	completed integria setup and incident creation and update	2019-09-17 13:38:17 +02:00
Tatiana Llorente	027f9fd9d4	New view - List of Integria IMS tickets - #4642	2019-09-17 12:59:29 +02:00
Tatiana Llorente	ca6fe42298	Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria	2019-09-13 12:00:04 +02:00
alejandro-campos	11cb53582c	backup changes	2019-09-02 17:01:41 +02:00
Daniel Rodriguez	c46686981e	Merge branch 'ent-4547-Entities-extrañas-en-el-CSV-del-Review-Logs' into 'develop' ... modified function to export audit csv to decode entities as separator See merge request artica/pandorafms!2692	2019-08-30 14:29:44 +02:00
alejandro-campos	f423ddc42f	modified function to export audit csv to decode entities as separator	2019-08-30 09:42:58 +02:00
Alejandro Fraguas	fadccf0ff3	Merge branch 'ent-4509-AADCM-MCM-8206-Bug-en-consola-visual-link-a-consola-visual-publica' into 'develop' ... Fixed bug in public visual console view See merge request artica/pandorafms!2672	2019-08-26 13:12:31 +02:00
manuel	e439e7349f	Fixed bug in public visual console view	2019-08-21 09:22:13 +02:00
Jose Gonzalez	5ab2bfacbd	Modified date formatting to avoid entities	2019-07-25 15:43:46 +02:00
Jose Gonzalez	5cdfb871a1	Modified the divider in print_audit_csv function	2019-07-25 15:35:57 +02:00
Daniel Barbero Martin	7fa95d3e43	PHP-FPM	2019-07-17 17:20:09 +02:00
fbsanchez	fc0d9463d5	Fixed	2019-06-25 12:07:56 +02:00
Daniel Rodriguez	265202f1ed	Merge branch 'ent-4136-button-styles' into 'develop' ... Review 1 See merge request artica/pandorafms!2470	2019-06-20 16:35:12 +02:00
fbsanchez	4424189632	Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor	2019-06-19 10:51:34 +02:00
fbsanchez	24025ebb74	Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles	2019-06-18 17:48:03 +02:00
fbsanchez	419a90d69c	wip event list	2019-06-07 17:35:13 +02:00
Daniel Maya	419b3f4fb1	Fixed module_manager with Agent limit surpassed or license expired	2019-06-03 10:47:54 +02:00
fbsanchez	eb5ee75d33	Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor	2019-06-03 09:18:49 +02:00
fbsanchez	94153b823f	Help links	2019-05-30 11:25:09 +02:00
fbsanchez	9eecc414dd	cps changes - switch core touched - test this commit carefully	2019-05-27 14:12:53 +02:00
fbsanchez	4fe7680694	Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor	2019-05-22 15:33:13 +02:00
fbsanchez	bd88cbd42d	1st approach simplifying MC management	2019-05-22 15:31:59 +02:00
manuel	ada49966e0	Merge branch 'develop' into ent-3468-Ayudas_online ... Conflicts: pandora_console/godmode/reporting/reporting_builder.php	2019-05-21 10:05:06 +02:00
Alejandro Fraguas	3548070ec1	Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' into 'develop' ... Add new message to News board See merge request artica/pandorafms!2415 Former-commit-id: b0adfc73ac247cda59dea01e83429e06ba5747ee	2019-05-14 17:56:43 +02:00
marcos.alconada	35c7ea1f48	Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4020-cambiar-mensaje-de-bienvenida-tnews ... Former-commit-id: 3c10d8ecea2a6fdb44a6003d45ccf146972a92e1	2019-05-14 17:14:02 +02:00
marcos.alconada	bc849c16fb	Only one image for welcome new board ... Former-commit-id: a8effda6019c394a9a2d15fbf4998490867b3b02	2019-05-14 17:13:44 +02:00
manuel	827ebcfbc5	Fix helps ... Former-commit-id: c4c666d8552f153a8d29320d655d27da50fa4267	2019-05-14 13:09:49 +02:00
manuel	b89751e647	Merge branch 'develop' into ent-3468-Ayudas_online ... Conflicts: pandora_console/godmode/alerts/configure_alert_command.php Former-commit-id: 9051a95f31fd7163a0b326d7e513c5689c5b304f	2019-05-14 11:50:07 +02:00
Alejandro Fraguas	8ff62a58ce	Merge branch 'ent-3695-ipam-oids' into 'develop' ... IPAM vlan wizard ExtremeXOS See merge request artica/pandorafms!2409 Former-commit-id: e3881101a9d529cf64241b24ed251eaafc45d6f5	2019-05-14 11:30:55 +02:00
manuel	20dace7de8	Merge branch 'develop' into ent-3468-Ayudas_online ... Conflicts: pandora_console/godmode/agentes/agent_manager.php Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3	2019-05-13 16:20:12 +02:00
Daniel Barbero Martin	ab2bf737d5	Merge remote-tracking branch 'origin/develop' into ent-3894-Bug-Feature-labels-weigh-en-graficas ... Conflicts: pandora_console/include/functions.php Former-commit-id: 6c1ef8bcb15b9969b25082851fa39c8241398b29	2019-05-10 12:18:10 +02:00
manuel	43ce4f9883	Added helps	2019-05-09 17:20:27 +02:00
manuel	143def5d87	Added helps	2019-05-09 13:43:53 +02:00
Daniel Rodriguez	ac101af72f	Merge branch '3631_Unidades_no_se_muestran_en_informes_de_graficas_combinadas' into 'develop' ... Added module units in module graphs See merge request artica/pandorafms!2237	2019-05-08 16:36:43 +02:00
fbsanchez	9bc5a2d346	IPAM vlan wizard ExtremeXOS	2019-05-08 14:17:40 +02:00
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
Daniel Barbero Martin	3fcd854ae6	fixed error labels graphs and weight in chart ... Former-commit-id: 52acfda4438417b711295ce8d335ea2748b1fa53	2019-05-06 16:43:59 +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	2aaeddd803	fixed errors IPAM subneting ... Former-commit-id: 58fb50dd594be993a1f17413ab9466d8588fa19a	2019-04-29 16:42:26 +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
samucarc	00eb2766a9	Fixed labels in automatic combined graphs ... Former-commit-id: f91777c30da55edc43d021b87cda2c0105626f64	2019-03-05 18:06:50 +01:00
Fermin	942b160a3d	Use multiples in network explorer table ... Former-commit-id: 2aec7e59e4ea46c693f5fe89c847f524cd882f63	2019-03-05 08:03:18 +01:00
samucarc	7d88af625e	Added module units in module graphs ... Former-commit-id: d17383bd9e8ea7101cf5479b01e2ab0bf45c6813	2019-03-04 15:53:47 +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
daniel	46c23f9deb	fixed minor errors in graphs: tree, labels, tocken meta	2018-06-14 12:17:16 +02:00
daniel	05d8d0ccf5	fixed errors graph	2018-06-13 19:13:42 +02:00
daniel	9ecc770519	remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces	2018-06-13 11:02:58 +02:00
daniel	25942907cf	Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio	2018-06-12 15:46:41 +02:00
daniel	2d6fa8d0e0	fixed errors graphs	2018-06-12 15:46:05 +02:00
vgilc	24ec62b807	Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop' ... fixed errors agent access and other fix See merge request artica/pandorafms!1525	2018-06-12 12:13:46 +02:00
daniel	6eba3250da	fixed errors agent access and other fix	2018-06-12 12:08:04 +02:00
Alejandro Gallardo Escobar	f6184b52da	Merge branch 'develop' into ent-639-add-user-defined-timezones	2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar	fac3e21829	Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone	2018-06-11 16:40:10 +02:00
daniel	abad4f4f4b	fixed minor errorstime graphs	2018-06-11 15:35:04 +02:00
daniel	adf9e4d1fe	fixed minor errors	2018-06-11 13:53:10 +02:00
daniel	f85a8b513a	fixed errors	2018-06-08 14:30:15 +02:00
daniel	eb7cdc7c90	fixed errors in graph delete to image pdf	2018-06-08 08:58:18 +02:00
daniel	7834869977	fixed water mark in graphs	2018-06-07 09:15:45 +02:00
daniel	d7da009804	fixed errors in graphs	2018-06-06 17:23:32 +02:00
daniel	badfd83b0d	Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio ... Conflicts: pandora_console/include/functions_graph.php pandora_console/include/graphs/fgraph.php	2018-06-06 11:57:02 +02:00
daniel	89a481c452	fixed errors in graphs	2018-06-06 11:18:39 +02:00
Junichi Satoh	5142112ae5	Fixed error and white screen with php7.2.	2018-06-05 11:34:19 +09:00
daniel	47a287b6f6	fixed errors in graph	2018-06-01 13:58:29 +02:00
daniel	a8b8f309e6	fixed graphs	2018-05-30 17:45:17 +02:00
daniel	dd57ddbd3c	Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio ... Conflicts: pandora_console/include/functions.php pandora_console/include/styles/pandora.css	2018-05-28 17:54:53 +02:00
daniel	02a442a8db	fixed errors in graph add phantom js	2018-05-28 17:47:40 +02:00
fermin831	88e060893a	Merge branch 'develop' into 2106-intracom-rebranding ... Conflicts resolved: pandora_console/operation/events/events_rss.php	2018-05-28 12:12:16 +02:00
daniel	16dca6860f	Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio ... Conflicts: pandora_console/include/graphs/flot/pandora.flot.js	2018-05-23 12:46:12 +02:00
fermin831	e71fd399fb	Merge branch 'develop' into 2106-intracom-rebranding ... Conflicts: pandora_console/godmode/admin_access_logs.php pandora_console/include/javascript/functions_pandora_networkmap.js	2018-05-22 19:29:46 +02:00
Alejandro Gallardo Escobar	dcdce9c8fc	Merge branch 'develop' into ent-639-add-user-defined-timezones	2018-05-22 17:58:47 +02:00
Alejandro Gallardo Escobar	37f19dc9fd	Fixed a column name	2018-05-22 16:17:08 +02:00
daniel	78f73d5a76	Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio	2018-05-21 17:26:19 +02:00
daniel	b323d524d6	fixed errors in graph update version	2018-05-21 17:25:09 +02:00
daniel	79354a0ebf	fixed graphs	2018-05-18 14:22:39 +02:00
fermin831	614db8b523	[Rebranding] Added product name and copyright notice to setup	2018-05-09 11:49:12 +02:00
fermin831	57fb63bd91	Fixed snapshots view in string data	2018-05-07 19:40:38 +02:00
Alejandro Gallardo Escobar	f1985313ab	The audit view and csv now use the user defined timezone	2018-05-07 16:10:31 +02:00
daniel	30dc841bae	custom graph	2018-04-27 10:03:05 +02:00
daniel	2a81703a68	fixed minor error custom graph	2018-04-26 10:24:37 +02:00
daniel	e7a8706434	Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio ... Conflicts: pandora_console/include/functions_graph.php pandora_console/include/graphs/fgraph.php pandora_console/include/graphs/flot/pandora.flot.js pandora_console/include/graphs/functions_flot.php	2018-04-23 12:21:11 +02:00
vgilc	778be05874	Merge branch 'ent-1902-sql-error' into 'develop' ... Elimina un error SQL al obtener noticias See merge request artica/pandorafms!1415	2018-04-17 16:22:44 +02:00
Alejandro Gallardo Escobar	d1608400f9	Avoid the news search for users without groups	2018-04-09 17:17:01 +02:00
fermin831	c96b883614	[Secondary groups] Fixed agent view to include secondary agents	2018-03-26 12:52:37 +02:00
daniel	d2390528ac	fixed errors in graphs	2018-02-27 16:28:00 +01:00
daniel	688acb8a4b	fixed error graphs	2018-02-23 14:31:00 +01:00
daniel	4b654bd87d	fixed errors grapgh	2018-02-21 11:54:24 +01:00
daniel	b6798bf31c	update flot.js	2018-02-16 13:41:31 +01:00
Ian Blenke	fbbc070b39	Adding a check for HTTP_X_FORWARDED_PROTO in https_is_running()	2018-02-15 09:34:24 -05:00
daniel	74a8212032	fixed error show events	2018-02-09 14:20:49 +01:00
fbsanchez	571ed36276	Fixed image handle in data view	2018-02-08 14:17:08 +01:00
enriquecd	ab24c3bf80	Merge branch 'develop' into 1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1 ... Conflicts: pandora_console/include/functions.php pandora_console/include/styles/pandora.css	2018-02-06 10:46:59 +01:00
daniel	0d0b7ada48	Merge branch 'develop' into 1749-sistena-cache-de-acl-s-de-la-consola ... Conflicts: pandora_console/include/functions_users.php	2018-01-30 17:56:30 +01:00
daniel	ad0b463d13	fixed errors acl	2018-01-30 17:44:51 +01:00
fbsanchez	2e1ab72a21	Reapplied #1000 solution	2018-01-24 17:28:00 +01:00
daniel	955c183cd8	fixed error ip validate	2018-01-08 11:12:07 +01:00
daniel	a335732267	fixed errors in graphs webproc and keep alive	2017-12-19 13:13:42 +01:00
daniel	4a1a0ae8b7	fixed errors in graphs	2017-12-13 17:17:45 +01:00
enriquecd	afd84ce74d	Change system audit log extended info to table format with change info - #1571	2017-11-24 10:59:44 +01:00
Ramon Novoa	cea0f90117	Remove HTML entities from the SNMP community. ... Ref. pandora_enterprise#1565.	2017-11-08 09:15:13 +01:00
Arturo Gonzalez	526f76d7d1	Added minor change to fix this issue	2017-09-20 12:08:31 +02:00
Arturo Gonzalez	da763824a9	Added a minor change to test optimization	2017-09-19 10:48:30 +02:00
daniel	d74a3f74b4	Merge branch 'develop' into 1056-pandora-wux-grid-server	2017-09-01 10:51:54 +02:00
Arturo Gonzalez	0e7b00f26e	Added correct user and fixed db error	2017-08-28 16:38:30 +02:00
Arturo Gonzalez	bab1f14a31	Added remote command execute to agent wizard	2017-08-28 12:44:51 +02:00
daniel	c29d8a4fdb	Revert "merge develop" ... This reverts commit 8232911713, reversing changes made to f5da86ac0a.	2017-08-23 09:35:17 +02:00
vgilc	c09033ae03	Merge branch '1000-Sentencia_UNION_restringida_en_informes_SQL' into 'develop' ... allow UNION sql reports See merge request !704	2017-08-18 13:01:53 +02:00
Arturo Gonzalez	ea06ba213b	Added registration method to reset pass	2017-08-03 13:05:57 +02:00
daniel	20fc24b99e	allow UNION sql reports	2017-08-03 11:32:43 +02:00
daniel	179325447f	Revert "Use session and not exec sql if already exists acl perms in session - #1017" ... This reverts commit 78bb583824.	2017-07-28 12:46:17 +02:00
enriquecd	78bb583824	Use session and not exec sql if already exists acl perms in session - #1017	2017-06-28 11:31:45 +02:00
artu30	faa353bc5c	Merge branch 'develop' into '635-reset-or-recover-password-in-pandora-node-and-meta-dev' ... # Conflicts: # pandora_console/include/help/clippy/extension_cron_send_email.php	2017-05-23 09:50:22 +02:00
Arturo Gonzalez	b10f1f422f	Added more restrictions to user dashboard function	2017-04-20 18:02:34 +02:00
Arturo Gonzalez	87f3798499	Added dashboards to "edit my user" section	2017-04-20 17:36:26 +02:00