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

14751 Commits

Author SHA1 Message Date
vgilc 9fef25c9a4 Merge branch '3137-Pete_jquery_en_tree_view_metaconsola' into 'develop' 
fixed error events graphs

See merge request artica/pandorafms!2013
 2018-11-23 10:51:06 +01:00
daniel 726cabb578 fixed minor error jquery 2018-11-23 10:47:57 +01:00
Alejandro Gallardo Escobar ba0b2d8bd4 Fixed an object unserialize from the session 2018-11-23 10:33:18 +01:00
daniel 557002d7fd fixed error events graphs 2018-11-23 10:32:58 +01:00
daniel 1b78c1a78d fixed error log js and warning php visual style 2018-11-23 09:21:22 +01:00
artica c8969582a0 Auto-updated build strings. 2018-11-23 00:01:28 +01:00
danielmaya 62ad6b9a35 Added check of tags in report wizard 2018-11-22 10:39:48 +01:00
vgilc b4f3ce251b Merge branch '2615-Bug_Session_Timeout' into 'develop' 
fixed errors in session with send mail alerts graph API

See merge request artica/pandorafms!2004
 2018-11-22 09:01:47 +01:00
artica de77e52297 Auto-updated build strings. 2018-11-22 00:01:28 +01:00
daniel a5346a7ae3 fixed error login double 2018-11-21 17:38:11 +01:00
daniel 322c76b5e1 Merge remote-tracking branch 'origin/develop' into 2615-Bug_Session_Timeout 2018-11-21 16:52:20 +01:00
daniel a3aa84bf92 fixed errors in session with send mail alerts graph API 2018-11-21 15:16:52 +01:00
vgilc 7be5225429 Merge branch '2615-Bug_Session_Timeout' into 'develop' 
fixed errors session_start

See merge request artica/pandorafms!2003
 2018-11-21 13:13:47 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
vgilc 0344a5c2b0 Merge branch '2615-Bug_Session_Timeout' into 'develop' 
fixed minor error session

See merge request artica/pandorafms!2000
 2018-11-21 09:41:59 +01:00
daniel 3f6384c690 fixed minor error session 2018-11-21 09:36:37 +01:00
artica fd6d830de3 Auto-updated build strings. 2018-11-21 00:01:25 +01:00
daniel a089a93477 fixed session bugs 2018-11-20 18:07:43 +01:00
vgilc 20cbe0d767 Merge branch 'ent-3109-no-se-ven-los-agentes-en-la-creacion-de-clusters' into 'develop' 
Fixed query on function agents_get_group_agents

See merge request artica/pandorafms!1997
 2018-11-20 17:37:07 +01:00
samucarc 80b39782e4 Fixed function report_value in reports 2018-11-20 14:16:25 +01:00
vgilc 5ac947c2fd Merge branch 'ent-2169-REDIRIS-modificacion-de-comandos-en-alertas' into 'develop' 
Ent 2169 rediris modificacion de comandos en alertas

See merge request artica/pandorafms!1878
 2018-11-20 11:33:00 +01:00
fermin831 8735e6e1a3 Added a translation 2018-11-20 11:18:57 +01:00
fermin831 8a00fe5a30 Fixed query on function agents_get_group_agents 2018-11-20 10:58:58 +01:00
vgilc 6302dc634d Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop' 
fixed minor error

See merge request artica/pandorafms!1996
 2018-11-20 09:22:17 +01:00
daniel 2078014406 fixed minor error 2018-11-20 09:14:36 +01:00
artica 01ba290a68 Auto-updated build strings. 2018-11-20 00:01:29 +01:00
vgilc 522a098d24 Merge branch '2615-bug-session-timeout' into 'develop' 
time used for session cookie expiration set to gmt time

See merge request artica/pandorafms!1995
 2018-11-19 17:30:11 +01:00
daniel ee22d3988c fixed error ldap 2018-11-19 16:33:27 +01:00
alejandro-campos 2c5cd6627b time used for session cookie expiration set to gmt time 2018-11-19 16:33:27 +01:00
vgilc 34aea47449 Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop' 
2784 pantalla por dispositivos filtrado por custom fields

See merge request artica/pandorafms!1993
 2018-11-19 16:24:58 +01:00
daniel 9d80e940bf fixed minor error cfv 2018-11-19 16:17:20 +01:00
tatiana.llorente@artica.es 8e72f53aff Removed unnecessary loop - #3096 2018-11-19 16:07:45 +01:00
vgilc c499a21cc2 Merge branch '2615-bug-session-timeout' into 'develop' 
time used for session cookie set to timezone current time instead of gmt time

See merge request artica/pandorafms!1991
 2018-11-19 13:29:01 +01:00
