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

8990 Commits

Author SHA1 Message Date
artica 693f9617ac Auto-updated build strings. 2018-08-18 00:01:26 +02:00
fermin831 90e3a423c4 Added secondary groups and no hierarchy documentation 2018-08-17 15:45:59 +02:00
Alejandro Gallardo Escobar 1de746ab69 Fixed a problem with the autocomplete agent cache 2018-08-17 15:03:24 +02:00
samucarc 52da571212 Fixed visual error 2018-08-17 14:42:17 +02:00
fermin831 e54e91cdf1 Revert "Improved metaconsole sync (added centralized management)" 
This reverts commit 3c99242508.
 2018-08-17 13:27:55 +02:00
fermin831 e687ca03bf Fixed several attributes in a ldap configuration 2018-08-17 11:29:19 +02:00
Alejandro Gallardo Escobar 8a5495a283 Merge branch 'develop' into ent-2335-gis-group-items 2018-08-17 11:17:29 +02:00
Alejandro Gallardo Escobar 7da4557abc Added the feature of the new map items (groups) and fixed more bugs 2018-08-17 11:07:42 +02:00
artica 839a91b0ac Auto-updated build strings. 2018-08-17 00:01:25 +02:00
fermin831 304a3b40c2 Fixed overwrite primery group if user has no permissions for this group on update agent 2018-08-16 12:48:44 +02:00
vgilc a4d1cfc9e6 Merge branch '2641-no-se-filtran-eventos-por-grupo-secundario-en-meta' into 'develop' 
2641 no se filtran eventos por grupo secundario en meta

See merge request artica/pandorafms!1688
 2018-08-16 11:03:02 +02:00
vgilc b8560fd597 Merge branch '2433-Los_datos_reportados_por_generic_data_string_aparecen_sin_saltos_de_linea_y_la_vista_ampliada_falla-3' into 'develop' 
Removed unwanted safe input in a data display

See merge request artica/pandorafms!1689
 2018-08-16 10:06:11 +02:00
vgilc dc8020dbdc Merge branch 'ent-2626-pantalla-de-edicion-de-modulos-en-grupos-secundarios' into 'develop' 
[Secondary groups] Fixed modules permissions in some views

See merge request artica/pandorafms!1669
 2018-08-16 09:46:28 +02:00
fermin831 a23dd89c70 Removed unwanted safe input in a data display 2018-08-16 09:24:59 +02:00
artica 7ac2745b9e Auto-updated build strings. 2018-08-16 00:01:21 +02:00
artica b222c6627a Auto-updated build strings. 2018-08-15 00:01:24 +02:00
fermin831 6372f44212 Added some docs 2018-08-14 17:08:00 +02:00
fermin831 05a0eb0db6 Fixed events secondary groups filter in metaconsole 2018-08-14 17:06:15 +02:00
artica e94af2ee15 Updated version and build strings. 2018-08-14 15:24:31 +02:00
fermin831 024a1cc1ee Fixed snapshot view in metaconsole 2018-08-14 13:21:32 +02:00
fermin831 d3c3304976 Fixed pagination and added filter to All events 2018-08-14 10:40:56 +02:00
artica b8d8f20d64 Auto-updated build strings. 2018-08-14 00:01:24 +02:00
Alejandro Gallardo Escobar dd6b9aed81 Refactored the layer configuration of the GIS maps to fix some bugs 2018-08-13 12:42:30 +02:00
fermin831 a5ff91185b Fixed text format in html historic data 2018-08-13 12:41:09 +02:00
fermin831 9d4297356e Fixed bullet charts (7 pixels for tickline) 2018-08-13 10:59:38 +02:00
vgilc 9dd9ad71a8 Merge branch '2609-cambios-en-la-forma-de-gestionar-grupos-secundarios-en-la-vista-de-usuario' into 'develop' 
2609 cambios en la forma de gestionar grupos secundarios en la vista de usuario

See merge request artica/pandorafms!1665
 2018-08-13 10:28:14 +02:00
