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

8396 Commits

Author SHA1 Message Date
fermin831 80ecb6f366 [Console Tree view] Added counter 2018-02-27 11:46:28 +01:00
fermin831 3fc010135b [Console Tree view] Removed empty childs 2018-02-27 11:04:49 +01:00
vgilc 85bc975606 Merge branch '1962-No-aparecen-las-alertas-en-la-vista-de-agente-dev' into 'develop' 
Fixed tags in alert list

See merge request artica/pandorafms!1318
 2018-02-27 09:39:46 +01:00
artica 892d17f65c Auto-updated build strings. 2018-02-27 00:02:10 +01:00
enriquecd 3ee2f8615f API and CLI apply template components - #983 2018-02-26 19:10:53 +01:00
danielmaya 25bed4d5c2 Fixed tags in alert list 2018-02-26 13:42:28 +01:00
fermin831 37dfdc9021 [Console Enterprise ACL] Added graph view to Reporting->Custom Graphs text name 2018-02-26 11:15:11 +01:00
vgilc 7be55b4427 Merge branch '1735-Faltan-campos-en-edición-de-módulos-en-operaciones-masivas' into 'develop' 
Add new fileds to massive module edition - #1735

See merge request artica/pandorafms!1295
 2018-02-26 10:42:55 +01:00
vgilc 362194c042 Merge branch 'ent-1875-no-se-pueden-borrar-macros-de-plugins-(server)' into 'develop' 
[Console Plugins][Console Recon Scripts] Fixed deletion macro

See merge request artica/pandorafms!1312
 2018-02-26 10:38:50 +01:00
vgilc 2313c4165e Merge branch '1933-TMB-eventos-varios' into 'develop' 
Fixed permission checks in event_acl

See merge request artica/pandorafms!1303
 2018-02-26 10:32:17 +01:00
vgilc 3f7e6f7ed3 Merge branch 'ent-1964-5331-error-de-ACLs-en-custom-graphs' into 'develop' 
Ent 1964 5331 error de ac ls en custom graphs

See merge request artica/pandorafms!1315
 2018-02-26 10:31:22 +01:00
vgilc 1c56f18dd8 Merge branch '1921-Informe-de-tipo-Datos-Históricos-no-devuelve-info-de-base-de-datos-histórico-dev' into 'develop' 
Fixed connection to historical db

See merge request artica/pandorafms!1305
 2018-02-26 10:12:36 +01:00
fermin831 058bdbe0d9 [Console] Fixed function users_can_manage_group_all 2018-02-26 10:12:14 +01:00
artica 4b9dd69a0f Auto-updated build strings. 2018-02-26 00:01:52 +01:00
artica 6eb5f20d17 Auto-updated build strings. 2018-02-25 00:02:06 +01:00
artica 4dae0c97c0 Auto-updated build strings. 2018-02-24 00:01:59 +01:00
artica effe16a275 Auto-updated build strings. 2018-02-23 00:01:27 +01:00
fermin831 cef3cb2ae0 [Console Plugins][Console Recon Scripts] Fixed deletion macro 2018-02-22 16:13:25 +01:00
artica e752e26ee3 Auto-updated build strings. 2018-02-22 00:01:52 +01:00
vgilc 3b94629f8f Merge branch '1403-Añadir-relojes-a-consolas-visuales-4622-com1-final' into 'develop' 
Change visual console digital clock colors - #1403

See merge request artica/pandorafms!1307
 2018-02-20 09:55:50 +01:00
artica cc088314b8 Auto-updated build strings. 2018-02-20 00:01:14 +01:00
enriquecd 9a525f3b2e Change visual console digital clock colors - #1403 2018-02-19 19:17:53 +01:00
danielmaya 17586472c8 Fixed connection to historical db 2018-02-19 12:04:02 +01:00
fbsanchez 49f1ad38e7 Event ACL check: Fix case multiple tags 2018-02-19 11:44:35 +01:00
fbsanchez 33089f2ff2 Minor fix in sql query 2018-02-19 11:34:07 +01:00
artica 87ffae2d88 Auto-updated build strings. 2018-02-19 00:01:12 +01:00
artica fe1b911f02 Auto-updated build strings. 2018-02-18 00:01:12 +01:00
artica 5e6bcd34d8 Auto-updated build strings. 2018-02-17 00:01:14 +01:00
fbsanchez 407fbf450f Fixed permission checks in event_acl 
Added event response macro _group_custom_id_
 2018-02-16 15:09:37 +01:00
artica 12ef611493 Auto-updated build strings. 2018-02-16 00:01:13 +01:00
fbsanchez df0480d12a Fixed dbuncompress short unknown events 2018-02-15 11:19:44 +01:00
vgilc e83201c457 Merge branch '1877-Cluster-Nuevo-diseño-del-cluster-view' into 'develop' 
Change cluster view design - #1877

See merge request artica/pandorafms!1301
 2018-02-15 09:42:46 +01:00
