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

17118 Commits

Author SHA1 Message Date
fermin831 c88e6e703a [Secondary groups] Fixed duplicated agents in group view and agent detail 2018-04-04 11:17:08 +02:00
artica f863184454 Auto-updated build strings. 2018-04-04 00:01:24 +02:00
fbsanchez 8a4ee8f28d PluginTools pseudo control for as_agent/server_plugin 2018-04-03 18:22:38 +02:00
fbsanchez 7c202cbb81 PluginTools minor fix in log message 2018-04-03 17:14:11 +02:00
fbsanchez 63e644d88a Minor fix 2018-04-03 17:12:31 +02:00
vgilc fcec4b8b70 Merge branch '2125-Error_en_graficas_v721' into 'develop' 
Decreased limit to reduceText call in some graphs

See merge request artica/pandorafms!1407
 2018-04-03 17:10:02 +02:00
fbsanchez dcaae924fc Decreased limit to reduceText call in some graphs 2018-04-03 16:41:21 +02:00
fermin831 d36ab81d6c Merge branch '2015-implementacion-de-grupos-secundarios' of https://192.168.50.5:8081/artica/pandorafms into 2015-implementacion-de-grupos-secundarios 
Conflicts:
	pandora_console/pandoradb.sql
 2018-04-03 15:39:40 +02:00
fermin831 e2d61d5794 [Secondary groups] Added update cache on server 2018-04-03 15:36:33 +02:00
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
fermin831 5ffa396177 [Secondary Groups] Added tmetaconsole_agent_secondary_group table 2018-04-03 12:31:57 +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
fbsanchez 2380a18c6d Minor changes in PluginTools for 1801 2018-04-03 09:46:44 +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
enriquecd 87ed7f9cf7 Not blick separator points in visual console digital clock - #2026 2018-03-28 17:30:31 +02:00
enriquecd 8d39ae54fa Filter by not init agents and modules in tree view - #1454 2018-03-28 17:07:57 +02:00
artica 94936a46e9 Auto-updated build strings. 2018-03-28 00:01:22 +02:00
fermin831 2839388e9e [Secondary Groups] More events fixes 2018-03-27 18:07:43 +02:00
fermin831 4d78b28d17 [Secondary Groups] Fixed grouped agents events in node 2018-03-27 17:53:11 +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
fermin831 e3341c98ce [Secondary Groups] Fixed agent graph agent status 2018-03-27 17:02:41 +02:00
fermin831 88375a2460 [Secondary groups] Fixed some problems in agent view 2018-03-27 16:38:17 +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
fermin831 c96b883614 [Secondary groups] Fixed agent view to include secondary agents 2018-03-26 12:52:37 +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