18672 Commits

Author SHA1 Message Date
fermin831
4cb66c31f1 Fixed logo image on metaconsole login 2018-10-23 17:43:00 +02:00
fermin831
8cb2ff1d1b Fixed tactical view graph on mobile metaconsole 2018-10-23 17:41:14 +02:00
danielmaya
a1f28480ae Fixed force_type check in delete/edit modules in bulk 2018-10-23 15:46:48 +02:00
fbsanchez
9765a8c113 Merge remote-tracking branch 'origin/develop' into 2759-crear-iso-precargada-enterprise-para-demos 2018-10-23 14:43:39 +02:00
danielmaya
f10a661cd6 Fixed group and set_center 2018-10-23 12:36:20 +02:00
fermin831
2af6108b66 Removed dashboard menu if it is displayed from main page 2018-10-23 12:29:23 +02:00
artica
9a77256198 Auto-updated build strings. 2018-10-23 00:01:29 +02:00
alejandro-campos
aaa2c6aa10 fixed bug: calling api method create event not inserting agent name 2018-10-22 10:31:10 +02:00
artica
f899910dd0 Updated version and build strings. 2018-10-22 09:45:06 +02:00
daniel
6bb478ea1a Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-22 08:04:36 +02:00
artica
1d0d656996 Auto-updated build strings. 2018-10-22 00:01:23 +02:00
artica
b01362a873 Auto-updated build strings. 2018-10-21 00:01:26 +02:00
artica
5ced50863c Auto-updated build strings. 2018-10-20 00:01:25 +02:00
manuel.montes
972f4b1e89 Added unit in label graphs 2018-10-19 14:03:15 +02:00
daniel
bd2a3a82ec silence error php7(not solution) 2018-10-19 12:25:01 +02:00
daniel
81ebfc755e fixed gdgraph 2018-10-19 12:01:22 +02:00
daniel
a7918a1816 delete field flash chart php7 2018-10-19 11:56:49 +02:00
daniel
8c49b26a91 php7 version 2018-10-19 11:37:11 +02:00
daniel
ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +02:00
vgilc
b7f9149c20 Merge branch '2920-No-funciona-el-wizard-para-crear-agentes-desde-la-metaconsola' into 'develop'
Changed function that creates a new agent from metaconsole to set field name…

See merge request artica/pandorafms!1873
2018-10-19 11:30:47 +02:00
daniel
0a1bee92a5 fixed slicebar to php7 2018-10-19 10:49:13 +02:00
alejandro-campos
3fd588353b Changed function that creates a new agent from metaconsole to set field name with a hash and fixed bug when setting alias in database 2018-10-19 10:43:43 +02:00
daniel
b736746e1c php version upgrade 2018-10-19 10:04:26 +02:00
artica
f340a3dda0 Auto-updated build strings. 2018-10-19 00:01:26 +02:00
fermin831
4d3c74ed37 Minor typo fix in events responses 2018-10-18 19:20:37 +02:00
fermin831
40ceec6561 Fixed macro _agent_adress_ on events responses 2018-10-18 18:45:11 +02:00
fermin831
cde7e011a5 Fixed module_crontab in windows agent on minutes wildcard 2018-10-18 18:01:36 +02:00
vgilc
9eefa6ff85 Merge branch '2471-Custom_graphs_en_consolas_visuales' into 'develop'
2471 custom graphs en consolas visuales

See merge request artica/pandorafms!1868
2018-10-18 13:35:54 +02:00
daniel
e299209a92 fixed visual console custam graph in meta 2018-10-18 13:24:15 +02:00
daniel
9492d11cc8 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-18 12:51:32 +02:00
vgilc
d23e47dd9d Merge branch '2737-Optimización-de-tags-dev-2' into 'develop'
Fixed tags filter on Tree tags

See merge request artica/pandorafms!1862
2018-10-18 09:53:03 +02:00
artica
0c39e321e4 Auto-updated build strings. 2018-10-18 00:01:24 +02:00
fermin831
e7663fc5f0 Fixed booleans realtime graphs 2018-10-17 19:20:22 +02:00
fermin831
2d2c465ff6 Removed unwanted traces 2018-10-17 15:43:26 +02:00
manuel.montes
aa0c4b41e7 Fixed bug in the data collection of network component when creating its corresponding module 2018-10-17 13:31:14 +02:00
fbsanchez
7a44f9dcdd Minor fix in cde cluster api methods 2018-10-17 13:26:41 +02:00
tatiana.llorente@artica.es
525caee909 Fixed a minor mistake in error message - #2900 2018-10-17 12:59:37 +02:00
tatiana.llorente@artica.es
0b22ab6bfd Minor bug fixed - #2900 2018-10-17 12:57:02 +02:00
tatiana.llorente@artica.es
561bce71ce Changed error and success messages - #2900 2018-10-17 12:49:11 +02:00
fermin831
14afe2ff88 Added message 'Please, select an agent first' 2018-10-17 12:35:11 +02:00
fermin831
060e46868d Fixed tags filter on bulk operation (select module first) 2018-10-17 11:57:22 +02:00
danielmaya
9ee64b4894 Fixed report agent/module 2018-10-17 08:44:51 +02:00
artica
fd53704dc0 Auto-updated build strings. 2018-10-17 00:01:34 +02:00
daniel
f824650642 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-16 15:42:17 +02:00
daniel
3c62388f0e fixed errors php and slicebars change version php7 2018-10-16 15:32:31 +02:00
fermin831
0ca34c744d Fixed tags filter on Tree tags 2018-10-16 13:29:00 +02:00
vgilc
2f61ba70df Merge branch 'ent-2740-servicios-favoritos' into 'develop'
Ent 2740 servicios favoritos

See merge request artica/pandorafms!1781
2018-10-16 11:45:38 +02:00
fermin831
aff2879340 Merge remote-tracking branch 'origin/develop' into ent-2740-servicios-favoritos
Conflicts:
	pandora_console/extras/mr/21.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb_data.sql
2018-10-16 11:35:14 +02:00
vgilc
14419759b0 Merge branch 'ent-2631-i6106-error-al-editar-modulos-con-tag-con-perfil-de-usuario-determinado' into 'develop'
Fixed modules tags acl with to tagged modules with an user without tags

See merge request artica/pandorafms!1860
2018-10-16 09:01:13 +02:00
vgilc
3664099fca Merge branch '2897-Fallo-al-hacer-update-en-Visual-Consoles-dev' into 'develop'
Fixed lost id_agent in visual console

See merge request artica/pandorafms!1858
2018-10-16 09:00:48 +02:00