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

17697 Commits

Author SHA1 Message Date
manuel.montes 17b2b01e7a Fixed select in modificar_agente.php 2018-06-08 14:09:59 +02:00
danielmaya 7dfd3fcfa1 changes in tdatabase 2018-06-08 13:21:33 +02:00
daniel eb7cdc7c90 fixed errors in graph delete to image pdf 2018-06-08 08:58:18 +02:00
artica 937cfb7d1e Auto-updated build strings. 2018-06-08 00:01:27 +02:00
Fermin 9bf6102ac6 [ACL API] Added ACL in some set functions 2018-06-07 19:45:54 +02:00
vgilc 7cc0520a1d Merge branch 'ent-2316-5594-fallo-redireccion.linked-visual-consoles-desde-Metaconsola-2' into 'develop' 
Fixed visualconsole status modules and agents in metaconsole

See merge request artica/pandorafms!1519
 2018-06-07 16:09:59 +02:00
Fermin 054b915846 [ACL API] Fixed get planned_downtimes_items and added ACL to more the rest of get functions 2018-06-07 13:11:40 +02:00
Fermin 2e1bb2ac9c Merge branch 'develop' into 2290-seguridad-en-la-api 
Conflicts:
	pandora_console/include/functions_api.php
 2018-06-07 11:38:37 +02:00
Fermin 2a9a7b931a Fixed visualconsole status modules and agents in metaconsole 2018-06-07 10:03:27 +02:00
daniel 7834869977 fixed water mark in graphs 2018-06-07 09:15:45 +02:00
artica 18e047d25e Auto-updated build strings. 2018-06-07 00:01:25 +02:00
fermin831 b3bdd5d492 [API ACL] More get functions (2) 2018-06-06 19:39:57 +02:00
fermin831 7f2d583f63 [API ACL] More get functions 2018-06-06 19:04:06 +02:00
daniel 867e00c50d fixed minor error 2018-06-06 18:00:44 +02:00
daniel ea6f96e96b fixed minor error api 2018-06-06 17:53:52 +02:00
daniel d7da009804 fixed errors in graphs 2018-06-06 17:23:32 +02:00
fermin831 0afd436cea [ACL API] Added ACL to some get api calls and refactorized agent count 2018-06-06 15:04:30 +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
artica 3fbdd3d026 Auto-updated build strings. 2018-06-06 00:01:25 +02:00
vgilc eac44e861e Merge branch '2196-Menús-fijados-+-Classic-menu-hace-cosas-raras' into 'develop' 
Fixed jquery in pandora_console/general/main_menu.php

See merge request artica/pandorafms!1518
 2018-06-05 16:45:48 +02:00
manuel.montes 4281824555 Fixed jquery in pandora_console/general/main_menu.php 2018-06-05 16:23:30 +02:00
vgilc 23142509a0 Merge branch '2035-Mala-colocación-items-en-exportación-dev' into 'develop' 
Fixed line graph and box item when exporting visual consoles

See merge request artica/pandorafms!1517
 2018-06-05 16:01:10 +02:00
danielmaya f8aa351987 Fixed line graph and box item when exporting visual consoles 2018-06-05 15:14:27 +02:00
vgilc 9cd95e2a48 Merge branch '2154-Fallo-de-visualización-al-crear-y-eliminar-grupos-de-agentes' into 'develop' 
2154 fallo de visualización al crear y eliminar grupos de agentes

See merge request artica/pandorafms!1502
 2018-06-05 11:11:57 +02:00
vgilc a69550f79e Merge branch 'fix-warnings-with-php72' into 'develop' 
Fixed warnings and some icons are not shown correctly with php7.2.

See merge request artica/pandorafms!1490
 2018-06-05 10:26:40 +02:00
vgilc ede1a3e091 Merge branch 'fix-error-with-php72' into 'develop' 
Fixed error and white screen with php7.2.

See merge request artica/pandorafms!1515
 2018-06-05 10:26:10 +02:00
manuel.montes d4aae1c4c1 Fixed checkbox select in manage_network_templates.php 2018-06-05 10:11:44 +02:00
vgilc 6152e93a9e Merge branch '1973-Entities-en-op-masivas-plugins' into 'develop' 
Implement function io_safe_output

See merge request artica/pandorafms!1499
 2018-06-05 09:44:00 +02:00