artica d90c6ef778 Auto-updated build strings. 2018-02-15 00:01:13 +01:00
enriquecd b51dc73cd6 Change cluster view design - #1877 2018-02-14 18:37:27 +01:00
danielmaya a0c01ed57d Added safe_output for password in ldap 2018-02-14 10:57:08 +01:00
vgilc ef3ec1238a Merge branch '1867-errores-en-vista-de-eventos-con-usuario-con-tags-tmb' into 'develop' 
Fix avoid unexistent tag in tevent acl check

See merge request artica/pandorafms!1297
 2018-02-14 08:49:14 +01:00
artica 4fbf0820a4 Auto-updated build strings. 2018-02-14 00:01:13 +01:00
fbsanchez 92287916eb Fix avoid unexistent tag in tevent acl check 2018-02-13 16:48:36 +01:00
enriquecd 7f7916a18d Add new fileds to massive module edition - #1735 2018-02-13 12:29:55 +01:00
artica 77392c70fc Updated version and build strings. 2018-02-13 11:51:11 +01:00
artica ab10cec7ba Auto-updated build strings. 2018-02-13 00:01:13 +01:00
daniel b419f71e7c fixed error in acl combined profile 2018-02-12 16:10:29 +01:00
daniel fabe14b7ea fixed error acl 2018-02-12 12:38:28 +01:00
vgilc 8c7c3b2c09 Merge branch '1867-Errores_en_vista_de_eventos_con_usuario_con_tags' into 'develop' 
fixed error show events

See merge request artica/pandorafms!1287
 2018-02-12 08:52:04 +01:00
artica be4509cbf1 Auto-updated build strings. 2018-02-10 00:01:14 +01:00
daniel 74a8212032 fixed error show events 2018-02-09 14:20:49 +01:00
artica a6451d01e2 Auto-updated build strings. 2018-02-09 00:01:15 +01:00
daniel 3e0edcfda8 fixed errors in automatic combined graph meta with TIP 2018-02-08 17:07:54 +01:00
vgilc a5a6371270 Merge branch '1782-Esos-mapas-dev' into 'develop' 
Fixed colour bug in interface link

See merge request artica/pandorafms!1283
 2018-02-08 16:27:54 +01:00
danielmaya eb38025b19 Fixed colour bug in interface link 2018-02-08 16:20:29 +01:00
fbsanchez 571ed36276 Fixed image handle in data view 2018-02-08 14:17:08 +01:00
artica 4aab64be3d Auto-updated build strings. 2018-02-08 00:01:15 +01:00
enriquecd a04f941a55 Merge branch 'develop' into 1403-Añadir-relojes-a-consolas-visuales-com1 
Conflicts:
	pandora_console/include/styles/pandora.css
 2018-02-07 17:02:15 +01:00
vgilc 9531984eac Merge branch '1748-Sistema-de-gestión-de-Clusters' into 'develop' 
1748 sistema de gestión de clusters

See merge request artica/pandorafms!1279
 2018-02-07 15:41:29 +01:00
enriquecd ae471bb9f2 Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters 2018-02-07 13:52:44 +01:00
enriquecd 6851af5943 Show correct info in visual console static graphs tooltips - #1634 2018-02-07 12:46:29 +01:00
artica 520e968500 Auto-updated build strings. 2018-02-07 00:01:14 +01:00
enriquecd 5c0f0de1e4 Add module critical instructions when create an event - #1862 2018-02-06 16:01:32 +01:00
vgilc 26de4f6517 Merge branch 'ent-1644-fallo-en-ayuda-de-agent-mode' into 'develop' 
Fixed module definition help and add autodisable mode to bulk operations

See merge request artica/pandorafms!1129
 2018-02-06 12:17:14 +01:00
fermin831 d625652f9a Removed unwanted git merge traces (sorry) 2018-02-06 12:06:21 +01:00
fermin831 378186cadf Merge branch 'develop' into ent-1644-fallo-en-ayuda-de-agent-mode 
Conflicts:
	pandora_console/include/help/en/help_module_definition.php
	pandora_console/include/help/es/help_module_definition.php
	pandora_console/include/help/ja/help_module_definition.php
 2018-02-06 12:01:33 +01:00
vgilc fe4b1da1e3 Merge branch '1709-REDIRIS-Permitir-cambiar-links-en-pantalla-de-login' into 'develop' 
Make help and support links in login page customizables - #1709

See merge request artica/pandorafms!1201
 2018-02-06 11:57:23 +01:00
vgilc ae9db8bfd8 Merge branch '1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1' into 'develop' 
Change system audit log extended info to table format with change info - #1571

See merge request artica/pandorafms!1115
 2018-02-06 11:56:48 +01:00
enriquecd ab24c3bf80 Merge branch 'develop' into 1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-02-06 10:46:59 +01:00
enriquecd bf1ad29b6b Merge branch 'develop' into 1699-Ordenar-alfabéticamente-los-grupos-de-agentes 
Conflicts:
	pandora_console/include/functions_users.php
 2018-02-06 10:43:33 +01:00
