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

13651 Commits

Author SHA1 Message Date
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 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
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
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
artica 33dd9d5886 Auto-updated build strings. 2018-07-24 00:01:28 +02:00
fbsanchez ba676e13e3 Added autoconfiguration menu 2018-07-23 20:11:35 +02:00
fbsanchez 079b2437b6 Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes 2018-07-23 18:06:02 +02:00
vgilc a5c1caab1f Merge branch '2229-Gestion_de_politicas_desde_API' into 'develop' 
add functions api for policies node

See merge request artica/pandorafms!1626
 2018-07-23 17:31:09 +02:00
daniel 9236285a98 remove functions api to api enterprise because policies is enterprise 2018-07-23 17:04:07 +02:00
vgilc 44ad0c31d5 Merge branch '2248-5730-Añadir-elementos-a-la-vista-de-eventos' into 'develop' 
Add items to the view events

See merge request artica/pandorafms!1623
 2018-07-23 11:22:23 +02:00
daniel f05ba656e1 add functions api for policies node 2018-07-23 08:59:08 +02:00
artica 63cc7aab9c Auto-updated build strings. 2018-07-23 00:01:23 +02:00
artica 435d44a1ca Auto-updated build strings. 2018-07-22 00:01:23 +02:00
artica f67616a807 Auto-updated build strings. 2018-07-21 00:01:27 +02:00
vgilc 749a19eec5 Merge branch 'ent-2076-ue-mejoras-en-gestion-de-politicas-desde-metaconsola' into 'develop' 
Fixed question mark hel header meta

See merge request artica/pandorafms!1625
 2018-07-20 14:43:42 +02:00
fermin831 3c99242508 Improved metaconsole sync (added centralized management) 2018-07-20 14:10:31 +02:00