artica aba54d65fa Auto-updated build strings. 2018-08-13 00:01:21 +02:00
artica 29c8a54e57 Auto-updated build strings. 2018-08-12 00:01:24 +02:00
artica f6382725dd Auto-updated build strings. 2018-08-11 00:01:25 +02:00
fermin831 8be030b7da Fixed agents_get_agentmodule_group to search only in tagente table 2018-08-10 12:55:04 +02:00
vgilc 7515cc6529 Merge branch '2635-6317-graficas-combinadas' into 'develop' 
Added thresholds to comb/interface graphs

See merge request artica/pandorafms!1672
 2018-08-10 11:11:07 +02:00
artica e1904878b5 Auto-updated build strings. 2018-08-10 00:01:24 +02:00
fbsanchez 6142fa1b05 Added thresholds to comb/interface graphs 2018-08-09 16:33:29 +02:00
artica 50b4c45652 Auto-updated build strings. 2018-08-09 00:01:24 +02:00
fermin831 62617e609c [Secondary groups] Fixed group agents and group events in events filter 2018-08-08 13:17:03 +02:00
fermin831 4315cef4c9 [Secondary groups] Fixed modules permissions in some views 2018-08-08 11:49:54 +02:00
fermin831 10a4268bbc Implemented no_hierarchy profile in users_et_groups function 2018-08-08 09:26:07 +02:00
artica c6eef38ae8 Auto-updated build strings. 2018-08-08 00:01:22 +02:00
Alejandro Gallardo Escobar 2778239a0f Fix the api info call 2018-08-07 13:03:53 +02:00
fermin831 188733962f Changed is_secondary by no_hierarchy on tusuario_perfil table 2018-08-07 08:31:40 +02:00
artica e614e3ecec Auto-updated build strings. 2018-08-07 00:01:22 +02:00
artica 1367d0e57e Auto-updated build strings. 2018-08-06 00:01:22 +02:00
artica e5e97a304b Auto-updated build strings. 2018-08-05 00:01:21 +02:00
artica 517c98cf1a Auto-updated build strings. 2018-08-04 00:01:25 +02:00
daniel 4bab741454 fixed error in visual console width and heigth custom graph 2018-08-03 11:58:45 +02:00
vgilc ab3998e097 Merge branch '2600-Error-al-crear-servicio-en-meta-dev' into 'develop' 
Fixed create services

See merge request artica/pandorafms!1661
 2018-08-03 11:35:56 +02:00
vgilc 1d607834dc Merge branch '2389-Ordenar-eventos-por-campo' into 'develop' 
implemented sort filter to event view custom fields

See merge request artica/pandorafms!1660
 2018-08-03 10:50:56 +02:00
danielmaya a9e162a199 Fixed create services 2018-08-03 10:49:01 +02:00
alejandro-campos 097661d82b implemented sort filter to event view custom fields 2018-08-03 10:38:53 +02:00
daniel 06c436e5bf add new tocken zoom graph visual styles 2018-08-03 10:01:04 +02:00
vgilc 7390905f07 Merge branch '2043-fallos-en-la-visualizacion-de-snapshots' into 'develop' 
2043 fallos en la visualizacion de snapshots

See merge request artica/pandorafms!1656
 2018-08-03 09:01:09 +02:00
vgilc d84a945daa Merge branch 'ent-2555-fix-incremental-realtime-charts' into 'develop' 
Fix incremental realtime charts

See merge request artica/pandorafms!1658
 2018-08-03 09:00:31 +02:00
artica 392b5bc935 Auto-updated build strings. 2018-08-03 00:01:25 +02:00
Alejandro Gallardo Escobar f5304af062 Removed unused code which was causing an error 2018-08-02 14:59:56 +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
vgilc fdedc78b24 Merge branch '2415-Plantillas_de_Consola_visual' into 'develop' 
2415 plantillas de consola visual

See merge request artica/pandorafms!1652
 2018-08-02 13:22:26 +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
