17432 Commits

Author SHA1 Message Date
vgilc
c489ae1b4c Merge branch '2267-Pete-Tree-VIew-dev' into 'develop'
fixed conditional in ajax.php

See merge request artica/pandorafms!1497
2018-05-24 16:41:59 +02:00
danielmaya
8a6755d224 fixed conditional in ajax.php 2018-05-24 16:28:51 +02:00
fermin831
063865e179 [Rebranding] Refactorized logos preview in nodo 2018-05-24 12:50:24 +02:00
vgilc
ad3a7071b3 Merge branch '2297-Visor-de-logs-pone-un-ancho-enorme-y-se-mete-en-scroll-horizontal' into 'develop'
Fixed white-space / pre-wrap

See merge request artica/pandorafms!1494
2018-05-24 12:07:09 +02:00
fermin831
acad8d537b [Rebranding] Added tooltip to avoid Monitoring Event name will be changed 2018-05-24 11:37:26 +02:00
fermin831
66dfd9b171 [Rebranding] Change alert action Pandora FMS Event to Monitoring Event 2018-05-24 11:16:30 +02:00
fermin831
bcb3af09ca [Rebranding] Minor fix 2 2018-05-24 10:56:24 +02:00
fermin831
653248698d [Rebranding] Remove a obsolete link 2018-05-24 10:31:51 +02:00
artica
bd48fe4fe6 Auto-updated build strings. 2018-05-24 00:01:24 +02:00
enriquecd
dbafab2ae7 Add cluster and API get functions - #2294 2018-05-23 19:13:47 +02:00
fermin831
5e9cf38474 [Rebranding] Modified some strings to new installations 2018-05-23 18:21:42 +02:00
fermin831
43447bbee4 [Rebranding] Minor ended fixed 2018-05-23 18:19:24 +02:00
manuel.montes
b68948307b Fixed white-space / pre-wrap 2018-05-23 17:55:07 +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
vgilc
dcf6e46f61 Merge branch 'ent-2105-internal-audit-view-improvements' into 'develop'
Más corrección de errores

See merge request artica/pandorafms!1492
2018-05-23 08:46:52 +02:00
vgilc
6727941bac Merge branch 'ent-2268-fallo-en-la-vista-de-RSS-de-eventos' into 'develop'
Fixed rss events due to secondary groups

See merge request artica/pandorafms!1481
2018-05-23 08:45:45 +02:00
vgilc
076724ba35 Merge branch '1141-Ajustar-grafica-a-los-valores-mostrados' into 'develop'
add zoom graphs xy

See merge request artica/pandorafms!1491
2018-05-23 08:45:17 +02:00
nknsh
4a58b8cb7d I fixed the bug about async_recovery.
When the async module recovers automatically, known_status and last_known_status are updated to 0.
2018-05-23 13:49:14 +09:00
artica
e015354a99 Auto-updated build strings. 2018-05-23 00:01:24 +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
fermin831
2c97232f90 [Rebranding] Miscelaneous rebranding 2018-05-22 19:22:37 +02:00
fbsanchez
ef778f296c PluginTools Added get_value_translated 2018-05-22 17:18:11 +02:00
fermin831
9935b7f8a3 [Rebranding] Added custom logo to node request new license 2018-05-22 16:49:49 +02:00
Alejandro Gallardo Escobar
9d558fb7cb Removed some duplicated html entities 2018-05-22 16:30:33 +02:00
Alejandro Gallardo Escobar
37f19dc9fd Fixed a column name 2018-05-22 16:17:08 +02:00
daniel
3accc31372 add zoom graphs xy 2018-05-22 15:57:36 +02:00
fermin831
946e897db6 [Rebranding] Get the correct header logo in the metaconsole 2018-05-22 15:26:11 +02:00
fermin831
2e8e3c27b6 [Rebranding] Modified tinylogo by custom_logo in node 2018-05-22 13:40:23 +02:00
Junichi Satoh
cb10d6d4a4 Fixed warnings and some icons are not shown correctly with php7.2. 2018-05-22 20:18:49 +09:00
daniel
727b173392 fixed error library pdf example 2018-05-22 13:15:09 +02:00
fbsanchez
a5be501f4d Merge remote-tracking branch 'origin/develop' into 2016-plugin-monitorizacion-con-docker-swarm 2018-05-22 11:41:29 +02:00
fbsanchez
9f140e6197 Applied lukasr patch for pchart 2018-05-22 10:51:03 +02:00
daniel
25666e1bff fixed errors 2018-05-22 10:50:38 +02:00
vgilc
58370449dd Merge branch 'ent-2200-Unreachable-host-en-respuestas-de-eventos' into 'develop'
Removed unreachable host from events responses

See merge request artica/pandorafms!1450
2018-05-22 10:00:37 +02:00
artica
4b197ab61a Auto-updated build strings. 2018-05-22 00:01:31 +02:00
fermin831
0e3db1eb80 [Rebranding] Added custom logo to network maps central node 2018-05-21 18:26:28 +02:00
fbsanchez
a321c80255 Merge remote-tracking branch 'origin/develop' into 2016-plugin-monitorizacion-con-docker-swarm 2018-05-21 18:14:48 +02:00
fbsanchez
a82299f1cf PluginTools minor changes
API cluster minor changes
2018-05-21 18:08:36 +02:00
vgilc
f9a5df12db Merge branch 'ent-2266-mobile-sql-injection-vulnerability' into 'develop'
Vulnerabilidad: Inyección SQL en la consola móvil

See merge request artica/pandorafms!1486
2018-05-21 17:55:47 +02:00
vgilc
a075d5ff8f Merge branch 'ent-2105-internal-audit-view-improvements' into 'develop'
Corrección de errores

See merge request artica/pandorafms!1488
2018-05-21 17:53:07 +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
Alejandro Gallardo Escobar
f0f331be4e Moved a button 2018-05-21 16:22:38 +02:00
Alejandro Gallardo Escobar
447958144e Error fix 2018-05-21 16:00:54 +02:00
Alejandro Gallardo Escobar
2e96c2bbd1 Fixed a SQL injection vulnerability 2018-05-21 15:19:25 +02:00
Ramon Novoa
8bda3751df Improvements to the Pandora FMS Recon Server.
- Ignore virtual interfaces.
- Improved scan of ARP caches.
2018-05-21 15:03:54 +02:00
fbsanchez
2ab45d28b8 Added api_get_agent_id (API) updated plugintools 2018-05-21 14:42:27 +02:00
Fermin
8f2302630c [Rebranding] Docs and Support login icons are configurables 2018-05-21 14:29:11 +02:00
Fermin
3497132517 [Rebranding] Moved rebranding to visual styles section 2018-05-21 11:56:16 +02:00
vgilc
1f3e09ae14 Merge branch '2162-filtrado-de-interfaces-en-dynamic-snmp' into 'develop'
Added dynamic_snmp to std Pandora versioning

See merge request artica/pandorafms!1422
2018-05-21 11:45:52 +02:00