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

16562 Commits

Author SHA1 Message Date
danielmaya 877607e63e Fixed draw link without color 2018-01-10 11:42:17 +01:00
enriquecd 2f32b8bab1 Fix group elements size in editor mode for metaconsole when set to 0px - #1740 2018-01-10 11:40:35 +01:00
fbsanchez b32e61cd3e Fixed some default values in PluginTools 2018-01-10 10:19:46 +01:00
artica b29271a3c0 Auto-updated build strings. 2018-01-10 00:01:15 +01:00
danielmaya 8968e10dab Fixed raw_text in networkmap 2018-01-09 18:54:14 +01:00
enriquecd ca5032b4f6 Fix advanced options toggle for data string modules - #1734 2018-01-09 12:16:11 +01:00
artica cca78fec2c Auto-updated build strings. 2018-01-09 00:01:15 +01:00
vgilc ce9b854edc Merge branch '1708-CARREFOUR_Cambio_de_comportamiento_en_Consolas_Visuales_favoritas_rev2' into 'develop' 
fixed minor error in visual console favourite

See merge request artica/pandorafms!1236
 2018-01-08 17:47:31 +01:00
daniel 4c908dd8ad fixed minor error in visual console favourite 2018-01-08 17:43:31 +01:00
vgilc 7c928e9cc1 Merge branch '1700-Fallo-grave-a-la-hora-de-pintar-mapas-de-red-dev' into 'develop' 
Fixed link to Pandora FMS in networkmap

See merge request artica/pandorafms!1233
 2018-01-08 16:20:06 +01:00
daniel 246d0ce9e0 fixed warnings php in log pandora 2018-01-08 15:05:51 +01:00
danielmaya 6d120f8081 Fixed link to Pandora FMS in networkmap 2018-01-08 14:46:36 +01:00
vgilc bf6b5abe41 Merge branch '1724-Aplicar-efecto-visual-a-pantalla-de-login-2' into 'develop' 
Add optional token animation and vissual effects in visual styles configuration view - #1724

See merge request artica/pandorafms!1232
 2018-01-08 13:10:48 +01:00
enriquecd 74b4f2a5f3 Add optional token animation and vissual effects in visual styles configuration view - #1724 2018-01-08 13:01:29 +01:00
vgilc dca895c2a4 Merge branch '1733-filtro-de-traps-llena-el-log-de-error' into 'develop' 
Replace a 'next' statement that exits a subroutine with a 'return'.

See merge request artica/pandorafms!1229
 2018-01-08 12:33:32 +01:00
vgilc 84a21f7ad6 Merge branch '1574-Fallo-JS-con-cabeceras-POST' into 'develop' 
Fix POST HEADER error and post process string errors - #1574

See merge request artica/pandorafms!1231
 2018-01-08 12:32:59 +01:00
enriquecd 52aaad1499 Fix POST HEADER error and post process string errors - #1574 2018-01-08 12:10:03 +01:00
vgilc 8b372eaffe Merge branch '1720-Error_critico_de_seguridad_en_Consola' into 'develop' 
fixed error ip validate

See merge request artica/pandorafms!1230
 2018-01-08 11:18:43 +01:00
daniel 955c183cd8 fixed error ip validate 2018-01-08 11:12:07 +01:00
danielmaya 42967862c8 Fixed tag i in status monitor data 2018-01-08 10:57:30 +01:00
Ramon Novoa 600c43935d Replace a 'next' statement that exits a subroutine with a 'return'. 
Ref pandora_enterprise#1733.
 2018-01-08 10:49:57 +01:00
artica f51cb0249b Auto-updated build strings. 2018-01-08 00:01:12 +01:00
artica 459f752287 Auto-updated build strings. 2018-01-07 00:01:12 +01:00
artica 28c16bf17e Auto-updated build strings. 2018-01-06 00:01:12 +01:00
vgilc 988325f3ae Merge branch 'anadir_imagen_modificada_carla' into 'develop' 
add new image modificate

See merge request artica/pandorafms!1226
 2018-01-05 11:39:18 +01:00
danielmaya c54090a614 Fixed messages in warning popup 2018-01-05 11:32:16 +01:00
daniel b4f9c746ad add new image modificate 2018-01-05 11:26:23 +01:00
vgilc b50e94097b Merge branch '1742-Recursividad_de_grupos_en_operaciones_masivas_5058' into 'develop' 
fixed errors extensions agent-modules and recursion groups

