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

16943 Commits

Author SHA1 Message Date
vgilc 2b608bf914 Merge branch '2080-Informe_de_tipo_Network_Interface_con_TIP_no_funciona_3' into 'develop' 
fixed minor error fullscale in report interfaces metaconsole

See merge request artica/pandorafms!1406
 2018-04-03 13:05:25 +02:00
vgilc 7cf5442070 Merge branch '2122-Nodo-origen-y-destino-en-las-relaciones-de-los-mapas-de-red-dev' into 'develop' 
Fixed raw_text undefined in networkmap

See merge request artica/pandorafms!1405
 2018-04-03 13:04:57 +02:00
daniel cac55053e3 fixed minor error fullscale in report interfaces metaconsole 2018-04-03 12:42:54 +02:00
danielmaya 7327998985 Fixed raw_text undefined in networkmap 2018-04-03 12:25:51 +02:00
vgilc b92ec56140 Merge branch '1878-Cluster-Añadir-opciones-de-permisos-ACL-para-clster-view-y-que-no-aparezca-grupo-all-en-el-creador-de-clusters-4' into 'develop' 
Fix cluster ACL - #1878

See merge request artica/pandorafms!1400
 2018-04-03 09:48:42 +02:00
vgilc c087ca8138 Merge branch '983-API-and-CLI-apply-template-components-help' into 'develop' 
Add help to CLI - #983

See merge request artica/pandorafms!1404
 2018-04-03 09:47:59 +02:00
vgilc c006ee227f Merge branch '2026-Quitar-el-parpadeo-del-reloj-digital-fix' into 'develop' 
Not blink separatos points in visual console digital clock - #2026

See merge request artica/pandorafms!1401
 2018-04-03 09:35:58 +02:00
vgilc 90280fd943 Merge branch '2030-Esconder-los-campos-de-tipo-password-dentro-de-los-custom-fields-del-agente-4' into 'develop' 
Hide password custom fields in agent view - #2030

See merge request artica/pandorafms!1399
 2018-04-03 09:35:22 +02:00
vgilc 3b418faeb2 Merge branch '2098-5480-Error-SQL-vista-de-informes-por-informes-creados-a-través-wizard' into 'develop' 
Fix reports made by wizard - #2098

See merge request artica/pandorafms!1402
 2018-04-03 09:34:51 +02:00
artica 337822a608 Auto-updated build strings. 2018-04-03 00:01:22 +02:00
enriquecd 4f57461b71 Add help to CLI - #983 2018-04-02 15:29:59 +02:00
nramon a5536f849d Merge branch '2080-Informe_de_tipo_Network_Interface_con_TIP_no_funciona_2' into 'develop' 
fixed minor error report network interfaces nodo

See merge request artica/pandorafms!1403
 2018-04-02 13:06:22 +02:00
daniel 4086162705 fixed minor error hel manage.pl 2018-04-02 12:56:50 +02:00
daniel c2ba4e20db fixed minor error report network interfaces nodo 2018-04-02 12:23:47 +02:00
artica 1ab18d6c2d Auto-updated build strings. 2018-04-02 00:01:21 +02:00
artica 4e5d2477ac Auto-updated build strings. 2018-04-01 00:01:22 +02:00
artica 727b69462a Auto-updated build strings. 2018-03-31 00:01:21 +02:00
artica 7976e0461f Auto-updated build strings. 2018-03-30 00:01:21 +02:00
artica 9ea7dc0dbb Auto-updated build strings. 2018-03-29 00:01:22 +02:00
enriquecd 5418bbd099 Fix reports made by wizard - #2098 2018-03-28 18:54:15 +02:00
enriquecd 09d712d1ab Not blink separatos points in visual console digital clock - #2026 2018-03-28 18:42:59 +02:00
enriquecd 4378dc48ad Fix cluster ACL - #1878 2018-03-28 18:37:59 +02:00
enriquecd 52b61933df Hide password custom fields in agent view - #2030 2018-03-28 18:14:15 +02:00
artica 94936a46e9 Auto-updated build strings. 2018-03-28 00:01:22 +02:00
vgilc e8e8b0ac03 Merge branch '2041-No-funcionan-mapas-de-red-dev' into 'develop' 
Fixed target and source undefined