fbsanchez a51851cc79 Moved vconsole templates to enterprise 2018-08-02 09:35:16 +02:00
artica d06c0ebffe Auto-updated build strings. 2018-08-02 00:01:23 +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
fbsanchez 9924c7877a Weird fix agentmodule retrieval proc. 2018-08-01 15:17:58 +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 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 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
fbsanchez a709d0af9f Minor fix vconsole templates 2018-08-01 14:54:14 +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
fbsanchez 1369333ab8 Minor fix vconsole template 2018-08-01 13:52:34 +02:00
fbsanchez 11372e5b94 Delete vconsole template method 2018-08-01 13:12:10 +02:00
fbsanchez 8e52d9e184 added visual_map_instanciate_template 2018-08-01 13:05:27 +02:00
fbsanchez e2e07f2724 Added visual_map_get_user_layout_templates 2018-08-01 12:54:08 +02:00
fbsanchez dd0d9e4fa5 Fixed vconsole template name & group_id 2018-08-01 12:28:17 +02:00
fbsanchez f10058428f Added backend functions to create vconsole template 2018-08-01 12:22:13 +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
artica 284f992819 Auto-updated build strings. 2018-07-27 00:01:29 +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
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
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
fermin831 cb0351de99 Fixed question mark hel header meta 2018-07-20 12:29:34 +02:00
artica 0557ecb508 Auto-updated build strings. 2018-07-20 00:01:30 +02:00
manuel.montes b922066a72 Add items to the view events 2018-07-19 18:04:50 +02:00
vgilc 99773177dd Merge branch 'ent-2076-ue-mejoras-en-gestion-de-politicas-desde-metaconsola' into 'develop' 
Resolve "[UE] Mejoras en gestion de politicas desde Metaconsola"

See merge request artica/pandorafms!1604
 2018-07-19 14:22:40 +02:00
artica a21892855a Auto-updated build strings. 2018-07-19 00:01:32 +02:00
fermin831 223d13edd5 Change the policy agents to work on serialized way 2018-07-18 14:50:09 +02:00
fbsanchez 5515f409d8 Fixed SLA percent, also using truncate instead round in SLA outputs 2018-07-18 11:10:55 +02:00
artica 9dafb653b4 Auto-updated build strings. 2018-07-18 00:01:27 +02:00
daniel f317f3e736 fixed errors in graph min and max warning and critical for edition module 2018-07-17 11:26:25 +02:00
fermin831 001861b746 Hide policy edition on centralized management on node 2018-07-17 08:51:39 +02:00
artica fc885be510 Auto-updated build strings. 2018-07-17 00:01:27 +02:00
daniel 713fbd5368 fixed visual errors and console 2018-07-16 17:01:50 +02:00
artica 74eecf1a96 Auto-updated build strings. 2018-07-16 00:01:21 +02:00
artica 04dfd30f76 Auto-updated build strings. 2018-07-15 00:01:27 +02:00
artica 4a7c329481 Auto-updated build strings. 2018-07-14 00:01:32 +02:00
daniel 2c9a613f1b fixed visual erros in metapolicies 2018-07-13 12:30:18 +02:00
fermin831 d0b6c9775f Addapted modules edition to metaconsole 2018-07-13 11:56:37 +02:00
artica 98025188cb Auto-updated build strings. 2018-07-13 00:01:29 +02:00
daniel 23ef9c8f53 Merge remote-tracking branch 'origin/develop' into ent-2076-ue-mejoras-en-gestion-de-politicas-desde-metaconsola 2018-07-12 14:49:59 +02:00
daniel 86c21aea5d merge develop 2018-07-12 13:37:46 +02:00
Ramon Novoa f4847d5347 Add the _rca_ macro to the help files. 2018-07-12 12:37:42 +02:00
fbsanchez fa4446bb91 Fixed min/max absolute values in charts 2018-07-12 12:34:05 +02:00
artica 8ab387581d Auto-updated build strings. 2018-07-12 00:01:56 +02:00
daniel 000e8b6457 fixed errors in forecast charts 2018-07-11 13:47:00 +02:00
daniel 6d04b2450b fixed baseline graph 2018-07-11 12:33:28 +02:00
vgilc 2625bee2d4 Merge branch '2450-Falsa_representacion_en_graficas_sin_TIP_5' into 'develop' 
fixed minor errors in legend charts

See merge request artica/pandorafms!1609
 2018-07-11 08:50:05 +02:00
