17824 Commits

Author SHA1 Message Date
fermin831
5e6eca8e51 Added ACL to snapshot view 2018-08-02 14:32:12 +02:00
fermin831
c1269ca23f Refactorized snapshot link on meta 2018-08-02 13:42:39 +02:00
fermin831
7b22caaea8 Fixed warning 2018-08-02 13:41:56 +02:00
fermin831
18800feaae Refactorized snapshot link on node 2018-08-02 13:02:33 +02:00
fermin831
ca67bd632e Removed Oracle and Posgre code 2018-08-02 12:56:43 +02:00
vgilc
22ffd8d1e5 Merge branch '2389-Ordenar-eventos-por-campo' into 'develop'
added order filters to events table

See merge request artica/pandorafms!1608
2018-08-02 10:55:33 +02:00
alejandro-campos
01656f2e76 conflict resolution on branch 2389-Ordenar-eventos-por-campo 2018-08-02 10:27:31 +02:00
artica
d06c0ebffe Auto-updated build strings. 2018-08-02 00:01:23 +02:00
vgilc
86122be7e7 Merge branch '2488-ue-plugin-updates' into 'develop'
Added extra compat. to print_module (plugintools)

See merge request artica/pandorafms!1620
2018-08-01 15:20:55 +02:00
vgilc
fcda8f56f9 Merge branch '2460-tu-zona-horaria-es-distinta-pero-igual' into 'develop'
fixed bug: when system timezone is equal to your timezone, dont show the…

See merge request artica/pandorafms!1645
2018-08-01 15:20:08 +02:00
vgilc
6e2af64746 Merge branch 'ent-2394-fix-api-info-html-encoded-chars' into 'develop'
Remove html encoded characters from the product name when returning the info using the API

See merge request artica/pandorafms!1646
2018-08-01 15:13:51 +02:00
vgilc
1baf56159e Merge branch 'ent-2567-no-se-muestran-las-graficas-con-permisos-para-secundary-group' into 'develop'
Fixed acl in module graph view

See merge request artica/pandorafms!1653
2018-08-01 15:12:41 +02:00
vgilc
cce7af9c37 Merge branch '2397-No-se-ve-la-gráfica-de-eventos-de-la-pantalla-de-cluster-dev' into 'develop'
Fixed event graph in cluster view

See merge request artica/pandorafms!1651
2018-08-01 15:08:43 +02:00
vgilc
ce18002ae5 Merge branch '2385-Siguen-fallando-los-mapas-en-la-metaconsola-dev' into 'develop'
Fixed node connection in visual_map

See merge request artica/pandorafms!1637
2018-08-01 15:06:27 +02:00
vgilc
44411c4628 Merge branch '2432-Edición-módulos-snmpv3-en-operaciones-masivas-dev' into 'develop'
Fixed edit snmp modules in bulk

See merge request artica/pandorafms!1642
2018-08-01 15:05:50 +02:00
vgilc
1e71f93bba Merge branch '2537-Error-al-editar-módulos-con-tags-dev' into 'develop'
Fixed tags_check_acl when standar user have 'any' tag

See merge request artica/pandorafms!1647
2018-08-01 15:04:43 +02:00
vgilc
cd98a5a414 Merge branch '2433-Los_datos_reportados_por_generic_data_string_aparecen_sin_saltos_de_linea_y_la_vista_ampliada_falla' into 'develop'
fixed error data string show

See merge request artica/pandorafms!1643
2018-08-01 14:56:23 +02:00
vgilc
8af71bfc35 Merge branch '2424-Bug_umbrales_graficas' into 'develop'
fixed minor error

See merge request artica/pandorafms!1644
2018-08-01 14:55:18 +02:00
vgilc
3b64404278 Merge branch '2576-No_esta_guardando_el_postprocesado' into 'develop'
2576 no esta guardando el postprocesado