See merge request artica/pandorafms!1225
 2018-01-05 10:38:20 +01:00
daniel d2bc062766 fixed errors extensions agent-modules and recursion groups 2018-01-05 10:29:46 +01:00
vgilc 39bd9a47d8 Merge branch '1719-Subgrupos-bloqueados-si-solo-existe-un-grupo-dev' into 'develop' 
Fixed blocked group in group_list

See merge request artica/pandorafms!1223
 2018-01-05 09:20:40 +01:00
artica 5bf8262171 Auto-updated build strings. 2018-01-05 00:01:14 +01:00
danielmaya e58b99d74e Fixed link to official documentation 2018-01-04 17:32:47 +01:00
danielmaya 43ec1cb7f4 Fixed blocked group in group_list 2018-01-04 16:34:40 +01:00
vgilc 2ad1fe7d79 Merge branch '1708-CARREFOUR_Cambio_de_comportamiento_en_Consolas_Visuales_favoritas_rev' into 'develop' 
fixed errors in favourite consola visual

See merge request artica/pandorafms!1222
 2018-01-04 13:20:44 +01:00
daniel b10e9cfc67 fixed errors in favourite consola visual 2018-01-04 13:10:25 +01:00
artica 932f6ce0cf Auto-updated build strings. 2018-01-04 00:01:15 +01:00
vgilc 7f6994bf8e Merge branch '1163-Anadir_TIP_y_AVG_para_graficas_de_tipo_CUSTOM_GRAPH_en_GRAPH_CONTAINER' into 'develop' 
add fullscale container graph

See merge request artica/pandorafms!1221
 2018-01-03 16:06:21 +01:00
daniel e2ee8a555d add fullscale container graph 2018-01-03 15:53:49 +01:00
vgilc f867f74290 Merge branch '1253-Error-en-icono-grupo-Consola-Visual-metaconsola-2' into 'develop' 
Add enable link checkbox to group item editor - #1253

See merge request artica/pandorafms!1220
 2018-01-03 13:40:29 +01:00
enriquecd e0b3d6128e Add enable link checkbox to group item editor - #1253 2018-01-03 13:32:02 +01:00
vgilc bfa6389130 Merge branch '1469-graficas-tip-en-automatic-combined-graphs-y-custom-graphs-pdf-4261-vodat' into 'develop' 
add fullscale combined and custom graph

See merge request artica/pandorafms!1219
 2018-01-03 12:49:46 +01:00
daniel ead1161e0b add fullscale combined and custom graph 2018-01-03 12:13:00 +01:00
artica 6c48e6544a Auto-updated build strings. 2018-01-03 00:01:16 +01:00
vgilc 6d3715a25f Merge branch '1611-No-se-envían-los-informes-por-correo-desde-Metaconsola-4881-vodat' into 'develop' 
Fix sending mails for reports an templates reports by cronjobs - #1611

See merge request artica/pandorafms!1162
 2018-01-02 17:08:40 +01:00
vgilc 1a4742d345 Merge branch '1460-4706-No-funciona-token-Mostrar-solo-la-media-en-Visual-Styles-2' into 'develop' 
Fix only show average graphs checkbox - #1460

See merge request artica/pandorafms!1218
 2018-01-02 17:07:40 +01:00
enriquecd 9a0438bc36 Merge branch 'develop' into 1611-No-se-envían-los-informes-por-correo-desde-Metaconsola-4881-vodat 
Conflicts:
	pandora_console/extras/mr/10.sql
 2018-01-02 16:56:48 +01:00
enriquecd 0fac48d71c Fix only show average graphs checkbox - #1460 2018-01-02 16:43:13 +01:00
vgilc 63c20ffbfb Merge branch '1732-Filtros_SNMP_se_van_acumulando_rev3' into 'develop' 
1732 filtros snmp se van acumulando rev3

See merge request artica/pandorafms!1217
 2018-01-02 15:05:21 +01:00
daniel 410ecab211 fixed error in bbdd tsnmp_filter 2018-01-02 14:49:42 +01:00
daniel ff60278060 fixed error in bbdd tsnmp_filter 2018-01-02 13:54:08 +01:00