artica 1df52459a6 Auto-updated build strings. 2018-07-11 00:01:28 +02:00
daniel fce669ae21 fixed minor errors in legend charts 2018-07-10 17:53:19 +02:00
fermin831 aaf8173b8a Added is_central_policies function 2018-07-10 17:49:46 +02:00
daniel b36bf868b1 fixed minor error 2018-07-10 16:13:17 +02:00
daniel 73a5a63956 fixed errors delete modules sla_value and sla for services 2018-07-10 16:12:14 +02:00
alejandro-campos 6ec4787c38 added order filters to events table 2018-07-10 15:11:18 +02:00
daniel e24b10ad74 fixed minor error debugPrint in function graph 2018-07-10 14:40:48 +02:00
artica 49afdcb4fd Auto-updated build strings. 2018-07-10 00:01:27 +02:00
daniel 4c7c248671 Merge remote-tracking branch 'origin/develop' into 2226-Analisis_de_causa_raiz_en_alertas_mediante_los_servicios 2018-07-09 09:44:33 +02:00
daniel 69852a1c2a mejora el rendimiento en consulta sql 2018-07-09 09:23:19 +02:00
artica f86465bcf3 Auto-updated build strings. 2018-07-09 00:01:23 +02:00
artica c6390f683e Auto-updated build strings. 2018-07-08 00:01:22 +02:00
artica d30559fffc Auto-updated build strings. 2018-07-07 00:01:26 +02:00
Alejandro Gallardo Escobar de58fe7b90 Fixes 2018-07-06 14:03:05 +02:00
daniel c26a50e838 fixed errors in graphs 2018-07-06 11:56:38 +02:00
vgilc 8d639b031e Merge branch 'ent-2405-recuento-y-paginado-vista-agent-detail' into 'develop' 
Fixed filter count in agent detail.

See merge request artica/pandorafms!1591
 2018-07-06 09:40:15 +02:00
artica 48e3c547c9 Auto-updated build strings. 2018-07-06 00:01:26 +02:00
vgilc f244dd79be Merge branch '2450-Falsa_representación_en_graficas_sin_TIP' into 'develop' 
2450 falsa representación en graficas sin tip

See merge request artica/pandorafms!1593
 2018-07-05 12:05:09 +02:00
daniel 0dd39f1f00 fixed errors in graph slice for uncompresed 2018-07-05 11:52:52 +02:00
artica d1f8aa31fd Auto-updated build strings. 2018-07-05 00:01:27 +02:00
danielmaya b186c82a7b Fixed json in functions_api 2018-07-04 15:57:08 +02:00
artica 0ab4ef50c5 Auto-updated build strings. 2018-07-04 00:01:24 +02:00
fermin831 d1eaef6f6d Fixed filter count in agent detail. 2018-07-03 13:22:23 +02:00
daniel e765e4fe08 Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios_2 2018-07-03 08:55:41 +02:00
artica 95678f706b Auto-updated build strings. 2018-07-03 00:01:23 +02:00
daniel 0f9b7d13ee fixed errors cps in meta and others 2018-07-02 17:14:31 +02:00
vgilc 0040837f4b Merge branch 'ent-2375-servidores-sin-referenciar' into 'develop' 
Fixed new servers (migration and autoprovision) icons

See merge request artica/pandorafms!1564
 2018-07-02 09:48:28 +02:00
artica 61668b4cd7 Auto-updated build strings. 2018-07-02 00:01:25 +02:00
artica 960bc8db31 Auto-updated build strings. 2018-07-01 00:01:26 +02:00
artica bf72f8ec3e Auto-updated build strings. 2018-06-30 00:01:30 +02:00
slerena 6da5736a4b Merge branch '2354-Fallo-grafico-tarta-consola-visual' into 'develop' 
Changed function that gets pie graphs module data to print no data to show message in such case

See merge request artica/pandorafms!1581
 2018-06-29 15:44:29 +02:00
alejandro-campos ae1f7a4814 fixed bug when ordering module list in custom graphs 2018-06-29 14:35:49 +02:00
artica d41df8335c Auto-updated build strings. 2018-06-29 00:01:29 +02:00
alejandro-campos 05f38eb9e1 Changed function that gets pie graphs module data to print no data to show message in such case 2018-06-28 18:28:18 +02:00
daniel 1b1bc4aa2e add new column evaluate_sla into table tservice 2018-06-28 13:34:55 +02:00
artica 73dca0446c Auto-updated build strings. 2018-06-28 00:01:34 +02:00
slerena ce61639101 Merge branch '2413-No-se-ven-graficas-en-informes-de-avg-ni-min-value' into 'develop' 
fixed bug to draw charts in custom reports