alejandro-campos 3ffab647cb time used for session cookie set to timezone current time instead of gmt time 2018-11-19 13:21:25 +01:00
danielmaya 24fe48d5c5 Added token metaconsole_deploy_collection in the config 2018-11-19 12:12:10 +01:00
danielmaya 04ebb6b2c5 Added delete function in the api 2018-11-19 11:28:35 +01:00
Alejandro Gallardo Escobar 919e94e46a Added an exit after every Location header declared 2018-11-19 11:28:07 +01:00
daniel 105e93d069 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-19 08:42:30 +01:00
vgilc 96a36615cc Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop' 
2784 pantalla por dispositivos filtrado por custom fields

See merge request artica/pandorafms!1987
 2018-11-19 08:39:16 +01:00
artica ce5c679ad6 Auto-updated build strings. 2018-11-19 00:01:29 +01:00
artica f2bf27d367 Auto-updated build strings. 2018-11-18 00:01:28 +01:00
artica 4021af48f9 Auto-updated build strings. 2018-11-17 00:01:31 +01:00
daniel 2eb47c1251 fixed errors in custom fields view 2018-11-16 15:00:09 +01:00
fbsanchez b2ed4a9d2c standby software agent while disabling 2018-11-16 14:26:11 +01:00
daniel 449c02763a fixed minor error cfv 2018-11-16 13:22:10 +01:00
vgilc d0d989ab19 Merge branch 'fix/db-retry-lock' into 'develop' 
retried db query on error 1205 - lock

See merge request artica/pandorafms!1981
 2018-11-16 13:15:06 +01:00
vgilc f99dadca39 Merge branch 'fix/ux-panel-historical-images' into 'develop' 
Fix/ux panel historical images

See merge request artica/pandorafms!1984
 2018-11-16 12:51:31 +01:00
fbsanchez 5c3b3a0e66 adjusted replication_interval default 2018-11-16 12:46:10 +01:00
fbsanchez 35870d13fd allow snapshot_view check historical db 2018-11-16 12:42:08 +01:00
daniel 0a097d185d fixed errors in custom fields view 2018-11-16 11:58:49 +01:00
fbsanchez 50c3453415 change default values for event synch 2018-11-16 11:27:32 +01:00
daniel e6cd8c5471 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-16 09:11:49 +01:00
artica a0fde9503f Auto-updated build strings. 2018-11-16 00:01:29 +01:00
daniel e21fde537a fixed css errors custom field view and new features 2018-11-15 19:16:49 +01:00
vgilc a00c10a136 Merge branch '2166-Hide-not-init-agents-2' into 'develop' 
removed hide not init modules from sla and availability report

See merge request artica/pandorafms!1976
 2018-11-15 17:20:00 +01:00
vgilc 73590705e9 Merge branch '3079-Alertas_php7' into 'develop' 
3079 alertas php7

See merge request artica/pandorafms!1980
 2018-11-15 15:41:16 +01:00
daniel 7700ee85ca Merge remote-tracking branch 'origin/develop' into 3079-Alertas_php7 2018-11-15 15:34:08 +01:00
daniel d12a25866d fixed translate php7 warning 2018-11-15 15:33:46 +01:00
daniel 1edb7fda03 Merge remote-tracking branch 'origin/develop' into 3072-Problemas_jquery 2018-11-15 15:20:02 +01:00
daniel 34ea7cfbcb fixed position select autocomplete agent jqui 2018-11-15 15:19:43 +01:00
vgilc da410c9394 Merge branch '3079-Alertas_php7' into 'develop' 
3079 alertas php7

See merge request artica/pandorafms!1978
 2018-11-15 14:17:26 +01:00
daniel aee12e6bf9 Merge remote-tracking branch 'origin/develop' into 3079-Alertas_php7 2018-11-15 13:23:09 +01:00
daniel b78c52caa4 fixed error Acess for Access 2018-11-15 13:22:54 +01:00
fermin831 b786c6c3ab Fixed snmptrap binary in windows trap generator 2018-11-15 13:04:35 +01:00
alejandro-campos a1846a6e22 removed hide not init modules from sla and availability report 2018-11-15 12:00:25 +01:00
vgilc 614efef0c4 Merge branch '3079-Alertas_php7' into 'develop' 
create alert php7

See merge request artica/pandorafms!1975
 2018-11-15 09:46:27 +01:00
artica e9e132589c Auto-updated build strings. 2018-11-15 00:01:29 +01:00
daniel 6174e622c8 create alert php7 2018-11-14 18:15:48 +01:00
vgilc e2612e2273 Merge branch '3072-Problemas_jquery' into 'develop' 
fixed errors cv

See merge request artica/pandorafms!1974
 2018-11-14 16:46:33 +01:00
