Commit Graph

15973 Commits

Author SHA1 Message Date
vgilc 89c08ede12 Merge branch '1351-AND-filters-added-to-snmp-filters-(so-much-wow)-dev' into 'develop'
1351 and filters added to snmp filters (so much wow) dev

See merge request artica/pandorafms!978
2017-11-29 14:07:58 +01:00
vgilc 21e6b784f7 Merge branch 'crear-mr-para-el-paquete-717-dev' into 'develop'
Added mr file

See merge request artica/pandorafms!1132
2017-11-29 14:07:27 +01:00
Arturo Gonzalez 828d19a47a Added mr file 2017-11-29 14:00:27 +01:00
vgilc 684658d81f Merge branch '1409-Imágenes-en-consolas-visuales---enlace-publico-dev' into 'develop'
Changed convert_urls in tinymce

See merge request artica/pandorafms!931
2017-11-29 13:47:50 +01:00
vgilc 6ff9eb054c Merge branch '1083-linea-de-color-cuando-uno-de-los-modulos-de-la-relacion-no-esta-bien-dev' into 'develop'
Added link color

See merge request artica/pandorafms!1049
2017-11-29 13:28:17 +01:00
vgilc 7beb05f8db Merge branch '1369-interface-graphs-when-interface-is-not-init-in-networkmaps-dev' into 'develop'
Fixed filter to show interface graph or not

See merge request artica/pandorafms!957
2017-11-29 13:27:39 +01:00
vgilc 8e71f632e8 Merge branch '1537-new-option-in-networkmaps-to-reset-the-map-dev' into 'develop'
Added new option to networkmap, reset

See merge request artica/pandorafms!1035
2017-11-29 13:27:00 +01:00
vgilc c8d5abb0d5 Merge branch '1538-valores-editables-de-graphviz-al-crear-mapas-de-red-dev' into 'develop'
Added custom graphviz fields to map creation

See merge request artica/pandorafms!1122
2017-11-29 13:26:11 +01:00
vgilc cf3c9c6ed7 Merge branch '1622-filtro-por-grupo-en-mapa-radial-dinamico-dev' into 'develop'
1622 filtro por grupo en mapa radial dinamico dev

See merge request artica/pandorafms!1117
2017-11-29 13:24:33 +01:00
vgilc 6ecc9f524c Merge branch '1643-login-con-administrador-en-ldap-para-realizar-acciones-dev' into 'develop'
Added code to login with admin ldap user

See merge request artica/pandorafms!1119
2017-11-29 13:24:01 +01:00
artica 0df9ae47ce Auto-updated build strings. 2017-11-29 00:01:11 +01:00
artica 406c69d5be Auto-updated build strings. 2017-11-28 00:01:13 +01:00
Arturo Gonzalez 21bbfb557b Added lost code 2017-11-27 15:00:59 +01:00
Arturo Gonzalez 192175a4cc Added custom graphviz fields to map creation 2017-11-27 13:52:31 +01:00
artica 13e0221013 Updated version and build strings. 2017-11-27 12:24:02 +01:00
artica 6b79dc357d Auto-updated build strings. 2017-11-27 00:01:09 +01:00
artica 0ced834c75 Auto-updated build strings. 2017-11-26 00:01:09 +01:00
artica fd47d57ce2 Auto-updated build strings. 2017-11-25 00:01:11 +01:00
Arturo Gonzalez a455ba666a Added code to login with admin ldap user 2017-11-24 14:03:49 +01:00
vgilc 7b3e71f79a Merge branch 'feature/safe_mode_module' into 'develop'
Filter by id_agente_modulo when evaluating safe mode operation.

See merge request artica/pandorafms!1116
2017-11-24 12:11:11 +01:00
Arturo Gonzalez 2883e45849 Added changes to get all hierachy to the chart 2017-11-24 12:08:15 +01:00
Ramon Novoa fe9a426109 Filter by id_agente_modulo when evaluating safe mode operation.
Ref pandora_enterprise#1276.
2017-11-24 12:04:53 +01:00
Arturo Gonzalez 06f83825dc Added code to fix agents generation in sunbrust chart 2017-11-24 11:27:10 +01:00
vgilc 3bc4bdb798 Merge branch '1471-fallo-enlace-publico-dashboards-2' into 'develop'
Fixed tree view on public dashboards