See merge request artica/pandorafms!1577
 2018-06-27 18:13:03 +02:00
slerena 905e6bfc56 Merge branch '2075-Proteccion_en_cascada_de_servicios' into 'develop' 
2075 proteccion en cascada de servicios

See merge request artica/pandorafms!1578
 2018-06-27 18:10:41 +02:00
alejandro-campos 25d252a8a4 fixed bug to draw charts in custom reports 2018-06-27 17:24:40 +02:00
daniel 65eb4744a1 fixed boolean graph no zoom 2018-06-27 16:17:17 +02:00
artica f4ef0110b2 Auto-updated build strings. 2018-06-27 00:01:31 +02:00
slerena 415f23ea14 Merge branch 'ent-2334-intracom-snmp-trap-forwarding-improvement' into 'develop' 
Recover critical status the SNMPTrap on SNMP console actions

See merge request artica/pandorafms!1567
 2018-06-26 22:40:02 +02:00
daniel 84f1cf95eb Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios 
Conflicts:
	pandora_console/godmode/agentes/configurar_agente.php
 2018-06-26 13:44:16 +02:00
tatiana.llorente@artica.es 965c6c839b Image for mode Quiet changed to blue - #2036 2018-06-26 12:31:23 +02:00
artica b1b486143f Auto-updated build strings. 2018-06-26 00:01:30 +02:00
slerena 40d7ef4fcb Merge branch 'ent-2281-5786-paratus-crear-modulos-snmp-proc-con-la-api' into 'develop' 
Modified set create_snmp_module to permit create remote_snmp_proc modules

See merge request artica/pandorafms!1563
 2018-06-25 19:04:49 +02:00
slerena 7c7f593425 Merge branch '2357-Problema-side-menu' into 'develop' 
Fixed submenu2 in functions_menu.php

See merge request artica/pandorafms!1533
 2018-06-25 19:03:11 +02:00
slerena 17cb7337f5 Merge branch '2300-Eventos-de-respuesta-personalizada' into 'develop' 
Fixed bug in ajax/events.php

See merge request artica/pandorafms!1561
 2018-06-25 19:00:58 +02:00
slerena 082e9c6185 Merge branch '1781-Animación-visual-para-ventanas-modales-de-ayuda-2' into 'develop' 
Add visual animation to popup modal windows - #1781

See merge request artica/pandorafms!1284
 2018-06-25 18:59:34 +02:00
slerena aa540614dd Merge branch 'ent-2409-Agregar-agentes-en-concreto-en-Mapas-Gis' into 'develop' 
Fixed add particular agents to GIS layers

See merge request artica/pandorafms!1568
 2018-06-25 18:55:17 +02:00
slerena b80dc2b1bb Merge branch 'ent-2404-agentes-repetidos-en-el-tree-view-en-los-grupos-secundarios' into 'develop' 
Fixed tree view meta secondary groups repeated agents

See merge request artica/pandorafms!1559
 2018-06-25 18:54:52 +02:00
slerena 288a751417 Merge branch 'pandora_enterprise#2419' into 'develop' 
Added regex to LDAP advanced permissions

See merge request artica/pandorafms!1570
 2018-06-25 18:51:15 +02:00
daniel 7dc60b65a2 Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios 2018-06-25 15:46:36 +02:00
daniel eaf5abd476 fixed keep alive bool type module 100 2018-06-25 15:35:12 +02:00
daniel 6be7881514 fixed error in zoom graphs boolean 2018-06-25 15:09:57 +02:00
daniel 36293cba3a Revert "fixed error ingraph bool zoom" 
This reverts commit 1ca35be41e.
 2018-06-25 15:07:12 +02:00
daniel 1ca35be41e fixed error ingraph bool zoom 2018-06-25 15:05:07 +02:00
daniel e39b03511d Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios 2018-06-25 08:29:45 +02:00
artica 17e5c39a67 Auto-updated build strings. 2018-06-25 00:01:24 +02:00
artica 5d4a4eebc4 Auto-updated build strings. 2018-06-24 00:01:25 +02:00
Kike 7ed5077c01 Added regex to LDAP advanced permissions 2018-06-23 14:24:32 +02:00