daniel 60212dae50 fixed errors cv 2018-11-14 16:38:44 +01:00
vgilc d7db1e95e4 Merge branch 'fix/ehorus-password' into 'develop' 
Decode entities in the eHorus password.

See merge request artica/pandorafms!1972
 2018-11-14 12:41:52 +01:00
nramon 0c019d1baf Merge branch 'fix/db_connect_charset' into 'develop' 
removed default charset, set to auto

See merge request artica/pandorafms!1973
 2018-11-14 12:36:17 +01:00
fbsanchez a20d541fb4 removed default charset, set to auto 2018-11-14 12:31:35 +01:00
Ramon Novoa 574e537ff1 Decode entities in the eHorus password. 
Ref pandora_enterprise#3073.
 2018-11-14 12:16:59 +01:00
samucarc 43629d5c2a Fixed minor visual error in GIS Map 2018-11-14 12:10:38 +01:00
samucarc dc6a293b52 Fixed error in agent table in GIS map 2018-11-14 11:53:12 +01:00
daniel 22a26aa072 fixed error upgrade jquery 2018-11-14 11:40:01 +01:00
vgilc d91f81d0ed Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
fixed minor bug: Assigned node field showing in meta user update form when…

See merge request artica/pandorafms!1968
 2018-11-14 08:30:42 +01:00
artica 633d6987eb Auto-updated build strings. 2018-11-14 00:01:29 +01:00
alejandro-campos 5eed82eb62 fixed minor bug: Assigned node field showing in meta user update form when selecting admin profile in case the user was a stardard user 2018-11-13 19:00:16 +01:00
manuel.montes dd7e623782 Fixed overflow in module data view 2018-11-13 17:04:14 +01:00
tatiana.llorente@artica.es b2996e59d5 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-13 16:50:35 +01:00
tatiana.llorente@artica.es a6b8929a37 Added jquery-ui styles to css - #2784 2018-11-13 16:48:06 +01:00
tatiana.llorente@artica.es 719e502a27 Revert "Added jquery-ui styles to css - #2784" 
This reverts commit fdda5793d2.
 2018-11-13 16:34:27 +01:00
tatiana.llorente@artica.es 4a001d8192 Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' of https://brutus.artica.lan:8081/artica/pandorafms into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-13 16:30:54 +01:00
tatiana.llorente@artica.es fdda5793d2 Added jquery-ui styles to css - #2784 2018-11-13 16:27:57 +01:00
artica f308e1f590 Updated version and build strings. 2018-11-13 15:59:16 +01:00
daniel ac671d041c Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-13 15:47:07 +01:00
daniel 4dbcecb951 WIP custom fields view 2018-11-13 15:46:44 +01:00
alejandro-campos c5a0065cba decoded entities when retrieving module name in case SNMP module name is updated 2018-11-13 11:50:46 +01:00
tatiana.llorente@artica.es ea9cbb6973 Changed visual styles - #2784 2018-11-13 11:20:27 +01:00
manuel.montes 5420da9f23 fixed error message 2018-11-13 09:36:20 +01:00
fermin831 66448673c1 Fixed no data to show in not init modules with TIP graphs 2018-11-13 09:00:42 +01:00
danielmaya 2a0d2e6c46 collection management from metaconsole 2018-11-13 08:33:47 +01:00
artica e29160f34d Auto-updated build strings. 2018-11-13 00:01:29 +01:00
vgilc 9d896de41a Merge branch 'ent-3050-fallo-php-7-en-networks-maps' into 'develop' 
Fixed php errors on radial networkmap

See merge request artica/pandorafms!1960
 2018-11-12 16:49:58 +01:00
vgilc 6d0d7fd410 Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
removed Assigned node field from admin global profile when creating user from metaconsole

See merge request artica/pandorafms!1959
 2018-11-12 16:49:08 +01:00
fermin831 a201262737 Fixed php errors on radial networkmap 2018-11-12 16:29:31 +01:00
alejandro-campos 75ad60a071 removed Assigned node field from admin global profile when creating user from metaconsole 2018-11-12 15:57:18 +01:00
tatiana.llorente@artica.es 406bf08e2e Changed images for status modules and agents - #2784 2018-11-12 15:43:23 +01:00
samucarc e9627949a8 Fixed link in static graph 2018-11-12 13:12:52 +01:00
fermin831 3d04a742a3 Merge remote-tracking branch 'origin/develop' into ent-2169-REDIRIS-modificacion-de-comandos-en-alertas 2018-11-12 13:10:53 +01:00
alejandro-campos 420adb4630 implemented search filters for module group and agent group in module groups view 2018-11-12 13:02:37 +01:00
manuel.montes 69df02da48 Fixed bug in agent graph view 2018-11-12 10:45:50 +01:00
daniel afaa6ad2ba Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-12 09:07:56 +01:00
artica 0dd6c54651 Auto-updated build strings. 2018-11-12 00:01:25 +01:00
artica 4f928c8c22 Auto-updated build strings. 2018-11-11 00:01:25 +01:00
artica 76b24c3214 Auto-updated build strings. 2018-11-10 00:01:28 +01:00
artica 2ed98eac77 Auto-updated build strings. 2018-11-09 00:01:27 +01:00
vgilc 0255492523 Merge branch '2652_Custom_graphs_en_formato_stacked_area_se_muestran_en_formato_area_al_generar_el_informe' into 'develop' 
Fixed stacked area graph error when opened in PDF format