vgilc 0f01fcbd20 Merge branch 'Gráficas-generadas-en-Dynamic-dev' into 'develop' 
Added type graph selection in container graph

See merge request artica/pandorafms!1113
 2018-02-06 09:55:36 +01:00
danielmaya aea9d6ae36 resolved conflicts with containers and added mr12 2018-02-06 09:21:07 +01:00
artica be5adb4635 Auto-updated build strings. 2018-02-06 00:01:13 +01:00
vgilc 48b6dc56fd Merge branch '1676-Tags-y-vista-de-alertas-2' into 'develop' 
Show all alerts when select all tags filter - #1676

See merge request artica/pandorafms!1271
 2018-02-05 15:57:40 +01:00
vgilc ce43dd91d8 Merge branch '1301-Macro-para-nombre-de-evento-dev' into 'develop' 
Added _event_description_ in help_alert_macros.php

See merge request artica/pandorafms!1110
 2018-02-05 15:42:14 +01:00
enriquecd 064a9d58b9 Show all alerts when select all tags filter - #1676 2018-02-05 15:30:28 +01:00
danielmaya da8c1e4f46 resolved conflicts 2018-02-05 09:41:27 +01:00
artica b819f76c58 Auto-updated build strings. 2018-02-05 00:01:13 +01:00
artica 084bea27cc Auto-updated build strings. 2018-02-04 00:01:13 +01:00
artica 0614e5a492 Auto-updated build strings. 2018-02-03 00:01:14 +01:00
enriquecd d59289db62 Change builder style - #1748 2018-02-02 14:56:33 +01:00
enriquecd 47f0a90cab Show not init monitors - #1748 2018-02-02 14:10:03 +01:00
enriquecd 768e6e605f Fix bugs - #1748 2018-02-02 13:05:36 +01:00
artica 3c6e71dbed Auto-updated build strings. 2018-02-02 00:01:18 +01:00
enriquecd e1669ded9d Change branch to enterprise - #1748 2018-02-01 11:35:23 +01:00
artica 0d944f0322 Auto-updated build strings. 2018-02-01 00:01:13 +01:00
vgilc 3cad7be4a5 Merge branch '1749-sistena-cache-de-acl-s-de-la-consola' into 'develop' 
Modified users_get_groups

See merge request artica/pandorafms!1244
 2018-01-31 15:15:50 +01:00
enriquecd f9edfcb893 finalized Wizard, new styles, editor mode - #1748 2018-01-31 14:42:37 +01:00
artica 3235215547 Auto-updated build strings. 2018-01-31 00:01:14 +01:00
daniel 0d0b7ada48 Merge branch 'develop' into 1749-sistena-cache-de-acl-s-de-la-consola 
Conflicts:
	pandora_console/include/functions_users.php
 2018-01-30 17:56:30 +01:00
daniel ad0b463d13 fixed errors acl 2018-01-30 17:44:51 +01:00
enriquecd b07021f6bc Merge branch 'clusters' of https://192.168.50.5:8081/artica/pandorafms into clusters 2018-01-30 17:40:21 +01:00
enriquecd 2b446a681d Popup when click modules in cluster view, new images, filter modules - #1748 2018-01-30 17:38:29 +01:00
danielmaya f3e44b0c09 Updated visual style in clustermap 2018-01-30 13:48:11 +01:00
artica 2065207661 Auto-updated build strings. 2018-01-30 00:01:14 +01:00
vgilc e29b8f86bd Merge branch 'add-japanese-help' into 'develop' 
Update Japanese help

See merge request artica/pandorafms!1254
 2018-01-29 17:31:23 +01:00
danielmaya 13884a44d6 Added clustermap 2018-01-29 16:48:21 +01:00
vgilc 7b20e43141 Merge branch '1746-Mejora-visual-en-el-popup-de-warning-en-el-header-dev' into 'develop' 
Fixed messages in warning popup

See merge request artica/pandorafms!1227
 2018-01-29 13:36:06 +01:00
vgilc b0fc04c8f3 Merge branch '1751-Posición-de-los-agentes-en-el-mapa-de-red-dev' into 'develop' 
Fixed raw_text in networkmap

See merge request artica/pandorafms!1238
 2018-01-29 13:35:20 +01:00
vgilc d9825c08b5 Merge branch '1660-WUX-stats-charts-dev' into 'develop' 
Fixed jquery error

See merge request artica/pandorafms!1151
 2018-01-29 13:31:19 +01:00
vgilc 61ce7237c3 Merge branch '1688-Error-en-API-al-habilitar-alertas' into 'develop' 
Add new function enable alert by alias - #1688

See merge request artica/pandorafms!1177
 2018-01-29 13:25:54 +01:00
vgilc 2e486ffac0 Merge branch '1727-Gráficas-horizontales-texto' into 'develop' 
Fix hbar grpahs label - #1727

See merge request artica/pandorafms!1246
 2018-01-29 13:25:04 +01:00
vgilc 482204b525 Merge branch '1734-No-se-pueden-ver-opciones-avanzadas-en-módulos-generic_data_string' into 'develop' 
Fix advanced options toggle for data string modules - #1734

