19332 Commits

Author SHA1 Message Date
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
alejandro-campos
e45dc3a981 Fixed bug in modules deletion: parent id set to 0 in case parent has been deleted 2018-11-12 18:39:14 +01:00
vgilc
d2aee3d6e4 Merge branch 'fix/module-sem' into 'develop'
Remove a semaphore that is no longer needed. Thanks fbsanchez!

See merge request artica/pandorafms!1958
2018-11-12 17:41:25 +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
Ramon Novoa
be79ae83fb Remove a semaphore that is no longer needed. Thanks fbsanchez!
Ref pandora_enterprise#3060.
2018-11-12 15:32:37 +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
vgilc
64a5c626c1 Merge branch '3055-Bug_Autocombined_custom_graph' into 'develop'
fixed error automatic combined graph

See merge request artica/pandorafms!1952
2018-11-08 15:13:15 +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
fbsanchez
f35bd1369b updated tentacle_client 2018-11-08 14:38:01 +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
fbsanchez
c9e77d7356 if compress option is select but no libraries are present, tentacle will send the data uncompressed 2018-11-08 13:52:23 +01:00
vgilc
19fc5863d0 Merge branch 'ent-2243-5204-rendimiento-exportacion-csv-log-viewer-3' into 'develop'
Added cache to agents_get_alias

See merge request artica/pandorafms!1949
2018-11-08 13:43:42 +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
alejandro-campos
4179c0d341 fixed user edit update bug: not able to empty email and phone number fields and console errors. Also added validation to email and phone number inputs 2018-11-08 10:20:22 +01:00
manuel.montes
1d8a746329 Removed the adjustment of dimensions in custom graph 2018-11-08 09:49:36 +01:00
tatiana.llorente@artica.es
a144dd0cbd Removed text for modules with images - #2838 2018-11-08 09:32:38 +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
vgilc
1a1d847cee Merge branch '3045-Falta-un-botón-en-Visual-Styles' into 'develop'
Fixed bug in visual styles configuration

See merge request artica/pandorafms!1944
2018-11-07 16:46:49 +01:00
manuel.montes
c131c631d4 Fixed bug in visual styles configuration 2018-11-07 16:34:09 +01:00
vgilc
f413ae18b2 Merge branch '2571_Comprobacion_paradas_planificadas_CLI_4' into 'develop'
Fixed minor visual error in planned downtimes

See merge request artica/pandorafms!1943
2018-11-07 16:26:30 +01:00
samucarc
46a7d4c5f5 Fixed minor visual error in planned downtimes 2018-11-07 16:19:54 +01:00
vgilc
9142b82131 Merge branch '3048-fallo-configuracion-remota-servidor' into 'develop'
re-initialize pandorafms_server after configuration change

See merge request artica/pandorafms!1942
2018-11-07 16:17:15 +01:00
fbsanchez
df5e6daf7b re evaluate enterprise capabilities on configuration reload 2018-11-07 15:59:19 +01:00
vgilc
6cdb38b8ee Merge branch '2974-Fallo_al_hacer_over_en_graficas' into 'develop'
fixed minor errors in graphs an license diag

See merge request artica/pandorafms!1940
2018-11-07 15:06:29 +01:00
fbsanchez
7407431343 re-initialize pandorafms_server after configuration change 2018-11-07 14:57:20 +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