See merge request artica/pandorafms!1114
2017-11-24 09:38:34 +01:00
artica b6dfc147f3 Auto-updated build strings. 2017-11-24 00:01:11 +01:00
fermin831 fdd168007b Fixed tree view on public dashboards 2017-11-23 18:38:22 +01:00
vgilc ebc35ae791 Merge branch 'ent-1436-opciones-avanzadas-cron-modulos-sinteticos-no-funciona-correctamente-3' into 'develop'
Ent 1436 opciones avanzadas cron modulos sinteticos no funciona correctamente 3

See merge request artica/pandorafms!1112
2017-11-23 17:44:25 +01:00
fermin831 34da44f9fb Added cron help 2017-11-23 17:00:59 +01:00
fermin831 00bdcf5996 Added new cron functions to console 2017-11-23 12:30:04 +01:00
vgilc bdf7aef840 Merge branch 'varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional' into 'develop'
Añade el código que soluciona el fallo de los widgets en la vista pública

See merge request artica/pandorafms!1109
2017-11-23 09:03:39 +01:00
vgilc 62ffb46763 Merge branch '1471-fallo-enlace-publico-dashboards' into 'develop'
Fixed public dashboard permissions

See merge request artica/pandorafms!1004
2017-11-23 09:03:07 +01:00
artica 1ce4adb54e Auto-updated build strings. 2017-11-23 00:01:12 +01:00
fermin831 98a343a3b3 Fixed non-cron current interval on cronned modules on srever 2017-11-22 18:46:04 +01:00
Alejandro Gallardo Escobar 042830137d Merge branch '1471-fallo-enlace-publico-dashboards' into varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional 2017-11-22 11:53:14 +01:00
vgilc 0de711e633 Merge branch '1486-4739-Aumentar-caja-donde-se-muestran-los-nombre-de-las-interfaces-en-el-SNMP-Interface-Wizard' into 'develop'
Change width of snmp interface wizard select box - #1486

See merge request artica/pandorafms!962
2017-11-22 10:13:16 +01:00
artica b4ba8acaa2 Auto-updated build strings. 2017-11-22 00:01:11 +01:00
fermin831 0f814c0b63 Added public dashboard authentication to some components 2017-11-21 16:59:49 +01:00
vgilc 1eb509371d Merge branch '1509-Ayudas-en-nuevos-elementos-de-la-consola-visual-dev' into 'develop'
Added help elements

See merge request artica/pandorafms!1105
2017-11-21 16:56:00 +01:00
Arturo Gonzalez 3495bb5cbf Added help elements 2017-11-21 16:47:45 +01:00
vgilc a6a56d322a Merge branch '1628-cambio-de-parametros-para-graphviz-a-la-hora-de-pintar-mapas-dev' into 'develop'
Added graphviz values to calibrate maps

See merge request artica/pandorafms!1104
2017-11-21 13:38:03 +01:00
Arturo Gonzalez a819efbdb8 Added graphviz values to calibrate maps 2017-11-21 13:18:06 +01:00
vgilc 480ebd4c9b Merge branch 'feature/safe_mode_module' into 'develop'
Add safe-module mode support.

See merge request artica/pandorafms!1103
2017-11-21 12:16:05 +01:00
Ramon Novoa 0f37cccab5 Add safe-module mode support.
Ref pandora_enterprise#1276.
2017-11-21 12:03:16 +01:00
Arturo Gonzalez f4d035cfa5 Added changes to filter by group. Not finished 2017-11-21 10:27:17 +01:00
artica ae6df5a24e Auto-updated build strings. 2017-11-21 00:01:13 +01:00
vgilc c7df344de3 Merge branch 'ent-1436-opciones-avanzadas-cron-modulos-sinteticos-no-funciona-correctamente-2' into 'develop'
Fixed server cron problems when there is set only time from

See merge request artica/pandorafms!1099
2017-11-20 16:36:25 +01:00
fermin831 50569f187f Fixed server cron problems when there is set only time from 2017-11-20 14:06:40 +01:00
vgilc 2502944dea Merge branch '1614-Pete-SQL-en-buscador-consolas-visuales-dev' into 'develop'
Fixed revert in functions_visual_map.php

See merge request artica/pandorafms!1097
2017-11-20 13:10:17 +01:00
danielmaya faa4d5169a Fixed revert in functions_visual_map.php 2017-11-20 13:01:10 +01:00
vgilc a8e1a92bf1 Merge branch 'Problema_menor_consola_visual' into 'develop'
fixed error visual console remove link when edit console

See merge request artica/pandorafms!1095
2017-11-20 10:45:48 +01:00