See merge request artica/pandorafms!1237
 2018-01-29 13:24:37 +01:00
vgilc d82ce632bd Merge branch '1740-Iconos-de-grupos-aumentan-de-tamaño-en-consola-visuales-de-meta' into 'develop' 
Fix group elements size in editor mode for metaconsole when set to 0px - #1740

See merge request artica/pandorafms!1241
 2018-01-29 13:23:11 +01:00
vgilc 862242bf00 Merge branch '1782-Fallo-en-enlaces-de-nodos-en-mapas-de-red-dev' into 'develop' 
Fixed colour link and delete link

See merge request artica/pandorafms!1258
 2018-01-29 13:19:27 +01:00
vgilc deeb7ac77d Merge branch '1815-SLA_tiempos_en_desconocido' into 'develop' 
Revised: dbuncompress

See merge request artica/pandorafms!1263
 2018-01-29 13:00:33 +01:00
vgilc 94e2e0b908 Merge branch 'fix-module-graph-decimals' into 'develop' 
Resolve: "Fix module graph decimals"

See merge request artica/pandorafms!1121
 2018-01-29 12:58:13 +01:00
vgilc 5a198404b7 Merge branch '1525-Imagenes-WUX-no-salen-bien-en-histórico-4776-pelayo' into 'develop' 
Fix history data dialog for base 64 images on modules view - #1525

See merge request artica/pandorafms!1107
 2018-01-29 12:55:14 +01:00
vgilc 1558dee350 Merge branch '1634-Static-graphs-siempre-muestran-5-decimales-4908-media' into 'develop' 
Limit static graphs decimal numbers to show in visual console with data…

See merge request artica/pandorafms!1209
 2018-01-29 12:53:53 +01:00
vgilc 717ecb6adc Merge branch '1638-Si-creamos-una-gráfica-combinada-con-un-intervalo-pequeño-sale-vacía-dev' into 'develop' 
Fixed interval when the period is less than resolution in custom graph

See merge request artica/pandorafms!1118
 2018-01-29 12:53:27 +01:00
vgilc 34ccc01c7b Merge branch '1656-Group-recursion-no-funciona-correctamente-en-operaciones-masivas-dev' into 'develop' 
Fixed group recursion in bulk operation

See merge request artica/pandorafms!1133
 2018-01-29 12:52:35 +01:00
vgilc 6703f49607 Merge branch '1756-Añadir-gráfico-en-los-correos-de-alertas-de-módulos-tipo-string-dev' into 'develop' 
Added string graph in mail

See merge request artica/pandorafms!1250
 2018-01-29 12:50:57 +01:00
artica 2b0688a76c Auto-updated build strings. 2018-01-29 00:01:11 +01:00
artica fd923a5adb Auto-updated build strings. 2018-01-28 00:01:11 +01:00
artica adb127c1c6 Auto-updated build strings. 2018-01-27 00:01:12 +01:00
artica 3b88cc46a3 Auto-updated build strings. 2018-01-26 00:01:12 +01:00
enriquecd 2b07a7a8a9 Change po,mo,mr and package - #1257 2018-01-25 15:49:21 +01:00
fbsanchez 34c424953b Revised: dbuncompress 2018-01-25 12:41:44 +01:00
enriquecd c14e68e0e8 Inprove wizard, change modules update - #1748 2018-01-24 19:39:00 +01:00
fbsanchez 2e1ab72a21 Reapplied #1000 solution 2018-01-24 17:28:00 +01:00
artica cd2c000cbf Updated version and build strings. 2018-01-24 14:27:02 +01:00
artica e6aa3de997 Auto-updated build strings. 2018-01-24 00:01:12 +01:00
enriquecd a149b3119e Final Wizard without js, view list, cluster creation - #1748 2018-01-23 15:34:44 +01:00
artica f64498450a Auto-updated build strings. 2018-01-23 00:01:13 +01:00
enriquecd 2533072349 Creator wizard, module tpye constants, and functions - #1478 2018-01-22 18:37:54 +01:00
danielmaya 72aefbd96d Fixed colour link and delete link 2018-01-22 16:17:10 +01:00
daniel 36429616f3 fixed minor error combined graph fullscale 2018-01-22 15:46:23 +01:00
artica dc9e33953e Auto-updated build strings. 2018-01-22 00:01:11 +01:00
artica 6541fe17e8 Auto-updated build strings. 2018-01-21 00:01:12 +01:00
artica d2c97be01c Auto-updated build strings. 2018-01-20 00:01:16 +01:00
enriquecd e2399273ce Add step 3 and step 4 to wizard - #1748 2018-01-19 16:49:27 +01:00
artica c0c251dd8e Auto-updated build strings. 2018-01-19 00:01:13 +01:00
enriquecd 4d9f029a61 Add qizard stp 3 and step 4 - #1748 2018-01-18 19:44:47 +01:00
artica c96b9aac0d Auto-updated build strings. 2018-01-18 00:01:12 +01:00
enriquecd 099cd3bbe8 Wizard first and second step, clusters functions - #1478 2018-01-17 18:56:44 +01:00
artica ff0132e8de Auto-updated build strings. 2018-01-17 00:01:12 +01:00
Junichi Satoh 55d392efc8 Added a new Japanese help and fixed typo. 2018-01-16 14:39:17 +09:00
artica 9d01f98f21 Auto-updated build strings. 2018-01-16 00:01:12 +01:00
artica ae23342184 Auto-updated build strings. 2018-01-15 00:01:10 +01:00
artica 53cbb0f3e8 Auto-updated build strings. 2018-01-14 00:01:11 +01:00
artica d9668e97c9 Auto-updated build strings. 2018-01-13 00:01:16 +01:00
daniel 5d61ff5056 fixed error in ACL 2018-01-12 14:17:48 +01:00
danielmaya c2a467064e Added string graph in mail 2018-01-12 13:17:57 +01:00
vgilc 8fcf3a7045 Merge branch 'ent-1436-opciones-avanzadas-cron-modulos-sinteticos-no-funciona-correctamente-4' into 'develop' 
Ent 1436 opciones avanzadas cron modulos sinteticos no funciona correctamente 4