See merge request artica/pandorafms!1954
 2018-11-08 17:22:13 +01:00
samucarc 8a2e82371d Fixed stacked area graph error when opened in PDF format 2018-11-08 17:07:47 +01:00
fermin831 80d3299b2b Removed unused code (meta static graphs) 2018-11-08 16:46:34 +01:00
daniel c4c0cc59d4 fixed error automatic combined graph 2018-11-08 15:05:57 +01:00
daniel bb15c39ef5 WIP Custom view fields 2018-11-08 15:03:40 +01:00
alejandro-campos 9c2e67f364 avoid sql injection in visual_map_get_user_layouts function 2018-11-08 14:01:18 +01:00
fermin831 d63666cbbc Merge branch 'develop' into ent-2169-REDIRIS-modificacion-de-comandos-en-alertas 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/godmode/alerts/alert_actions.php

Modified files extra:
	pandora_console/include/functions_alerts.php
 2018-11-08 14:00:49 +01:00
fermin831 059ca855f9 Added cache to agents_get_alias 2018-11-08 13:03:04 +01:00
vgilc 7afc328e50 Merge branch '2900-Mensajes-de-Error-y-Success-al-mismo-tiempo-en-la-edición-de-usuarios_2' into 'develop' 
Display an error message when no changes have been made - #2900

See merge request artica/pandorafms!1948
 2018-11-08 12:27:45 +01:00
tatiana.llorente@artica.es 85adf7cf8d Display an error message when no changes have been made - #2900 2018-11-08 12:04:08 +01:00
manuel.montes 1d8a746329 Removed the adjustment of dimensions in custom graph 2018-11-08 09:49:36 +01:00
artica d28b229423 Auto-updated build strings. 2018-11-08 00:01:29 +01:00
daniel 5c99a8138f fixed minor error 2018-11-07 17:16:25 +01:00
daniel 1c1df4b5f7 fixed errors css jqueryui 2018-11-07 17:09:42 +01:00
manuel.montes c131c631d4 Fixed bug in visual styles configuration 2018-11-07 16:34:09 +01:00
samucarc 46a7d4c5f5 Fixed minor visual error in planned downtimes 2018-11-07 16:19:54 +01:00
manuel.montes a3f4bfaa3d Implemented limitation decimals in y-axis realtime graphs 2018-11-07 13:57:47 +01:00
daniel 58aa334798 fixed minor errors in graphs an license diag 2018-11-07 13:33:07 +01:00
daniel 218bf81fa1 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-07 13:30:19 +01:00
daniel 3f78f15499 WIP View custom fields data 2018-11-07 13:28:00 +01:00
daniel 267f83cc4c add datatabes 2018-11-07 13:25:02 +01:00
daniel 7d54858b45 delete files dont use 2018-11-07 13:24:07 +01:00
vgilc 9c143d1d00 Merge branch '2719-Links-desde-tree-view-de-meta' into 'develop' 
fixed agent name and go to agent edition links in meta tree view

See merge request artica/pandorafms!1939
 2018-11-07 12:49:15 +01:00
danielmaya 3ffd976365 resolved conflicts in ver_agente 2018-11-07 12:31:54 +01:00
alejandro-campos 2a616e1448 fixed agent name and go to agent edition links in meta tree view 2018-11-07 12:29:37 +01:00
tatiana.llorente@artica.es aa19640497 Changed ORDER BY in SQL query - #3044 2018-11-07 10:34:14 +01:00
vgilc c7a54182a3 Merge branch '6219_Comprobacion_Paradas_planificadas_CLI_2' into 'develop' 
Added check for the creation of planned downtimes by pandora manage

See merge request artica/pandorafms!1936
 2018-11-07 08:48:48 +01:00
artica a01f79d294 Auto-updated build strings. 2018-11-07 00:01:31 +01:00
vgilc eec3b1843d Merge branch '2900-Mensajes-de-Error-y-Success-al-mismo-tiempo-en-la-edición-de-usuarios' into 'develop' 
2900 mensajes de error y success al mismo tiempo en la edición de usuarios

