tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,616 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

17616 Commits

Author SHA1 Message Date
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
manuel.montes bc98327bb4 Fixed cache in functions_users.php 2018-05-28 17:33:35 +02:00
artica 01cce15955 Updated version and build strings. 2018-05-28 13:20:38 +02:00
manuel.montes 23b6dd5bdb Fixed menu with top property 2018-05-28 12:58:23 +02:00
vgilc 8cb5dea3d9 Merge branch '194-async-recovery' into 'develop' 
I fixed the bug about async_recovery.

Closes #194

See merge request artica/pandorafms!1493
 2018-05-28 12:50:28 +02:00
vgilc a2941864a1 Merge branch '2106-intracom-rebranding' into 'develop' 
2106 intracom rebranding

See merge request artica/pandorafms!1473
 2018-05-28 12:49:51 +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
vgilc ba7292d292 Merge branch '2270-vulnerabilidad' into 'develop' 
Added check_login to plugin registration

See merge request artica/pandorafms!1500
 2018-05-28 11:49:15 +02:00
fbsanchez 2f8cdb5ea5 Added check_login to plugin registration 2018-05-28 11:31:09 +02:00
artica 2e4b320861 Auto-updated build strings. 2018-05-28 00:01:21 +02:00
artica 9ff98af9a5 Auto-updated build strings. 2018-05-27 00:01:26 +02:00
artica edd38ac9c8 Auto-updated build strings. 2018-05-26 00:01:24 +02:00
manuel.montes f0e7a59ae7 Implement function io_safe_output 2018-05-25 14:21:52 +02:00
fermin831 7afc617e62 [Rebranding] Implemented server rebranding through environment vars 2018-05-25 12:39:30 +02:00
fermin831 a54c074b11 [Rebranding] Added hide help on node 2018-05-25 10:29:40 +02:00
artica 643a07a163 Auto-updated build strings. 2018-05-25 00:01:22 +02:00
fermin831 6675597b62 [Rebranding] Minor fix 2018-05-24 18:35:20 +02:00
fermin831 8eb44762b2 [Rebranding] Added custom favicon and white background to meta 2018-05-24 18:33:45 +02:00
vgilc cbc68f4f90 Merge branch '2235-Insert-data-vuelve-a-fallar-dev' into 'develop' 
Fixed id_agente lost in insert_data

See merge request artica/pandorafms!1498
 2018-05-24 17:30:17 +02:00
danielmaya 3f1a1a816b Fixed id_agente lost in insert_data 2018-05-24 17:24:53 +02:00
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
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
manuel.montes b28047ae9e Fixed the online-style of submit 2018-05-24 13:56:29 +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
danielmaya ad7e8229ed Added check_login 2018-05-24 09:02:06 +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
Alejandro Gallardo Escobar dcdce9c8fc Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-05-22 17:58:47 +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