See merge request artica/pandorafms!1245
 2018-01-12 08:49:22 +01:00
artica 78e5f808ba Auto-updated build strings. 2018-01-12 00:01:16 +01:00
daniel 638d7ced30 performance improvements in visual console list is called indiscriminately to the function get_acl 2018-01-11 15:25:55 +01:00
daniel 57990d80a8 fixed warnings php 2018-01-11 13:05:31 +01:00
daniel 12faad0217 modificate users_get_group for acl groups parents and children 2018-01-11 11:53:09 +01:00
enriquecd 6e10baac32 Fix hbar grpahs label - #1727 2018-01-11 11:12:41 +01:00
artica d9670999c0 Auto-updated build strings. 2018-01-11 00:01:16 +01:00
fermin831 a8963d5540 Fixed month cron in console (don't substract 1) 2018-01-10 18:55:12 +01:00
fermin831 0929154625 Fixed overflow problems in cron (console) 2018-01-10 18:31:33 +01:00
fermin831 f653fb0f26 Fixed month order on cron 2018-01-10 18:31:13 +01:00
fbsanchez 6d4422d1fd Modified users_get_groups 2018-01-10 18:00:34 +01:00
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
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
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
danielmaya 6d120f8081 Fixed link to Pandora FMS in networkmap 2018-01-08 14:46:36 +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
daniel 955c183cd8 fixed error ip validate 2018-01-08 11:12:07 +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
danielmaya c54090a614 Fixed messages in warning popup 2018-01-05 11:32:16 +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 43ec1cb7f4 Fixed blocked group in group_list 2018-01-04 16:34:40 +01:00
artica 932f6ce0cf Auto-updated build strings. 2018-01-04 00:01:15 +01:00
daniel e2ee8a555d add fullscale container graph 2018-01-03 15:53:49 +01:00
enriquecd e0b3d6128e Add enable link checkbox to group item editor - #1253 2018-01-03 13:32:02 +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 78899cc1c7 Merge branch '1708-CARREFOUR_Cambio_de_comportamiento_en_Consolas_Visuales_favoritas' into 'develop' 
add new funtionality view favourite console visual

See merge request artica/pandorafms!1211
 2018-01-02 10:31:31 +01:00
vgilc 547a7c0d3d Merge branch '1724-Aplicar-efecto-visual-a-pantalla-de-login' into 'develop' 
Add visual effect to login page - #1724

See merge request artica/pandorafms!1204
 2018-01-02 10:28:46 +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 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
artica 94fadf48df Auto-updated build strings. 2017-12-29 00:01:13 +01:00
daniel 0b5678fba6 add new funtionality view favourite console visual 2017-12-28 15:13:06 +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
enriquecd ef4c669523 Limit static graphs decimal numbers to show in visual console with data precision for reports - #1634 2017-12-21 18:22:55 +01:00
enriquecd 516c3b8d47 Fix pagination - #1728 2017-12-21 17:01:19 +01:00
daniel 7ea42dc5c5 add new filter tree view 2017-12-21 16:37:19 +01:00
enriquecd 5747299d8e Add visual effect to login page - #1724 2017-12-21 13:45:57 +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 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 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 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
vgilc 097bc3df32 Merge branch 'ent-1577-vista-general-descuadrada-en-graph-containers' into 'develop' 
Added resize functionality to flot graphs and fix overview in container graphs

See merge request artica/pandorafms!1068
 2017-12-21 10:46:42 +01:00
vgilc 60486c8a1e Merge branch '1659-Informe-de-eventos-de-módulos-en-plantillas-de-informes-de-la-metaconsola--Carrefour]-dev' into 'develop' 
Fixed reporting_event_report_module in metaconsole

See merge request artica/pandorafms!1128
 2017-12-21 09:53:47 +01:00
vgilc 45c642a6a0 Merge branch 'ent-1435-incluir-macros-en-event-responses' into 'develop' 
Ent 1435 incluir macros en event responses

See merge request artica/pandorafms!1100
 2017-12-21 09:46:55 +01:00
vgilc e89363582a Merge branch '1596-4876-Dropdown-menus-por-orden-de-ID' into 'develop' 
Order by name group select in manage agent view - #1596

See merge request artica/pandorafms!1078
 2017-12-21 09:06:21 +01:00
vgilc 349a9bbd35 Merge branch '1613-4894-No-aparece-fecha-final-en-las-graficas-24h-de-los-agentes' into 'develop' 
Change time format in agent events 24h bar view and show the last start time - #1613

See merge request artica/pandorafms!1089
 2017-12-21 09:04:55 +01:00
vgilc 4f0a451ba1 Merge branch '1576-Permisos-sobre-gráficas-no-permite-ver-graph-containers-4863-media-open' into 'develop' 
1576 permisos sobre gráficas no permite ver graph containers 4863 media open

See merge request artica/pandorafms!1072
 2017-12-21 08:59:36 +01:00
artica 9b40ee6422 Auto-updated build strings. 2017-12-21 00:01:25 +01:00
enriquecd a027defccd Make help and support links in login page customizables - #1709 2017-12-20 19:14:05 +01:00
artica 6db5ced911 Auto-updated build strings. 2017-12-20 00:01:11 +01:00
enriquecd ff462e7b44 Translations - #1257 2017-12-19 16:11:35 +01:00
daniel a335732267 fixed errors in graphs webproc and keep alive 2017-12-19 13:13:42 +01:00
enriquecd 02a90736f9 Alphabetic order in group selects - #1699 2017-12-19 10:57:44 +01:00
daniel fd66f84d0b fixed minor errors 2017-12-19 09:57:52 +01:00
artica b4d643f08f Auto-updated build strings. 2017-12-19 00:01:46 +01:00
danielmaya 146802119d Fixed pdf label 2017-12-18 16:50:24 +01:00
enriquecd e5ce6ee631 Let use translate strings extension in login page - #1706 2017-12-18 13:34:18 +01:00
artica e895d06016 Updated version and build strings. 2017-12-18 13:26:41 +01:00
danielmaya b65d649750 Fixed reporting custom graph 2017-12-18 13:12:29 +01:00
artica ee1b915735 Auto-updated build strings. 2017-12-18 00:01:13 +01:00
artica 925eb1cf72 Auto-updated build strings. 2017-12-17 00:01:13 +01:00
artica 7a0617ccce Auto-updated build strings. 2017-12-16 00:01:13 +01:00
artica 671ac77e44 Auto-updated build strings. 2017-12-15 00:01:16 +01:00
vgilc 9a96103164 Merge branch '1257-Traducciones-consola-open' into 'develop' 
Change texts in pandora - #1257

See merge request artica/pandorafms!1062
 2017-12-14 15:56:54 +01:00
enriquecd db9dc114fb Visual console status calculate errors / 2 - #1698 2017-12-14 15:14:46 +01:00
enriquecd 585da6de6b Visual console status calculate errors - #1698 2017-12-14 12:42:21 +01:00
artica 3598f13687 Auto-updated build strings. 2017-12-14 00:01:16 +01:00
daniel d7d1cfe81b Merge branch 'develop' into 1632-Pandora_FMS_charts 2017-12-13 17:18:36 +01:00
daniel 4a1a0ae8b7 fixed errors in graphs 2017-12-13 17:17:45 +01:00
enriquecd e4cc09e09c Add new function enable alert by alias - #1688 2017-12-13 13:57:38 +01:00
danielmaya 43e697a1cb Added hint in field Add summatory series 2017-12-13 11:50:15 +01:00
danielmaya 85ac142c6c Updated functions_graph and fixed percentil issue 2017-12-13 10:38:08 +01:00
danielmaya 1d3efb9d9e Updated functions_graph 2017-12-13 10:37:42 +01:00
danielmaya 61b33221bf Added check modules and series 2017-12-13 10:37:23 +01:00
Daniel Maya e01f00ac3d code backup 2017-12-13 10:36:08 +01:00
artica 1b32a4da7c Auto-updated build strings. 2017-12-13 00:01:14 +01:00
vgilc 6a0acb05f1 Merge branch '1684-Autenticacion-por-LDAP-con-mas-de-1000-usuarios-dev' into 'develop' 
Added ldapsearch system command

See merge request artica/pandorafms!1173
 2017-12-12 14:20:22 +01:00
vgilc 02378cbea2 Merge branch 'ent-1687-no-mostrar-valor-de-modulos-keepalive-en-static-graphs-carrefour' into 'develop' 
keepalive modules are boolean too (console function fix)

See merge request artica/pandorafms!1170
 2017-12-12 09:01:14 +01:00
artica 3d233645c5 Auto-updated build strings. 2017-12-12 00:01:14 +01:00
danielmaya 741df27ba0 Added ldapsearch system command 2017-12-11 17:19:52 +01:00
fermin831 84ff86fede keepalive modules are boolean too (console function fix) 2017-12-11 15:47:38 +01:00
artica 6b76392a60 Auto-updated build strings. 2017-12-11 00:01:12 +01:00
artica 4734283cd8 Auto-updated build strings. 2017-12-10 00:01:11 +01:00
artica e1583f1903 Auto-updated build strings. 2017-12-09 00:01:11 +01:00
artica 3804c3f826 Auto-updated build strings. 2017-12-08 00:01:13 +01:00
artica 633cb5a39c Auto-updated build strings. 2017-12-07 00:01:14 +01:00
artica 044d54a76f Auto-updated build strings. 2017-12-06 00:01:15 +01:00
vgilc 5b5ed2c45b Merge branch '1657-Agentes-en-crítico-salen-como-desconocido-en-GIS-dev' into 'develop' 
Fixed Unkwon Icon in GIS

See merge request artica/pandorafms!1147
 2017-12-05 16:55:06 +01:00
vgilc a4cf584468 Merge branch '1671-Filtro-en-mapas-gis-dev' into 'develop' 
Fixed filter in gis maps

See merge request artica/pandorafms!1154
 2017-12-05 16:54:35 +01:00
daniel fedb6003dd fixed errors in TIP 2017-12-05 13:46:23 +01:00
daniel 06c1c4f243 fixed errors in fullscale graph and normal graph 2017-12-05 13:44:42 +01:00
vgilc 20720c9f0b Merge branch 'grep_syslog_module' into 'develop' 
Add an icon and constants for the new Syslog server.

See merge request artica/pandorafms!1160
 2017-12-05 11:39:44 +01:00
Ramon Novoa dca173c8b8 Add an icon and constants for the new Syslog server. 2017-12-05 11:15:23 +01:00
vgilc 18fa3d29a9 Merge branch 'buscar-un-grupo-en-el-tree-view-carrefour' into 'develop' 
Mostrar los descendientes de los grupos filtrados en el tree view

See merge request artica/pandorafms!1159
 2017-12-05 09:55:06 +01:00
Alejandro Gallardo Escobar 33ab429182 [Console] Now the group filter extract the searched groups and show their descendants 2017-12-05 09:43:37 +01:00
artica 9d9233c99f Auto-updated build strings. 2017-12-05 00:01:16 +01:00
fbsanchez acfccd37ae Merge branch 'develop' into 1278-extension-vmware-ext-4456-y-4479 2017-12-04 16:12:43 +01:00
danielmaya a024d66fd7 Changed email by mail in mysql 2017-12-04 12:20:13 +01:00
danielmaya 87e2f4f3f9 Fixed filter in gis maps 2017-12-04 11:41:52 +01:00
artica 4d4cee2251 Auto-updated build strings. 2017-12-04 00:01:08 +01:00
artica 3d5e8760cd Auto-updated build strings. 2017-12-03 00:01:09 +01:00
artica dc8c5c54e6 Auto-updated build strings. 2017-12-02 00:01:38 +01:00
danielmaya dab2525355 Fixed jquery error 2017-12-01 13:32:50 +01:00
danielmaya 8b9c59a3b0 Fixed Unkwon Icon in GIS 2017-12-01 12:44:07 +01:00
enriquecd 521eb8f4cb Add clocks to visual console - #1403 2017-12-01 12:14:56 +01:00
vgilc 1949ee653b Merge branch '1540-ayuda-general-en-mapas-de-red-dev' into 'develop' 
1540 ayuda general en mapas de red dev

See merge request artica/pandorafms!1144
 2017-12-01 11:21:37 +01:00
Arturo Gonzalez d1f198b80b Added new networkmaps help section 2017-12-01 11:16:09 +01:00
vgilc 75c8b1ae8f Merge branch '1537-errores-al-reiniciar-el-mapa-de-red-dev' into 'develop' 
Added fix to reset map function

See merge request artica/pandorafms!1140
 2017-12-01 09:31:21 +01:00
vgilc 54f0f9130b Merge branch '1622-mapas-dinamicos-radiales-errores-varios-dev' into 'develop' 
Added more changes to improve radial dynamic maps

See merge request artica/pandorafms!1136
 2017-12-01 09:00:27 +01:00
artica 4652980457 Auto-updated build strings. 2017-12-01 00:01:11 +01:00
daniel a0bdab9b83 Merge branch 'develop' into 1483-Cuadro_de_umbrales 
Conflicts:
	pandora_console/godmode/agentes/module_manager_editor_common.php
	pandora_console/godmode/modules/manage_network_components_form_common.php
 2017-11-30 16:29:00 +01:00
Arturo Gonzalez 92d054695d Added fix to reset map function 2017-11-30 16:00:32 +01:00
daniel e0b90f2be0 optimization view events 2017-11-30 14:00:08 +01:00
nramon c7676d7f4a Merge branch '1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open' into 'develop' 
Add hide no data item checkbox to report templates - open - #1326

See merge request artica/pandorafms!940
 2017-11-30 12:57:59 +01:00
enriquecd 628d5d2c62 Merge branch 'develop' into 1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open 2017-11-30 12:09:53 +01:00
enriquecd 4f3f2525e1 Merge branch 'develop' into 1242-Unificar-ayudas-de-alertas 
Conflicts:
	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
 2017-11-30 11:47:47 +01:00
Arturo Gonzalez 30c879b600 Added more changes to improve radial dynamic maps 2017-11-30 10:45:28 +01:00
Arturo Gonzalez fbab43b451 In progress 2017-11-30 08:04:56 +01:00
artica d8ee188b95 Auto-updated build strings. 2017-11-30 00:01:12 +01:00
danielmaya 3adb990970 Fixed redeclare function 2017-11-29 18:11:40 +01:00
vgilc 43308596c1 Merge branch '1490-Añadir-un-nuevo-campo-de-búsqueda-en-vista-de-agentes-dev' into 'develop' 
added Search in custom fields

See merge request artica/pandorafms!969
 2017-11-29 16:57:32 +01:00
vgilc df5722e499 Merge branch '1500-Fuente-erronea-en-el-boton-del-wizar-de-instalación-de-Pandora' into 'develop' 
Change font family to install wizard button - #1500

See merge request artica/pandorafms!964
 2017-11-29 16:57:03 +01:00
vgilc 93c0ddfad4 Merge branch 'ent-1545-no-mostrar-valor-de-modulos-booleanos-en-static-graphs-carrefour' into 'develop' 
Removed last value on visual console boolean static graphs

See merge request artica/pandorafms!1053
 2017-11-29 16:56:36 +01:00
vgilc 66d15f3e4f Merge branch 'ent-1239-falta-texto-de-ayuda-definicion-de-modulos' into 'develop' 
Added autodisable mode help

See merge request artica/pandorafms!976
 2017-11-29 16:55:24 +01:00
vgilc 55e93d8fc9 Merge branch 'ent-1418-error-cuando-mysql-no-esta-levantado' into 'develop' 
Fixed console error 500 when mysql is not running

See merge request artica/pandorafms!959
 2017-11-29 16:54:58 +01:00
vgilc 5b506764fd Merge branch '1467-Error-en-API-al-deshabilitar-alertas-dev' into 'develop' 
Fixed function api_set_disable_alert

See merge request artica/pandorafms!989
 2017-11-29 16:54:00 +01:00
vgilc ef86663813 Merge branch 'no-cargan-los-modulos-en-cualquier-arbol-que-no-sea-el-de-grupos' into 'develop' 
Resolve: No cargan los modulos en cualquier arbol que no sea el de grupos

See merge request artica/pandorafms!977
 2017-11-29 16:48:38 +01:00
vgilc f8695a2781 Merge branch 'ent-986-macros-para-comentarios-en-ipam-4113-vodat' into 'develop' 
Added _event_cfX_ to macros help

See merge request artica/pandorafms!920
 2017-11-29 16:47:09 +01:00
vgilc 7ce6535170 Merge branch '1658-permisos-para-manipular-archivos-en-colecciones-dev' into 'develop' 
Added qw perms

See merge request artica/pandorafms!1127
 2017-11-29 16:20:08 +01:00
vgilc 019829685c Merge branch '1564-Error-al-crear-módulos-SNMPv3-desde-snmpwalk-dev' into 'develop' 
Fixed creating network components by snmpwalk

See merge request artica/pandorafms!1065
 2017-11-29 16:15:21 +01:00
vgilc 3a5b8928ac Merge branch 'ent-1035-busqueda-libre-en-visor-de-datos' into 'develop' 
Added free search values to data table

See merge request artica/pandorafms!992
 2017-11-29 16:10:46 +01:00
danielmaya caa3539c4f Fixed group recursion in bulk operation 2017-11-29 15:54:00 +01:00
vgilc 1895bf3fe9 Merge branch '1375-Que-se-muestre-la-unidad-en-las-custom-graphs-dev' into 'develop' 
added unit in custom graphs

See merge request artica/pandorafms!979
 2017-11-29 15:42:40 +01:00
vgilc 55dd05c406 Merge branch 'buscar-un-grupo-en-el-tree-view-carrefour' into 'develop' 
Resolve: Buscar un grupo en el tree view carrefour

See merge request artica/pandorafms!1003
 2017-11-29 15:41:31 +01:00
vgilc 976fd7d315 Merge branch '1492-ACL-no-permiten-buscar-en-Monitor-View-dev' into 'develop' 
Fixed search in status monitor with ACL enterprise

See merge request artica/pandorafms!949
 2017-11-29 15:39:37 +01:00
vgilc b98ac19f91 Merge branch '1570-Error-en-paginación-de-eventos-con-texto-libre-dev' into 'develop' 
Fixed pagination errors with free search

See merge request artica/pandorafms!1054
 2017-11-29 15:38:19 +01:00