See merge request artica/pandorafms!1863
 2018-11-06 17:08:54 +01:00
samucarc a80c7e493e Added check for the creation of planned downtimes by pandora manage 2018-11-06 16:42:03 +01:00
vgilc c50b1b7243 Merge branch 'ent-2486-6107-bug-lista-dashbord-con-acl-2' into 'develop' 
Fixed delete menu on main page dashboards

See merge request artica/pandorafms!1932
 2018-11-06 15:23:42 +01:00
vgilc 1698f663a5 Merge branch '2730-Fallo-políticas-desde-la-meta3' into 'develop' 
Fixed bug in deleted policies

See merge request artica/pandorafms!1934
 2018-11-06 15:23:09 +01:00
vgilc 78c88c4f8f Merge branch '3021-SLA-vista-descolocada' into 'develop' 
Removed duplicated code - #3021

See merge request artica/pandorafms!1933
 2018-11-06 15:22:33 +01:00
vgilc 62b27284aa Merge branch '3000-lost-in-stash' into 'develop' 
ondemand pluginTools, pandora_df inodes, cde functions_api cluster options

See merge request artica/pandorafms!1919
 2018-11-06 15:03:36 +01:00
fbsanchez bfc669225c Merge remote-tracking branch 'origin/develop' into 3000-lost-in-stash 2018-11-06 14:48:14 +01:00
manuel.montes df8c5e8bf9 Fixed bug in deleted policies 2018-11-06 13:52:03 +01:00
tatiana.llorente@artica.es 26a4880f64 Removed duplicated code - #3021 2018-11-06 13:49:47 +01:00
fermin831 6ede68bf8d Fixed delete menu on main page dashboards 2018-11-06 13:10:44 +01:00
vgilc 1435b196db Merge branch '2973-La-paginación-en-la-vista-de-módulos-de-agente-no-funciona' into 'develop' 
Fixed SQL query - #2973

See merge request artica/pandorafms!1931
 2018-11-06 12:09:15 +01:00
tatiana.llorente@artica.es 9448111927 Fixed SQL query - #2973 2018-11-06 11:14:12 +01:00
artica 3ffad9fda8 Auto-updated build strings. 2018-11-06 00:01:27 +01:00
manuel.montes 45b757b5db Fixed bug in SNMP Wizard 2018-11-05 14:17:43 +01:00
vgilc 4102f11f6b Merge branch '2618_Bug_Acceso_agentes_en_vista_de_grupo_2' into 'develop' 
2618 bug acceso agentes en vista de grupo 2

See merge request artica/pandorafms!1928
 2018-11-05 13:11:44 +01:00
samucarc 3d99ef48aa Fixed ACLs in monitoring View and agent detail 2018-11-05 13:05:34 +01:00
daniel 7a7fcaa6a8 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-05 09:35:38 +01:00
daniel b71d396c84 WIP custom fields view 2018-11-05 09:35:17 +01:00
artica 50b8886916 Auto-updated build strings. 2018-11-05 00:01:25 +01:00
artica f9e2936df5 Auto-updated build strings. 2018-11-04 00:01:25 +01:00
artica afd922426e Auto-updated build strings. 2018-11-03 00:01:27 +01:00
alejandro-campos ef90536152 added new field in treport table 2018-11-02 16:31:54 +01:00
daniel e2fabb6167 WIP custom fields view 2018-11-02 13:37:30 +01:00
tatiana.llorente@artica.es 233b9c2c70 Well centered message modal window - #2768 2018-11-02 13:07:38 +01:00
danielmaya 3c78e387df Fixed nodes count in pandora_networkmap 2018-11-02 11:32:07 +01:00
daniel c4eeb3cc76 fixed error edit modules in massive operation php7 error select 2018-11-02 10:18:33 +01:00
daniel f2b1c99013 fixed minor error cluster name by alias 2018-11-02 09:56:31 +01:00
daniel ec194208f5 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-02 08:20:39 +01:00
artica fc82a9d172 Auto-updated build strings. 2018-11-02 00:01:26 +01:00
artica f47918b4cc Auto-updated build strings. 2018-11-01 00:01:31 +01:00
daniel b5045d522e WIP custom fields view 2018-10-31 18:02:36 +01:00
Fermin 9f0e43623b Fixed agent popup with secondary groups privileges in tree view 2018-10-31 16:16:32 +01:00
daniel 879b1cfecb Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-10-31 09:23:58 +01:00
Fermin 7f22e2b067 Fixed disabled modules on agent view 2018-10-31 08:57:34 +01:00
artica d9f8616b2c Auto-updated build strings. 2018-10-31 00:01:26 +01:00
fbsanchez 39b6164526 snapshot viewer fix 2018-10-30 18:20:10 +01:00
fbsanchez 8fe82add30 ondemand pluginTools, pandora_df inodes, cde functions_api cluster options 2018-10-30 17:53:57 +01:00
daniel 78a1c72eac fixed warnings php7 2018-10-30 17:38:46 +01:00
vgilc b1bf1d7b4b Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 
2326 unificar vistas ux y wux en un mismo portal