See merge request artica/pandorafms!1396
 2018-03-27 17:32:22 +02:00
danielmaya 8b3ec8146d Fixed target and source undefined 2018-03-27 16:36:26 +02:00
vgilc 985a7eec97 Merge branch '2110-EXT-5521-Error-al-subir-colecciones-2' into 'develop' 
Fix api collection function include - #2110

See merge request artica/pandorafms!1395
 2018-03-27 08:41:55 +02:00
artica ac2638ceea Auto-updated build strings. 2018-03-27 00:01:22 +02:00
enriquecd 9bb7ba475e Fix api collection function include - #2110 2018-03-26 18:34:52 +02:00
vgilc eec1e044c3 Merge branch '1922-error-paginado-eventos-meta-dev' into 'develop' 
Added tmetaconsole_agent in function agents_get_alias

See merge request artica/pandorafms!1394
 2018-03-26 12:38:51 +02:00
danielmaya e83c3bb5aa Added tmetaconsole_agent in function agents_get_alias 2018-03-26 12:03:25 +02:00
artica 999edad737 Auto-updated build strings. 2018-03-26 00:01:20 +02:00
artica b2ed2fbe45 Auto-updated build strings. 2018-03-25 00:01:20 +01:00
artica c91e71569c Auto-updated build strings. 2018-03-24 00:01:24 +01:00
vgilc 4371551a1b Merge branch '2096-shorten_labels_in_hbars' into 'develop' 
Fixed label shortener in hbar

See merge request artica/pandorafms!1385
 2018-03-23 11:18:54 +01:00
fbsanchez 526bd5f8c5 Merge remote-tracking branch 'origin/develop' into 2096-shorten_labels_in_hbars 2018-03-23 11:08:48 +01:00
vgilc 546b5af4cf Merge branch '2080-Informe_de_tipo_Network_Interface_con_TIP_no_funciona' into 'develop' 
fixed errors in reports interfaces metaconsole

See merge request artica/pandorafms!1393
 2018-03-23 09:34:15 +01:00
daniel f750d0f49e fixed errors in reports interfaces metaconsole 2018-03-23 08:00:32 +01:00
artica dd59704729 Auto-updated build strings. 2018-03-23 00:01:21 +01:00
Ramon Novoa ae3d8ff9a5 Add a Dockerfile to build the Pandora FMS image. 2018-03-22 15:54:53 +01:00
vgilc 8451bbf9cf Merge branch '2058-migrar-agentes-desde-metaconsola-2' into 'develop' 
2058 migrar agentes desde metaconsola 2

See merge request artica/pandorafms!1391
 2018-03-22 13:53:57 +01:00
vgilc 1501d8ecf5 Merge branch '2030-5422-Esconder-los-campos-de-tipo-password-dentro-de-los-custom-fields-del-agente-2' into 'develop' 
Hide passwords fields data in treeview and events - #2030

See merge request artica/pandorafms!1392
 2018-03-22 13:45:34 +01:00
daniel ad2746e6c3 fixed add help incli 2018-03-22 13:36:24 +01:00
daniel 0156bff9e6 fixed error 2018-03-22 13:33:23 +01:00
daniel 55d0ca122b fixed error 2018-03-22 13:28:18 +01:00
daniel 98355f985a merge develop 2018-03-22 13:21:48 +01:00
daniel b61f8d5cdd add new functions cli 2018-03-22 13:18:48 +01:00
enriquecd 078b370cbd Hide passwords fields data in treeview and events - #2030 2018-03-22 13:10:25 +01:00
vgilc f809a013e1 Merge branch '983-API-CLI-posibilidad-de-aplicar-templates-componentes-a-un-agente' into 'develop' 
API and CLI apply template components - #983

See merge request artica/pandorafms!1319
 2018-03-22 12:51:33 +01:00
vgilc 01c695a3fa Merge branch '2101-Comprobar-funciones-de-CLI-creadas-para-el-ticket-de-integria-#4261' into 'develop' 
Check create_web_modules CLI functions - #2101

See merge request artica/pandorafms!1390
 2018-03-22 12:18:07 +01:00