vgilc 2be81f76b9 Merge branch '2196-Menús-fijados-y-Classic-menu-hace-cosas-raras' into 'develop' 
Fixed menu with top property

See merge request artica/pandorafms!1501
 2018-06-05 09:42:01 +02:00
Junichi Satoh 5142112ae5 Fixed error and white screen with php7.2. 2018-06-05 11:34:19 +09:00
artica db4ce74311 Auto-updated build strings. 2018-06-05 00:01:23 +02:00
vgilc 6348ebb2a4 Merge branch '2035-Mala-colocación-items-en-exportación-consola-visual-dev' into 'develop' 
Fixed export and import visual consoles

See merge request artica/pandorafms!1514
 2018-06-04 16:42:23 +02:00
danielmaya 89aa85626c Fixed export and import visual consoles 2018-06-04 15:56:17 +02:00
vgilc b620c1e7d9 Merge branch '2016-plugin-monitorizacion-con-docker-swarm' into 'develop' 
Minor fix in plugintools api_methods

See merge request artica/pandorafms!1484
 2018-06-04 10:19:56 +02:00
vgilc dbb802fb31 Merge branch '2214-Crear-nuevo-tipo-de-custom-graph-thermometer' into 'develop' 
New graph thermometer - #2214

See merge request artica/pandorafms!1465
 2018-06-04 10:19:21 +02:00
vgilc e808150f6b Merge branch '2251-Advertencia-al-cambiar-nombre-de-modulo-de-tipo-interfaz' into 'develop' 
Show warning modal window when change snmp or satellite module name - #2251

See merge request artica/pandorafms!1480
 2018-06-04 10:18:44 +02:00
vgilc e0f5fae11a Merge branch 'pandora_enterprise#2274-mejoras-recon-onenet' into 'develop' 
Improvements to the Pandora FMS Recon Server.

See merge request artica/pandorafms!1485
 2018-06-04 10:18:18 +02:00
vgilc d8b219802c Merge branch 'ent-1068-permisos-por-defecto-apache-var-log-pandora' into 'develop' 
Fixed permissions in default log folders

See merge request artica/pandorafms!1510
 2018-06-04 10:17:43 +02:00
vgilc 4abf3f3b2e Merge branch '1976-Informe-de-log-dev' into 'develop' 
Fixed sources in log report

See merge request artica/pandorafms!1508
 2018-06-04 10:17:17 +02:00
vgilc 0008e0183b Merge branch 'ent-2247-busqueda-libre-en-vista-de-eventos-ext-5725' into 'develop' 
Fixed free search in events view

See merge request artica/pandorafms!1511
 2018-06-04 10:15:29 +02:00
vgilc 900f6ba609 Merge branch '2294-Requisitos-API-cluster-2' into 'develop' 
Add cluster and API get functions - #2294

See merge request artica/pandorafms!1495
 2018-06-04 10:13:28 +02:00
vgilc b7dcd79eb3 Merge branch 'ent-2329-graficas-en-tiempo-real-con-modulos-SNMP-fallo-en-algunos-casos' into 'develop' 
Fixed problems with strange names on SNMP realtime graphs

See merge request artica/pandorafms!1509
 2018-06-04 10:12:27 +02:00
vgilc 9ea0115043 Merge branch 'ent-2010-error-de-ACLs-en-custom-graphs-y-reports' into 'develop' 
[ACL] Now only RM can delete custom graphs

See merge request artica/pandorafms!1341
 2018-06-04 10:10:56 +02:00
vgilc b2eada198a Merge branch 'ent-2142-la-vista-de-grupos-del-nodo-usando-la-cache-esta-mal' into 'develop' 
Ent 2142 la vista de grupos del nodo usando la cache esta mal

See merge request artica/pandorafms!1512
 2018-06-04 10:00:53 +02:00
vgilc 0943540b05 Merge branch '2316-5594-fallo-redireccion.linked-visual-consoles-desde-Metaconsola' into 'develop' 
Fixed static graph links to another visual console in meta

See merge request artica/pandorafms!1507
 2018-06-04 09:59:51 +02:00
artica 77ccbe46a9 Auto-updated build strings. 2018-06-04 00:01:20 +02:00
artica 8138c2f8ae Auto-updated build strings. 2018-06-03 00:01:19 +02:00
artica 57ef534909 Auto-updated build strings. 2018-06-02 00:01:26 +02:00
daniel 97aaad0b02 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-01 14:04:46 +02:00