See merge request artica/pandorafms!1917
 2018-10-30 16:20:26 +01:00
fbsanchez a58bde2118 fixed UX historical snapshot viewer 2018-10-30 16:12:48 +01:00
vgilc e6a9ca7bfb Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop' 
fixed errors php7

See merge request artica/pandorafms!1916
 2018-10-30 15:00:54 +01:00
daniel 0978be9b51 fixed errors php7 2018-10-30 14:43:27 +01:00
vgilc cb848238e4 Merge branch '2221-actualizacion-de-pandora-a-version-7-de-php' into 'develop' 
xmlrpc php7 Dockerfile + debian specs

See merge request artica/pandorafms!1914
 2018-10-30 13:29:33 +01:00
fbsanchez 4f166555da xmlrpc php7 Dockerfile + debian specs 2018-10-30 12:54:20 +01:00
vgilc 70884f73d0 Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop' 
fixed changes in pandora mobile

See merge request artica/pandorafms!1913
 2018-10-30 12:45:57 +01:00
daniel 743a41d29c fixed changes in pandora mobile 2018-10-30 12:30:10 +01:00
vgilc d4fa8e7b27 Merge branch '2983-6699-bug-no-se-pueden-anadir-acciones-nuevas-a-alertas-dev' into 'develop' 
Fixed add button on alerts

See merge request artica/pandorafms!1908
 2018-10-30 09:36:37 +01:00
vgilc 020f9579a2 Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop' 
fixed errors php7

See merge request artica/pandorafms!1909
 2018-10-30 09:36:18 +01:00
artica 5a057490ad Auto-updated build strings. 2018-10-30 00:01:29 +01:00
daniel 8e206eeeef fixed errors php7 2018-10-29 18:20:56 +01:00
fermin831 294553941d Fixed add button on alerts 2018-10-29 16:41:55 +01:00
fbsanchez cdc0efae82 spec fix - php7 2018-10-29 16:11:29 +01:00
fermin831 c7a624000e Added API function set delete_user_profile_info 2018-10-29 13:34:30 +01:00
Ramon Novoa 6353af0482 Merge remote-tracking branch 'github/develop' into develop 2018-10-29 13:20:48 +01:00
fermin831 bf7cdcc7ff Added API function set update_user_profile_info 2018-10-29 12:45:03 +01:00
fermin831 4f02d72630 Added API function set create_user_profile_info 2018-10-29 12:22:08 +01:00
daniel 29fb922b70 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-10-29 11:06:57 +01:00
fermin831 c211433321 Added API function get user_profiles_info 2018-10-29 11:02:43 +01:00
vgilc e03f56f0d7 Merge branch '2429-Resaltar-elementos-al-pasar-por-encima-o-marcar' into 'develop' 
2429 resaltar elementos al pasar por encima o marcar

See merge request artica/pandorafms!1762
 2018-10-29 09:17:54 +01:00
vgilc 17286414c7 Merge branch '2619_Group_View' into 'develop' 
Added warning and normal status agents in group view

See merge request artica/pandorafms!1799
 2018-10-29 09:16:33 +01:00
vgilc 08a8165b93 Merge branch '2827-Mensaje-de-alerta-disparada' into 'develop' 
Added number of times an alert is fired - #2827

See merge request artica/pandorafms!1823
 2018-10-29 09:15:32 +01:00
artica 696abbdead Auto-updated build strings. 2018-10-29 00:01:25 +01:00
artica 507bbcff56 Auto-updated build strings. 2018-10-28 00:01:22 +02:00
artica 01e9251a88 Auto-updated build strings. 2018-10-27 00:01:26 +02:00
vgilc 1973a5fe54 Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 
WUX-UX integration

See merge request artica/pandorafms!1890
 2018-10-26 14:42:23 +02:00
vgilc 7a4b7d4289 Merge branch '2221-Actualizacion_de_Pandora_a_version_7_de_PHP' into 'develop' 
2221 actualizacion de pandora a version 7 de php

See merge request artica/pandorafms!1875
 2018-10-26 14:41:15 +02:00
nramon 3d964364e8 Merge branch 'fix-language-selection-problem' into 'develop' 
Fixed language selection problem at initial setup.

See merge request artica/pandorafms!1902
 2018-10-26 10:51:01 +02:00
