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

16315 Commits

Author SHA1 Message Date
vgilc 5be99fe9be Merge branch '1642-Fichero-de-configuración-remota-de-agent_name-vacio-dev' into 'develop' 
Fixed empty agent_name in pandora_agent

See merge request artica/pandorafms!1123
 2018-01-02 10:28:11 +01:00
vgilc ae995f1923 Merge branch '1704-Cuadro-ENORME-cuando-se-pone-un-número-en-Custom-Value-4985-com1' into 'develop' 
Change Csutom value textarea rows in snmp alert editor - #1704

See merge request artica/pandorafms!1187
 2018-01-02 10:27:20 +01:00
vgilc 815ba8229e Merge branch '1732-Filtros_SNMP_se_van_acumulando_rev2' into 'develop' 
1732 filtros snmp se van acumulando rev2

See merge request artica/pandorafms!1215
 2018-01-02 10:26:37 +01:00
daniel 2ce2a30ee1 fixed minor error snmp_filters 2018-01-02 10:15:44 +01:00
vgilc ef33d10828 Merge branch '1694-Carrefour-Cuando-asignas-una-pantalla-de-inicio-a-un-usuario,-la-URL-que-muestra-el-navegador-no-es-la-correcta' into 'develop' 
Redirect to real url when login - #1694

See merge request artica/pandorafms!1181
 2018-01-02 10:03:28 +01:00
vgilc d34aad4a30 Merge branch 'fix-html-entities-in-networkmap-relations' into 'develop' 
[Console > Network map] Fix the output of content with html entities

See merge request artica/pandorafms!1120
 2018-01-02 10:02:28 +01:00
vgilc b3f23b53c2 Merge branch '1706-REDIRIS-No-se-realiza-la-conversión-de-traducción-de-texto' into 'develop' 
Let use translate strings extension in login page - #1706

See merge request artica/pandorafms!1192
 2018-01-02 10:01:25 +01:00
vgilc 641a10de0a Merge branch '1725-4995-Com1-Custom-logo-no-se-mantiene' into 'develop' 
Fix default custom logo select value in visual settings for front of reports - #1725

See merge request artica/pandorafms!1205
 2018-01-02 09:50:26 +01:00
vgilc 58fe8d7f23 Merge branch '1697-Autenticación-LDAP-dev' into 'develop' 
Autenticación LDAP

See merge request artica/pandorafms!1202
 2018-01-02 09:42:19 +01:00
artica 43284ea834 Auto-updated build strings. 2018-01-02 00:01:13 +01:00
artica 70eb1dcce0 Auto-updated build strings. 2018-01-01 00:01:12 +01:00
artica 42c5c2d77a Auto-updated build strings. 2017-12-31 00:01:12 +01:00
artica eaaec1a902 Auto-updated build strings. 2017-12-30 00:01:14 +01:00
mariopulido 6fd15329df Merge branch '1732-Filtros_SNMP_se_van_acumulando_trazas' into 'develop' 
fixed minor error snmpserver

See merge request artica/pandorafms!1214
 2017-12-29 11:49:43 +01:00
daniel 62a273dbdc fixed minor error snmpserver 2017-12-29 11:43:15 +01:00
mariopulido 67adaee138 Merge branch '1732-Filtros_SNMP_se_van_acumulando' into 'develop' 
fixed error in snmp filters

See merge request artica/pandorafms!1213
 2017-12-29 09:08:42 +01:00
daniel 388834af6d fixed error in snmp filters 2017-12-29 08:11:25 +01:00
artica 94fadf48df Auto-updated build strings. 2017-12-29 00:01:13 +01:00
slerena 2d9110787b Merge branch '1739-Fallo_en_filtro_de_eventos_con_usuario_no_admin_mas_Grupo_All' into 'develop' 
fixed minor errors in select for events

See merge request artica/pandorafms!1212
 2017-12-28 16:53:08 +01:00
daniel 6cc0ca51c3 fixed minor errors in select for events 2017-12-28 16:38:47 +01:00
artica dfba134905 Auto-updated build strings. 2017-12-28 00:01:14 +01:00
artica c0e812b2b2 Auto-updated build strings. 2017-12-27 00:01:14 +01:00
artica a50ae465e7 Auto-updated build strings. 2017-12-26 00:01:13 +01:00
artica 7811257f8f Auto-updated build strings. 2017-12-25 00:01:13 +01:00
artica 335be09a89 Auto-updated build strings. 2017-12-24 00:01:12 +01:00
artica a0ef8c4ca3 Auto-updated build strings. 2017-12-23 00:01:13 +01:00
artica 8d144bc085 Auto-updated build strings. 2017-12-22 00:01:15 +01:00
vgilc 67d5280b33 Merge branch '1728-Enlaces-de-paginación-no-funcionan' into 'develop' 
Fix pagination - #1728

See merge request artica/pandorafms!1208
 2017-12-21 17:13:00 +01:00