See merge request artica/pandorafms!1650
2018-08-01 14:53:58 +02:00
fermin831
04cfbe4ef9 Fixed acl in module graph view 2018-08-01 13:16:21 +02:00
artica
1088c5390d Auto-updated build strings. 2018-08-01 00:01:22 +02:00
danielmaya
cd26042fa9 Fixed event graph in cluster view 2018-07-31 15:41:15 +02:00
daniel
590373ab93 fixed minor error post process create agent 2018-07-31 15:25:44 +02:00
artica
2dc5bc1139 Auto-updated build strings. 2018-07-31 00:01:23 +02:00
danielmaya
d25489f167 Fixed tags_check_acl when standar user have 'any' tag 2018-07-30 16:44:15 +02:00
Alejandro Gallardo Escobar
f4f298ebf9 Remove html encoded characters from the product name when returning the info using the API 2018-07-30 16:38:18 +02:00
alejandro-campos
443b70c39d fixed bug: when system timezone is equal to your timezone, dont show the different timezones warning 2018-07-30 16:25:38 +02:00
daniel
8f1fa78955 fixed minor error 2018-07-30 16:16:08 +02:00
danielmaya
8ec24cdf3e Fixed last value and color status 100, 200, 300 2018-07-30 10:18:04 +02:00
artica
42ad2cc924 Auto-updated build strings. 2018-07-30 00:01:22 +02:00
artica
258f6b915e Auto-updated build strings. 2018-07-29 00:01:20 +02:00
artica
329bcdbc8b Auto-updated build strings. 2018-07-28 00:02:05 +02:00
daniel
d740240a51 fixed error data string show 2018-07-27 14:07:02 +02:00
danielmaya
8247df6d65 Fixed edit snmp modules in bulk 2018-07-27 10:42:45 +02:00
artica
284f992819 Auto-updated build strings. 2018-07-27 00:01:29 +02:00
vgilc
6bd1768335 Merge branch '2248-5730-Añadir-elementos-a-la-vista-de-eventos3' into 'develop'
fix bug in metaconsole view events

See merge request artica/pandorafms!1638
2018-07-26 17:15:30 +02:00
vgilc
9e8481537b Merge branch 'develop' into '2248-5730-Añadir-elementos-a-la-vista-de-eventos3'
# Conflicts:
#   pandora_console/godmode/events/custom_events.php
2018-07-26 17:08:15 +02:00
vgilc
33cee703e3 Merge branch '2248-5730-Añadir-elementos-a-la-vista-de-eventos2' into 'develop'
fix bug in metaconsole view events

See merge request artica/pandorafms!1636
2018-07-26 16:59:35 +02:00
manuel.montes
4b23824eb4 fix bug in metaconsole view events 2018-07-26 15:41:52 +02:00
danielmaya
a38e93b1c1 Fixed node connection in visual_map 2018-07-26 15:39:38 +02:00
manuel.montes
a476d008ac fix bug in metaconsole view events 2018-07-26 15:30:49 +02:00
vgilc
ab900f1e54 Merge branch '2076-Mejoras_en_gestion_de_politicas_desde_Metaconsola_3' into 'develop'
fixed errors in policies metaconsole

See merge request artica/pandorafms!1635
2018-07-26 15:09:28 +02:00
daniel
3985316a9b fixed errors in policies metaconsole 2018-07-26 12:41:09 +02:00
artica
fb73a0b8b2 Auto-updated build strings. 2018-07-26 00:01:30 +02:00
vgilc
5bfeac1b87 Merge branch '1885-ue-configurador-automatico-de-agentes' into 'develop'
Added DB changes to support ProvisioningServer 2

See merge request artica/pandorafms!1587
2018-07-25 11:21:51 +02:00
artica
b0434e7f1d Auto-updated build strings. 2018-07-25 00:01:26 +02:00
fbsanchez
05bee8c856 Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes 2018-07-24 18:43:45 +02:00
fbsanchez
ae6d7139b4 is_management_allowed fix 2018-07-24 18:24:03 +02:00
fbsanchez
581cf7c5a0 Added management_allowed 2018-07-24 17:55:33 +02:00
artica
7748fcf5ce Updated version and build strings. 2018-07-24 17:45:16 +02:00