Junichi Satoh 91ed413b0a Fixed language selection problem at initial setup. 2018-10-26 17:34:49 +09:00
Junichi Satoh ecf5ca3bb2 Updated Japanese help files. 2018-10-26 17:28:24 +09:00
artica dba51e07b3 Auto-updated build strings. 2018-10-26 00:01:33 +02:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
daniel f78e86b925 view cusatom field 2018-10-25 17:08:56 +02:00
fbsanchez c06bd4207e estilos popup 2018-10-25 16:40:45 +02:00
fbsanchez 172ac187a2 estilos popup 2018-10-25 15:58:06 +02:00
fermin831 d70969e6e9 Merge branch 'develop' into ent-2520-api-listar-y-crear-repuestas-de-eventos-6165-eucomm 
Conflicts resolved:
	pandora_console/include/functions_api.php
 2018-10-25 15:45:16 +02:00
fermin831 f831e59ac3 Added documentation and minor fixes related with API event responses functions 2018-10-25 15:42:45 +02:00
fbsanchez 8619adbf4c estilos popup 2018-10-25 15:42:20 +02:00
fermin831 8cc68185d9 Added set delete_event_response to API 2018-10-25 15:34:02 +02:00
fermin831 1bd492307a Added set update_event_response to API 2018-10-25 15:25:27 +02:00
fermin831 6b93cba119 Added set create_event_response to API 2018-10-25 15:03:07 +02:00
fbsanchez 85051924b7 estilos popup 2018-10-25 14:01:12 +02:00
vgilc 3aff162616 Merge branch '2961-Longitud-del-nombre-de-las-plantillas-de-consolas-visuales' into 'develop' 
Changed tlayout_template name table to varchar 600

See merge request artica/pandorafms!1889
 2018-10-25 13:27:25 +02:00
vgilc 2bd6b0c688 Merge branch '1863-Error-en-tipo-de-evento-going-up-critical' into 'develop' 
1863 error en tipo de evento going up critical

See merge request artica/pandorafms!1736
 2018-10-25 13:25:22 +02:00
vgilc d218c586d9 Merge branch '2166-Hide-not-init-agents' into 'develop' 
fixed bug: hide not init agents not working in report item creation

See merge request artica/pandorafms!1742
 2018-10-25 13:23:22 +02:00
vgilc 9aed441246 Merge branch '2452-Fallo-recalculo-custom-graph' into 'develop' 
Changed custom graph item insertion and deletion to fix bug when sorting elements in list

See merge request artica/pandorafms!1782
 2018-10-25 13:20:30 +02:00
vgilc 3ed5b97e1d Merge branch '2455--6064-Error-Insert-data-nombre-de-XML-mal-construido' into 'develop' 
Fixed bug in the construction of the name of the xml file

See merge request artica/pandorafms!1737
 2018-10-25 13:20:05 +02:00
vgilc d1ff778102 Merge branch 'ent-2486-6107-bug-lista-dashbord-con-acl' into 'develop' 
Removed dashboard menu if it is displayed from main page

See merge request artica/pandorafms!1879
 2018-10-25 13:19:33 +02:00
vgilc fcb95a8d8d Merge branch '2510-Checkboxes-y-radio-buttons-en-Config.-visual' into 'develop' 
visuals fix in visual styles

See merge request artica/pandorafms!1731
 2018-10-25 13:16:57 +02:00
vgilc aabd5435d0 Merge branch '2535-Macro-para-unidad-informes' into 'develop' 
Added unit in label graphs

See merge request artica/pandorafms!1874
 2018-10-25 13:12:26 +02:00
vgilc d71257ea1c Merge branch 'ent-2540-Macro-de-IP-del-agente-no-funciona-event-responses-EUComm' into 'develop' 
Fixed macro _agent_adress_ on events responses

See merge request artica/pandorafms!1872
 2018-10-25 13:03:44 +02:00
vgilc 3c548f1c98 Merge branch '6219_Comprobacion_paradas_planificadas' into 'develop' 
Fixed problems in scheduled downtime CLI

See merge request artica/pandorafms!1806
 2018-10-25 13:03:17 +02:00
vgilc 66e662c53e Merge branch '2572-Fallo-visual' into 'develop' 
Database and application_osx icons added to select icon of group - #2572

See merge request artica/pandorafms!1749
 2018-10-25 13:02:08 +02:00
vgilc 3c4f6d3b23 Merge branch '2580-VERSION-OPEN-Línea-divisoria' into 'develop' 
Fixed bug in module manager

See merge request artica/pandorafms!1729
 2018-10-25 13:00:59 +02:00
vgilc f2356a3a9b Merge branch 'ent-2608-mas-problemas-de-vistas-de-grupos-secundarios' into 'develop' 
Ent 2608 mas problemas de vistas de grupos secundarios

