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

13959 Commits

Author SHA1 Message Date
vgilc 87d1bdd29d Merge branch 'ent-2351-seguridad-4' into 'develop' 
Added .htaccess to avoid external access to attachment files

See merge request artica/pandorafms!1758
 2018-09-13 08:35:20 +02:00
artica 583a7475e4 Auto-updated build strings. 2018-09-13 00:01:26 +02:00
fermin831 52f89def20 Added .htaccess to avoid external access to attachment files 2018-09-12 17:30:13 +02:00
fermin831 a25d4ed166 Fixed alerts_get_alerts function 2018-09-12 17:27:09 +02:00
Alejandro Gallardo Escobar 7930f22dd0 WIP: Improved the linked visual console status help 2018-09-12 16:54:18 +02:00
Alejandro Gallardo Escobar 98b2907857 Bug fixes 2018-09-12 16:16:04 +02:00
daniel c5b942f13f fixed minor error legend graph and value avg 2018-09-12 15:57:22 +02:00
fermin831 0ec93011da Fixed security fail filling the plugin fields 2018-09-12 15:05:30 +02:00
manuel.montes a2b3d6e07f Deleted reports from cron 2018-09-12 13:43:23 +02:00
vgilc 8622fc2738 Merge branch '2550-Las_graficas_no_se_muestran_bien_en_Dashboard' into 'develop' 
fixed minor error refresh graph pie

See merge request artica/pandorafms!1752
 2018-09-12 11:27:39 +02:00
daniel b0257eb3f4 fixed minor error refresh graph pie 2018-09-12 11:23:26 +02:00
vgilc ec0640083a Merge branch '2487-Cambiar_forma_de_captura_de_datos_de_graficas_forecast_y_baseline_2' into 'develop' 
2487 cambiar forma de captura de datos de graficas forecast y baseline 2

See merge request artica/pandorafms!1751
 2018-09-12 10:38:04 +02:00
daniel 6312d2e38a fixed forecast report 2018-09-12 10:34:14 +02:00
vgilc 1bdfaed293 Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios-2' into 'develop' 
Ent 2153 vistas en las que no se ha tenido en cuenta los grupos secundarios 2

See merge request artica/pandorafms!1750
 2018-09-12 10:21:09 +02:00
artica cef1b10ade Auto-updated build strings. 2018-09-12 00:01:26 +02:00
daniel ed0d89ec73 fixed baseline report 2018-09-11 17:06:35 +02:00
nramon 266cd6d394 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Removed the Static Graph requirement for all the status calculation types

See merge request artica/pandorafms!1748
 2018-09-11 15:05:46 +02:00
Alejandro Gallardo Escobar 2fa2d713b8 Removed the Static Graph requirement for all the status calculation types of the visual console linked elements 2018-09-11 14:54:26 +02:00
fermin831 9c032f4dfe [Secondary groups] Fixed group report 2018-09-11 13:22:51 +02:00
daniel 7eed209339 fixed error size graph in dashboard 2018-09-11 11:37:11 +02:00
daniel f117d1af43 fixed heigth charts for reports 2018-09-11 09:33:24 +02:00
fermin831 5c54afe673 Fixed secondary groups in alerts details 2018-09-11 09:15:48 +02:00
artica f7940908c2 Auto-updated build strings. 2018-09-11 00:01:25 +02:00
vgilc 72a583399a Merge branch '2541-Functiones-API-traps-y-control-de-acceso-de-aplicacion-externa-open' into 'develop' 
Add intracom generic functions - #2541

See merge request artica/pandorafms!1725
 2018-09-10 15:44:00 +02:00
vgilc 97dcaab99c 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!1744
 2018-09-10 15:43:16 +02:00
daniel 022adeb24d fixed metaconsole tree view popup modules 2018-09-10 15:35:11 +02:00
daniel f123bac915 fixed total counters grouw view 2018-09-10 12:58:10 +02:00
vgilc f0e1d61f6d Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
fixed minor error no agents group view

See merge request artica/pandorafms!1740
 2018-09-10 12:43:26 +02:00
vgilc 683d748b38 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Now is possible to link visual consoles from different nodes to the visual console elements

See merge request artica/pandorafms!1741
 2018-09-10 12:43:06 +02:00
daniel 729fe74758 fixed minor error tree view acl 2018-09-10 12:08:38 +02:00
Alejandro Gallardo Escobar 40ff7b9042 Now is possible to link visual consoles from different nodes to the visual console elements 2018-09-10 11:25:44 +02:00
daniel 3d3670f6f9 fixed minor error no agents group view 2018-09-10 11:13:31 +02:00
daniel 5e9fda93d9 Merge remote-tracking branch 'origin/develop' into 2611-Cache_de_vista_de_arbol_y_vista_de_grupos 2018-09-10 09:59:46 +02:00
daniel 68627e80b0 fixed metaconsole group view 2018-09-10 09:55:31 +02:00
artica 003b734f4e Auto-updated build strings. 2018-09-10 00:01:22 +02:00
artica 6ae51b5e34 Auto-updated build strings. 2018-09-09 00:01:23 +02:00
artica cc4de37515 Auto-updated build strings. 2018-09-08 00:01:53 +02:00
daniel 3fa4f44d68 fixed group view 2018-09-07 14:37:22 +02:00
daniel ac0f0536c7 performance improve view groups 2018-09-07 14:19:01 +02:00
danielmaya 39673ed93a Added class modaldeletebutton in pandora.css 2018-09-07 14:15:21 +02:00
artica fb68f3f9b6 Auto-updated build strings. 2018-09-07 00:01:31 +02:00
danielmaya 816b969741 Added table tlog_graph_models 2018-09-06 16:48:18 +02:00
nramon 6511f67600 Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
improve performance on group view

See merge request artica/pandorafms!1735
 2018-09-06 15:46:21 +02:00
daniel 6072cd3dc9 improve performance on group view 2018-09-06 15:28:22 +02:00
nramon 4e7d641667 Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
fixed performance in group view

See merge request artica/pandorafms!1734
 2018-09-06 10:46:36 +02:00
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
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
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
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
alejandro-campos 5f4d76f3a7 fixed recursion option in custom report's item editor 2018-08-28 16:38:32 +02:00
vgilc 3f1d7e9947 Merge branch '2682_Cambiar_ayuda_contextual' into 'develop' 
Changed soft graphs hint

See merge request artica/pandorafms!1718
 2018-08-28 16:00:53 +02:00
daniel 59e405c2b3 disabled modules search in tree view 2018-08-28 15:24:35 +02:00
daniel 5079c59b88 Merge remote-tracking branch 'origin/develop' into 2611-Cache_de_vista_de_arbol_y_vista_de_grupos 2018-08-28 12:53:18 +02:00
daniel f9af750f47 fixed counters group tree view 2018-08-28 12:52:57 +02:00
samucarc dae0021db9 Changed soft graphs hint 2018-08-28 11:02:27 +02:00
vgilc 75d3d38bec Merge branch '2667-Añadir-ayuda-online-en-la-seccion-de-etiqueta-de-texto-de-una-consola-visual' into 'develop' 
fixed text errors in visual console macros' help text

See merge request artica/pandorafms!1717
 2018-08-28 10:41:44 +02:00
alejandro-campos 3b7b54cb68 fixed text errors in visual console macros' help text 2018-08-28 10:31:24 +02:00
vgilc 7a6c3c16ec Merge branch '1920_Informe_de_alertas' into 'develop' 
Fixed alert report date

See merge request artica/pandorafms!1715
 2018-08-28 10:30:23 +02:00