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

18225 Commits

Author SHA1 Message Date
nramon fdd529ce10 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Nuevos tipos de cálculo de estado en los items con mapa de estado enlazado

See merge request artica/pandorafms!1732
 2018-09-06 10:46:14 +02:00
daniel 81ed14cc34 fixed performance in group view 2018-09-06 09:25:48 +02:00
nramon 8480deebba Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
2611 cache de vista de arbol y vista de grupos

See merge request artica/pandorafms!1733
 2018-09-06 08:18:11 +02:00
artica 647a324368 Auto-updated build strings. 2018-09-06 00:01:26 +02:00
daniel f3a2bda1a5 remove group cache in tree view 2018-09-05 18:31:13 +02:00
daniel 4781809e14 fixed minor error not init agent in tree view node 2018-09-05 18:28:31 +02:00
fbsanchez d46240a200 Merge remote-tracking branch 'origin/develop' into 2078-ue-cmdb-integration 2018-09-05 16:52:18 +02:00
Alejandro Gallardo Escobar c20942f425 Now the status calculation can be configured for every visual console item 2018-09-05 15:25:19 +02:00
nramon aa98b62e5c Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
fixed errors in tree view

See merge request artica/pandorafms!1710
 2018-09-05 14:44:37 +02:00
daniel 3b0436008a Merge remote-tracking branch 'origin/develop' into 2611-Cache_de_vista_de_arbol_y_vista_de_grupos 2018-09-05 14:04:33 +02:00
daniel 82c4adc5c7 convert spaces to tab 2018-09-05 14:01:32 +02:00
daniel 7554906e59 minor refactorization tree view 2018-09-05 13:48:53 +02:00
daniel 51f71d1a07 fixed metaconsole tree view 2018-09-05 11:23:53 +02:00
Alejandro Gallardo Escobar ce6bfb96f1 Minor changes 2018-09-05 10:04:35 +02:00
nramon d91c7c062c Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Nuevos tipos de cálculo de estado en los items con mapa de estado enlazado

See merge request artica/pandorafms!1730
 2018-09-05 10:02:11 +02:00
daniel 2829ddd8dd clean main tree class code 2018-09-05 09:54:28 +02:00
artica 05d0bb0f5d Auto-updated build strings. 2018-09-05 00:01:26 +02:00
Alejandro Gallardo Escobar 9e085758af Minor fix 2018-09-04 17:52:05 +02:00
Alejandro Gallardo Escobar 36247d391f Merge branch 'develop' into ent-2588-service-like-visual-console-status 2018-09-04 17:25:23 +02:00
Alejandro Gallardo Escobar 21bad5330b Bug fix 2018-09-04 17:24:03 +02:00
Alejandro Gallardo Escobar 22696a0fc6 Added new modes to calculate the status of the linked visual maps 2018-09-04 17:23:42 +02:00
nramon 1f808adb27 Merge branch '2499-Mapas-GIS-dev' into 'develop' 
Fixed agent view in public Visual Console

See merge request artica/pandorafms!1726
 2018-09-04 12:59:33 +02:00
nramon 16d3fa34e9 Merge branch '2324-Error-en-servidor-de-Pandora-FMS-dev' into 'develop' 
Added default value in parent_module_id

See merge request artica/pandorafms!1728
 2018-09-04 12:59:09 +02:00
danielmaya 19f7a5180c Added default value in parent_module_id 2018-09-04 12:48:58 +02:00
daniel 718401467d put tree view in separate files 2018-09-04 11:51:36 +02:00
danielmaya 66c8404fcf Fixed agent view in public Visual Console 2018-09-04 11:08:10 +02:00
artica 60360d8764 Auto-updated build strings. 2018-09-04 00:01:27 +02:00
enriquecd f4551faff0 Add intracom generic functions - #2541 2018-09-03 18:02:18 +02:00
nramon 862c1ae8a7 Merge branch '2063-Bug-cambio-hora-en-relojes-de-la-Consola-visual-dev' into 'develop' 
Fixed issue with timezone in visual console editor

See merge request artica/pandorafms!1724
 2018-09-03 15:47:55 +02:00
nramon a84b1af4af Merge branch '2390-Añadir-en-filtro-de-eventos-todos-los-campos-posibles-de-búsqueda-dev' into 'develop' 
Added source, comment and id_extra in event filter

See merge request artica/pandorafms!1722
 2018-09-03 15:47:36 +02:00
nramon c3c26e9618 Merge branch '2712-mejora-rendimiento' into 'develop' 
fixed ajax.php two call function translate

See merge request artica/pandorafms!1721
 2018-09-03 15:46:46 +02:00
danielmaya fd27b6d445 Fixed issue with timezone in visual console editor 2018-09-03 14:43:21 +02:00
artica b52661054d Auto-updated build strings. 2018-09-03 00:01:24 +02:00
artica 06b36965a2 Auto-updated build strings. 2018-09-02 00:01:23 +02:00
artica 97c562163e Auto-updated build strings. 2018-09-01 00:01:24 +02:00
danielmaya 5b30aa5560 Added source, comment and id_extra in event filter 2018-08-31 16:25:12 +02:00
daniel 5cd4e0d300 fixed ajax.php two call function translate 2018-08-31 13:46:12 +02:00
daniel 41761bc525 fixed tree view tags 2018-08-31 13:33:22 +02:00
daniel e5fec6b303 Merge remote-tracking branch 'origin/develop' into 2611-Cache_de_vista_de_arbol_y_vista_de_grupos 2018-08-31 10:56:04 +02:00
daniel 3334138cb4 fixed tree view SO 2018-08-31 10:51:17 +02:00
daniel fb7def14af fixed tree view counter second level and module group view 2018-08-31 09:09:54 +02:00
artica 43a7d4973b Auto-updated build strings. 2018-08-31 00:01:28 +02:00
daniel 6a124487a4 fixed module tree view 2018-08-30 12:23:35 +02:00
vgilc 99f42aed87 Merge branch 'fix-plugin-timeout' into 'develop' 
Fixed plugin timeout.

See merge request artica/pandorafms!1720
 2018-08-30 08:05:36 +02:00
Junichi Satoh 34c553f5b4 Fixed plugin timeout. 2018-08-30 13:30:22 +09:00
artica 9d35a66ad3 Auto-updated build strings. 2018-08-30 00:01:25 +02:00
daniel b346e4dca9 refactorized group tree view 2018-08-29 13:55:50 +02:00
daniel 90d686a7ab fixed error in acl groups tree view 2018-08-29 09:16:07 +02:00
vgilc 0aeef6367a Merge branch '1958-Informe-agrupado-de-grupo' into 'develop' 
fixed recursion option in custom report's item editor

See merge request artica/pandorafms!1719
 2018-08-29 08:26:58 +02:00
artica 91bdb0094a Auto-updated build strings. 2018-08-29 00:01:26 +02:00