See merge request artica/pandorafms!1856
 2018-10-25 12:59:51 +02:00
vgilc 4c4c874553 Merge branch '2630-Exportación-Gráficas-relacionado-con-CSV' into 'develop' 
Fixed bug in csv export graph

See merge request artica/pandorafms!1814
 2018-10-25 12:57:24 +02:00
vgilc 330bdbbce0 Merge branch '2637-Help-en-Event-Viewer' into 'develop' 
Changed Actions column with the right icons - #2637

See merge request artica/pandorafms!1746
 2018-10-25 12:32:37 +02:00
vgilc ea2ed80f05 Merge branch '2655-Audit-log-con-entities' into 'develop' 
Suppress entities in System audit log comments

See merge request artica/pandorafms!1714
 2018-10-25 12:32:07 +02:00
vgilc fb32ea240f Merge branch '2704_SQL_Horizontal_bar_graph_en_informe_corta_los_labels_si_son_muy_largos' into 'develop' 
Fixed SQL graphs in reports

See merge request artica/pandorafms!1791
 2018-10-25 12:11:41 +02:00
vgilc 4b317b573b Merge branch '2708-API-metaconsola-function-get_agent-no-devuelve-nada' into 'develop' 
Added code for function api_get_agent_alias for the API of the metaconsole - #2708

See merge request artica/pandorafms!1816
 2018-10-25 12:11:16 +02:00
vgilc b50f52ae9d Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
fixed bug: admin users not able to log in to node when they are created in…

See merge request artica/pandorafms!1812
 2018-10-25 12:10:58 +02:00
vgilc c14a7d270a Merge branch '2719-Links-desde-tree-view-de-meta' into 'develop' 
Fixed bug: bad link in meta tree view's agent data, using relative path

See merge request artica/pandorafms!1793
 2018-10-25 12:10:32 +02:00
vgilc de0c81b7fa Merge branch '2724-Fallo-en-una-parte-de-replicación-de-eventos3' into 'develop' 
Fixed bug in events replication

See merge request artica/pandorafms!1804
 2018-10-25 12:09:58 +02:00
vgilc 9b4eeb5c84 Merge branch '2723-Fallo-hint-en-eventos' into 'develop' 
new function that adds a border to the image if the status is warning - #2723

See merge request artica/pandorafms!1743
 2018-10-25 12:07:58 +02:00
vgilc 4dd2cd434c Merge branch '2726-Botones-background-en-Visual-consoles' into 'develop' 
Changed colors for buttons - #2726

See merge request artica/pandorafms!1797
 2018-10-25 12:05:56 +02:00
vgilc 48395acfaa Merge branch '2730-Fallo-políticas-desde-la-meta' into 'develop' 
Fixed bug in deleted policies from the metaconsole

See merge request artica/pandorafms!1774
 2018-10-25 12:03:24 +02:00
vgilc af2e49966b Merge branch '2734-6444-Nombre-de-interfaces-en-SNMP-Interface-Wizard2' into 'develop' 
Added horizontal scroll in the interfaces select

See merge request artica/pandorafms!1738
 2018-10-25 11:58:33 +02:00
vgilc 8e1a946836 Merge branch '2738-Autorefresh-falla-en-la-meta' into 'develop' 
Countdown in group view for autorefresh

See merge request artica/pandorafms!1768
 2018-10-25 11:57:53 +02:00
vgilc 5255ced7d1 Merge branch '2762-Poner-capitalizacion-correcta' into 'develop' 
Capital letter in the letter a of audit - #2762

See merge request artica/pandorafms!1766
 2018-10-25 11:55:15 +02:00
vgilc cf9bf2b4e2 Merge branch '2768-Mensajería-interna' into 'develop' 
Fixed borders of tables with classes databox and data - #2768

See merge request artica/pandorafms!1786
 2018-10-25 11:54:50 +02:00
vgilc 50d30e782f Merge branch '2769-Bug-en-la-ayuda-de-Custom-Macros-en-la-creacion-de-un-modulo' into 'develop' 
Fixed bug in custom macros help

See merge request artica/pandorafms!1779
 2018-10-25 11:54:12 +02:00
fermin831 c0afbf0b6f Added get event_responses to API 2018-10-25 11:49:39 +02:00
vgilc cab90a4fd3 Merge branch '2783-Falta-de-información-de-Module-Management-en-Last-Activity' into 'develop' 
Added module name and agent name in actions enable and disable module - #2783

See merge request artica/pandorafms!1783
 2018-10-25 11:44:42 +02:00
vgilc 82f6e3cb95 Merge branch '2786-Errores-en-mapas-de-red-dev' into 'develop' 
Fixed group and set_center

See merge request artica/pandorafms!1880
 2018-10-25 11:43:38 +02:00