enriquecd 516c3b8d47 Fix pagination - #1728 2017-12-21 17:01:19 +01:00
vgilc 679bc604bf Merge branch '1716-Carrefour_Meta_y_consola_La_busqueda_por_agente_en_el_tree_view_muestra_la_rama_entera_de_grupos' into 'develop' 
add new filter tree view

See merge request artica/pandorafms!1206
 2017-12-21 16:48:38 +01:00
daniel 7ea42dc5c5 add new filter tree view 2017-12-21 16:37:19 +01:00
vgilc d7ea393c23 Merge branch '1470-Editar-modulo-web-analysis' into 'develop' 
Fix Run performance tests checkbox in web analysis module updater - #1470

See merge request artica/pandorafms!1082
 2017-12-21 15:19:38 +01:00
enriquecd 3ee088da81 Fix default custom logo select value in visual settings for front of reports - #1725 2017-12-21 15:14:22 +01:00
enriquecd 26d115a84e Merge branch 'develop' into 1470-Editar-modulo-web-analysis 
Conflicts:
	pandora_console/include/functions_ui.php
 2017-12-21 14:37:55 +01:00
vgilc dafa8202f5 Merge branch 'ent-1536-macro-para-id-extra' into 'develop' 
Added help documentation to _event_extra_id_

See merge request artica/pandorafms!1098
 2017-12-21 13:16:00 +01:00
fermin831 5b3408bae5 Added some lost help macros 2017-12-21 13:11:45 +01:00
fermin831 8e2616e642 Merge branch 'develop' into ent-1536-macro-para-id-extra 2017-12-21 12:18:58 +01:00
danielmaya 9c764dcf94 Autenticación LDAP 2017-12-21 11:35:02 +01:00
fermin831 9a43f1fa7d Merge branch 'develop' into ent-1536-macro-para-id-extra 
Conflicts resolved:
	pandora_console/include/help/en/help_alert_config.php
	pandora_console/include/help/en/help_alert_macros.php
	pandora_console/include/help/es/help_alert_config.php
	pandora_console/include/help/es/help_alert_macros.php
	pandora_console/include/help/ja/help_alert_config.php
	pandora_console/include/help/ja/help_alert_macros.php
 2017-12-21 11:10:38 +01:00
vgilc 6ac8571b2d Merge branch '979-CLI/API-Para-sincronizar-la-metaconsola' into 'develop' 
Metaconsole synchronization for api - #979

See merge request artica/pandorafms!1057
 2017-12-21 11:00:09 +01:00
vgilc db55901bf5 Merge branch '1437-Mejorar-pantalla-de-introducción-de-licencia-open' into 'develop' 
Change license windows style - #1437

See merge request artica/pandorafms!1048
 2017-12-21 10:58:46 +01:00
vgilc 5332236a10 Merge branch 'ent-1445-ficheros-orig' into 'develop' 
Delete orig repo files

See merge request artica/pandorafms!1069
 2017-12-21 10:58:09 +01:00
vgilc d9884fd431 Merge branch 'actualizar-el-cliente-de-ehorus' into 'develop' 
Resolve: "Actualizar el cliente de eHorus"

See merge request artica/pandorafms!1055
 2017-12-21 10:57:15 +01:00
vgilc 6325e336c5 Merge branch 'ent-1580-flecha-de-interface-information-casi-no-se-ve' into 'develop' 
Fixed dark arrow in Interface information (SNMP)

See merge request artica/pandorafms!1087
 2017-12-21 10:55:40 +01:00
vgilc e6d7cc1632 Merge branch '1253-Error-en-icono-grupo-Consola-Visual-metaconsola' into 'develop' 
Change group items url links in metaconsole - #1253

See merge request artica/pandorafms!1066
 2017-12-21 10:53:03 +01:00
vgilc e5c4dc4778 Merge branch '1319-Unsuccessfull-action-open' into 'develop' 
Check empty SLA fields on SLA wizar create form - #1319

See merge request artica/pandorafms!1096
 2017-12-21 10:52:35 +01:00
vgilc 8ea951a4bb Merge branch 'ent-1520-error-en-grafica-de-agente-no-dinamica' into 'develop' 
Fixed non interactive status graphs

See merge request artica/pandorafms!1063
 2017-12-21 10:48:17 +01:00
vgilc 97fc2dc4d1 Merge branch '1532-edición-de-módulos-a-través-de-operaciones-masivas-dev' into 'develop' 
Hide and show fields in edit modules bulk

See merge request artica/pandorafms!1102
 2017-12-21 10:47:53 +01:00
vgilc c8b8f147e9 Merge branch '1572-Descripción-de-interfaces-en-switch-dell-powerconnect-Wizard-SNMP-interfaces-dev' into 'develop' 
Fixed snmp interface wizard for switch dell powerconnect

See merge request artica/pandorafms!1094
 2017-12-21 10:47:31 +01:00
vgilc b8615d8a29 Merge branch '1574-Fallo-JS-con-cabeceras-POST' into 'develop' 
Apply safe input to ui_get_url_refresh return - fix text form inputs js error - #1574

See merge request artica/pandorafms!1084
 2017-12-21 10:47:08 +01:00